From 148af6b2f57be264c84d0991237fbd7ddea491a4 Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期一, 04 十一月 2019 09:55:55 +0800
Subject: [PATCH] Merge branch 'div' of ssh://193.112.35.168:29418/fanli-server into div

---
 fanli/src/main/java/com/yeshi/fanli/util/factory/msg/UserMsgVOFactory.java |  222 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 221 insertions(+), 1 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/util/factory/msg/UserMsgVOFactory.java b/fanli/src/main/java/com/yeshi/fanli/util/factory/msg/UserMsgVOFactory.java
index 87ae60b..1c136e3 100644
--- a/fanli/src/main/java/com/yeshi/fanli/util/factory/msg/UserMsgVOFactory.java
+++ b/fanli/src/main/java/com/yeshi/fanli/util/factory/msg/UserMsgVOFactory.java
@@ -14,6 +14,9 @@
 import com.yeshi.fanli.dto.msg.MsgOtherRewardIntegralDTO;
 import com.yeshi.fanli.dto.msg.MsgOtherSystemGiveDTO;
 import com.yeshi.fanli.dto.msg.MsgOtherTaoLiJinContentDTO;
+import com.yeshi.fanli.dto.msg.MsgRedPackAddContentDTO;
+import com.yeshi.fanli.dto.msg.MsgRedPackExchangeContentDTO;
+import com.yeshi.fanli.dto.msg.MsgRedPackGiveContentDTO;
 import com.yeshi.fanli.entity.bus.msg.MsgAccountDetail;
 import com.yeshi.fanli.entity.bus.msg.MsgAccountDetail.MsgTypeAccountTypeEnum;
 import com.yeshi.fanli.entity.bus.msg.MsgInviteDetail;
@@ -556,8 +559,225 @@
 			return new UserMsgVO("http://img.flqapp.com/resource/money_detail/icon_system.png",
 					msg.getMsgType().getDesc(), msg.getUpdateTime() == null ? msg.getCreateTime() : msg.getUpdateTime(),
 					items);
-		}
+		} else if (msg.getMsgType() == MsgTypeMoneyTypeEnum.subSidy) { // 棰濆琛ヨ创
+			contentList = new ArrayList<>();
+			contentList.add(new ClientTextStyleVO(msg.getStateDesc(), COLOR_CONTENT));
+			items.add(new CommonMsgItemVO(new ClientTextStyleVO("绫诲埆", COLOR_TITLE), contentList));
 
+			contentList = new ArrayList<>();
+			contentList.add(new ClientTextStyleVO("楼" + filterMoney(msg.getMoney()), COLOR_HIGHLIGHT_CONTENT));
+			items.add(new CommonMsgItemVO(new ClientTextStyleVO("閲戦", COLOR_TITLE), contentList));
+			
+	
+			contentList = new ArrayList<>();
+			contentList.add(new ClientTextStyleVO(msg.getDesc(), COLOR_CONTENT));
+			items.add(new CommonMsgItemVO(new ClientTextStyleVO("鏉ユ簮", COLOR_TITLE), contentList));
+
+			
+			contentList = new ArrayList<>();
+			contentList.add(new ClientTextStyleVO("楼" + filterMoney(msg.getBalance()), COLOR_HIGHLIGHT_CONTENT));
+			items.add(new CommonMsgItemVO(new ClientTextStyleVO("璐︽埛浣欓", COLOR_TITLE), contentList));
+			
+			contentList = new ArrayList<>();
+			contentList.add(new ClientTextStyleVO(StringUtil.isNullOrEmpty(msg.getBeiZhu()) ? "鏃�" : msg.getBeiZhu(),
+					COLOR_CONTENT));
+			items.add(new CommonMsgItemVO(new ClientTextStyleVO("澶囨敞", COLOR_TITLE), contentList));
+			
+			return new UserMsgVO("http://img.flqapp.com/resource/msg/icon_msg_subsidy.png",
+					msg.getMsgType().getDesc(), msg.getUpdateTime() == null ? msg.getCreateTime() : msg.getUpdateTime(),
+					items);
+		} else if (msg.getMsgType() == MsgTypeMoneyTypeEnum.redPackReceiveOff) { // 绾㈠寘鎴愬姛棰嗗彇
+			if (StringUtil.isNullOrEmpty(msg.getContent()))
+				return null;
+
+			MsgRedPackGiveContentDTO dto = new Gson().fromJson(msg.getContent(), MsgRedPackGiveContentDTO.class);
+			if (dto == null)
+				return null;
+			
+			contentList = new ArrayList<>();
+			contentList.add(new ClientTextStyleVO(dto.getUserInfo() + "", COLOR_CONTENT));
+			items.add(new CommonMsgItemVO(new ClientTextStyleVO("璧犻�佷汉", COLOR_TITLE), contentList));
+
+			contentList = new ArrayList<>();
+			contentList.add(new ClientTextStyleVO(dto.getTime() + "", COLOR_CONTENT));
+			items.add(new CommonMsgItemVO(new ClientTextStyleVO("璧犻�佹椂闂�", COLOR_TITLE), contentList));
+
+			contentList = new ArrayList<>();
+			contentList.add(new ClientTextStyleVO(dto.getMoney() + "", COLOR_HIGHLIGHT_CONTENT));
+			items.add(new CommonMsgItemVO(new ClientTextStyleVO("棰嗗彇閲戦", COLOR_TITLE), contentList));
+
+			contentList = new ArrayList<>();
+			contentList.add(new ClientTextStyleVO(StringUtil.isNullOrEmpty(msg.getBeiZhu()) ? "鏃�" : msg.getBeiZhu(),
+					COLOR_CONTENT));
+			items.add(new CommonMsgItemVO(new ClientTextStyleVO("澶囨敞", COLOR_TITLE), contentList));
+
+			return new UserMsgVO("http://img.flqapp.com/resource/msg/icon_hongbao_give.png",
+					dto.getTitle(), msg.getUpdateTime() == null ? msg.getCreateTime() : msg.getUpdateTime(),
+					items);
+		} else if (msg.getMsgType() == MsgTypeMoneyTypeEnum.redPackGiveOff) { // 绾㈠寘琚垚鍔熼鍙�
+			if (StringUtil.isNullOrEmpty(msg.getContent()))
+				return null;
+
+			MsgRedPackGiveContentDTO dto = new Gson().fromJson(msg.getContent(), MsgRedPackGiveContentDTO.class);
+			if (dto == null)
+				return null;
+			
+			contentList = new ArrayList<>();
+			contentList.add(new ClientTextStyleVO(dto.getUserInfo() + "", COLOR_CONTENT));
+			items.add(new CommonMsgItemVO(new ClientTextStyleVO("棰嗗彇浜�", COLOR_TITLE), contentList));
+
+			contentList = new ArrayList<>();
+			contentList.add(new ClientTextStyleVO(dto.getTime() + "", COLOR_CONTENT));
+			items.add(new CommonMsgItemVO(new ClientTextStyleVO("棰嗗彇鏃堕棿", COLOR_TITLE), contentList));
+
+			contentList = new ArrayList<>();
+			contentList.add(new ClientTextStyleVO(dto.getMoney() + "", COLOR_HIGHLIGHT_CONTENT));
+			items.add(new CommonMsgItemVO(new ClientTextStyleVO("璧犻�侀噾棰�", COLOR_TITLE), contentList));
+
+			contentList = new ArrayList<>();
+			contentList.add(new ClientTextStyleVO(StringUtil.isNullOrEmpty(msg.getBeiZhu()) ? "鏃�" : msg.getBeiZhu(),
+					COLOR_CONTENT));
+			items.add(new CommonMsgItemVO(new ClientTextStyleVO("澶囨敞", COLOR_TITLE), contentList));
+
+			return new UserMsgVO("http://img.flqapp.com/resource/msg/icon_hongbao_give.png",
+					dto.getTitle(), msg.getUpdateTime() == null ? msg.getCreateTime() : msg.getUpdateTime(),
+					items);
+		} else if (msg.getMsgType() == MsgTypeMoneyTypeEnum.redPackGiveBack) { // 绾㈠寘鏈棰嗗彇閫�鍥�
+			if (StringUtil.isNullOrEmpty(msg.getContent()))
+				return null;
+
+			MsgRedPackGiveContentDTO dto = new Gson().fromJson(msg.getContent(), MsgRedPackGiveContentDTO.class);
+			if (dto == null)
+				return null;
+			
+			contentList = new ArrayList<>();
+			contentList.add(new ClientTextStyleVO(dto.getTitle() + "", COLOR_CONTENT));
+			items.add(new CommonMsgItemVO(new ClientTextStyleVO("璧犻�佺被鍒�", COLOR_TITLE), contentList));
+
+			contentList = new ArrayList<>();
+			contentList.add(new ClientTextStyleVO(dto.getMoney() + "", COLOR_HIGHLIGHT_CONTENT));
+			items.add(new CommonMsgItemVO(new ClientTextStyleVO("璧犻�侀噾棰�", COLOR_TITLE), contentList));
+			
+			contentList = new ArrayList<>();
+			contentList.add(new ClientTextStyleVO(dto.getGiveTime() + "", COLOR_CONTENT));
+			items.add(new CommonMsgItemVO(new ClientTextStyleVO("璧犻�佹椂闂�", COLOR_TITLE), contentList));
+			
+			contentList = new ArrayList<>();
+			contentList.add(new ClientTextStyleVO(dto.getTime() + "", COLOR_CONTENT));
+			items.add(new CommonMsgItemVO(new ClientTextStyleVO("閫�鍥炴椂闂�", COLOR_TITLE), contentList));
+
+			contentList = new ArrayList<>();
+			contentList.add(new ClientTextStyleVO(StringUtil.isNullOrEmpty(msg.getBeiZhu()) ? "鏃�" : msg.getBeiZhu(),
+					COLOR_CONTENT));
+			items.add(new CommonMsgItemVO(new ClientTextStyleVO("澶囨敞", COLOR_TITLE), contentList));
+
+			return new UserMsgVO("http://img.flqapp.com/resource/msg/icon_hongbao_give.png",
+					MsgTypeMoneyTypeEnum.redPackGiveBack.getDesc(), msg.getUpdateTime() == null ? msg.getCreateTime() : msg.getUpdateTime(),
+					items);
+		} else if (msg.getMsgType() == MsgTypeMoneyTypeEnum.redPackExchangePass) { // 绾㈠寘鎻愮幇鎴愬姛
+			if (StringUtil.isNullOrEmpty(msg.getContent()))
+				return null;
+
+			MsgRedPackExchangeContentDTO dto = new Gson().fromJson(msg.getContent(), MsgRedPackExchangeContentDTO.class);
+			if (dto == null)
+				return null;
+			
+			contentList = new ArrayList<>();
+			contentList.add(new ClientTextStyleVO(msg.getMsgType().getDesc() + "", COLOR_CONTENT));
+			items.add(new CommonMsgItemVO(new ClientTextStyleVO("绫诲埆", COLOR_TITLE), contentList));
+
+			contentList = new ArrayList<>();
+			contentList.add(new ClientTextStyleVO(dto.getTime() + "", COLOR_CONTENT));
+			items.add(new CommonMsgItemVO(new ClientTextStyleVO("鎻愮幇鏃堕棿", COLOR_TITLE), contentList));
+
+			contentList = new ArrayList<>();
+			contentList.add(new ClientTextStyleVO(dto.getHandle() + "", COLOR_CONTENT));
+			items.add(new CommonMsgItemVO(new ClientTextStyleVO("瀹℃牳鏂瑰紡", COLOR_TITLE), contentList));
+			
+			contentList = new ArrayList<>();
+			contentList.add(new ClientTextStyleVO(dto.getMoney() + "", COLOR_HIGHLIGHT_CONTENT));
+			items.add(new CommonMsgItemVO(new ClientTextStyleVO("鎻愮幇閲戦", COLOR_TITLE), contentList));
+			
+			contentList = new ArrayList<>();
+			contentList.add(new ClientTextStyleVO(dto.getBalance() + "", COLOR_HIGHLIGHT_CONTENT));
+			items.add(new CommonMsgItemVO(new ClientTextStyleVO("璐︽埛浣欓", COLOR_TITLE), contentList));
+			
+			contentList = new ArrayList<>();
+			contentList.add(new ClientTextStyleVO(StringUtil.isNullOrEmpty(msg.getBeiZhu()) ? "鏃�" : msg.getBeiZhu(),
+					COLOR_CONTENT));
+			items.add(new CommonMsgItemVO(new ClientTextStyleVO("澶囨敞", COLOR_TITLE), contentList));
+			
+			return new UserMsgVO("http://img.flqapp.com/resource/msg/icon_hongbao_tixian.png",
+					dto.getTitle(), msg.getUpdateTime() == null ? msg.getCreateTime() : msg.getUpdateTime(),
+					items);
+		} else if (msg.getMsgType() == MsgTypeMoneyTypeEnum.redPackExchangeReject) { // 绾㈠寘鎻愮幇鎷掔粷
+			if (StringUtil.isNullOrEmpty(msg.getContent()))
+				return null;
+
+			MsgRedPackExchangeContentDTO dto = new Gson().fromJson(msg.getContent(), MsgRedPackExchangeContentDTO.class);
+			if (dto == null)
+				return null;
+			
+			contentList = new ArrayList<>();
+			contentList.add(new ClientTextStyleVO(msg.getMsgType().getDesc() + "", COLOR_CONTENT));
+			items.add(new CommonMsgItemVO(new ClientTextStyleVO("绫诲埆", COLOR_TITLE), contentList));
+
+			contentList = new ArrayList<>();
+			contentList.add(new ClientTextStyleVO(dto.getTime() + "", COLOR_CONTENT));
+			items.add(new CommonMsgItemVO(new ClientTextStyleVO("鎻愮幇鏃堕棿", COLOR_TITLE), contentList));
+
+			contentList = new ArrayList<>();
+			contentList.add(new ClientTextStyleVO(dto.getReason() + "", COLOR_CONTENT));
+			items.add(new CommonMsgItemVO(new ClientTextStyleVO("澶辫触鍘熷洜", COLOR_TITLE), contentList));
+		
+			String handle = dto.getHandle();
+			if (StringUtil.isNullOrEmpty(handle))
+				handle = "鏃�";
+			contentList = new ArrayList<>();
+			contentList.add(new ClientTextStyleVO(handle, COLOR_CONTENT));
+			items.add(new CommonMsgItemVO(new ClientTextStyleVO("澶勭悊", COLOR_TITLE), contentList));
+			
+
+			contentList = new ArrayList<>();
+			contentList.add(new ClientTextStyleVO(StringUtil.isNullOrEmpty(msg.getBeiZhu()) ? "鏃�" : msg.getBeiZhu(),
+					COLOR_CONTENT));
+			items.add(new CommonMsgItemVO(new ClientTextStyleVO("澶囨敞", COLOR_TITLE), contentList));
+
+			return new UserMsgVO("http://img.flqapp.com/resource/msg/icon_hongbao_tixian.png",
+					dto.getTitle(), msg.getUpdateTime() == null ? msg.getCreateTime() : msg.getUpdateTime(),
+					items);
+		} else if (msg.getMsgType() == MsgTypeMoneyTypeEnum.redPackNewUserReward
+				|| msg.getMsgType() == MsgTypeMoneyTypeEnum.redPackInviteSucceed
+				|| msg.getMsgType() == MsgTypeMoneyTypeEnum.redPackFirstSharedOrder
+				|| msg.getMsgType() == MsgTypeMoneyTypeEnum.redPackMonthSharedOrder) { // 绾㈠寘閭�璇疯幏寰�
+			if (StringUtil.isNullOrEmpty(msg.getContent()))
+				return null;
+
+			MsgRedPackAddContentDTO dto = new Gson().fromJson(msg.getContent(), MsgRedPackAddContentDTO.class);
+			if (dto == null)
+				return null;
+			
+			contentList = new ArrayList<>();
+			contentList.add(new ClientTextStyleVO(msg.getMsgType().getDesc() + "", COLOR_CONTENT));
+			items.add(new CommonMsgItemVO(new ClientTextStyleVO("澧炲姞鍘熷洜", COLOR_TITLE), contentList));
+
+			contentList = new ArrayList<>();
+			contentList.add(new ClientTextStyleVO(dto.getMoney() + "", COLOR_HIGHLIGHT_CONTENT));
+			items.add(new CommonMsgItemVO(new ClientTextStyleVO("閲�        棰�", COLOR_TITLE), contentList));
+
+			contentList = new ArrayList<>();
+			contentList.add(new ClientTextStyleVO(dto.getBalance() + "", COLOR_HIGHLIGHT_CONTENT));
+			items.add(new CommonMsgItemVO(new ClientTextStyleVO("绾㈠寘浣欓", COLOR_TITLE), contentList));
+		
+			contentList = new ArrayList<>();
+			contentList.add(new ClientTextStyleVO(StringUtil.isNullOrEmpty(msg.getBeiZhu()) ? "鏃�" : msg.getBeiZhu(),
+					COLOR_CONTENT));
+			items.add(new CommonMsgItemVO(new ClientTextStyleVO("澶囨敞", COLOR_TITLE), contentList));
+
+			return new UserMsgVO("http://img.flqapp.com/img/tlj/icon_tlj.png",
+					dto.getTitle(), msg.getUpdateTime() == null ? msg.getCreateTime() : msg.getUpdateTime(),
+					items);
+		}
 		return null;
 	}
 

--
Gitblit v1.8.0