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 |  476 +++++++++++++++++++++++++++++++++++++++++++++++++++++++----
 1 files changed, 440 insertions(+), 36 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 ee0fdca..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
@@ -6,15 +6,21 @@
 import java.util.List;
 
 import com.google.gson.Gson;
+import com.yeshi.fanli.dto.msg.MsgInviteContentDTO;
 import com.yeshi.fanli.dto.msg.MsgOtherCouponActivateDTO;
 import com.yeshi.fanli.dto.msg.MsgOtherCouponContentDTO;
 import com.yeshi.fanli.dto.msg.MsgOtherExchangeContentDTO;
 import com.yeshi.fanli.dto.msg.MsgOtherGiveContentDTO;
 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;
+import com.yeshi.fanli.entity.bus.msg.MsgInviteDetail.MsgTypeInviteTypeEnum;
 import com.yeshi.fanli.entity.bus.msg.MsgMoneyDetail;
 import com.yeshi.fanli.entity.bus.msg.MsgMoneyDetail.MsgTypeMoneyTypeEnum;
 import com.yeshi.fanli.entity.bus.msg.MsgOrderDetail;
@@ -23,6 +29,7 @@
 import com.yeshi.fanli.entity.bus.msg.MsgOtherDetail.MsgTypeOtherTypeEnum;
 import com.yeshi.fanli.entity.bus.user.BindingAccount;
 import com.yeshi.fanli.entity.bus.user.Extract;
+import com.yeshi.fanli.entity.bus.user.HongBaoV2;
 import com.yeshi.fanli.entity.common.JumpDetailV2;
 import com.yeshi.fanli.log.LogHelper;
 import com.yeshi.fanli.util.Constant;
@@ -63,12 +70,10 @@
 		List<CommonMsgItemVO> items = new ArrayList<>();
 		List<ClientTextStyleVO> contentList = new ArrayList<>();
 		if (msg.getType() == MsgTypeOrderTypeEnum.found) {
-			
-			
 			contentList = new ArrayList<>();
 			contentList.add(new ClientTextStyleVO(Constant.getSourceName(msg.getOrderType()), COLOR_CONTENT));
 			items.add(new CommonMsgItemVO(new ClientTextStyleVO("娓犻亾鏉ユ簮", COLOR_TITLE), contentList));
-			
+
 			contentList = new ArrayList<>();
 			contentList.add(new ClientTextStyleVO("璁㈠崟鎵惧洖", COLOR_CONTENT));
 			items.add(new CommonMsgItemVO(new ClientTextStyleVO("绫诲埆", COLOR_TITLE), contentList));
@@ -91,12 +96,46 @@
 					COLOR_HIGHLIGHT_CONTENT));
 			items.add(new CommonMsgItemVO(new ClientTextStyleVO("鎵惧洖閲戦", COLOR_TITLE), contentList));
 
-		} else {
-
+		} else if (msg.getType() == MsgTypeOrderTypeEnum.elme) {
 			contentList = new ArrayList<>();
 			contentList.add(new ClientTextStyleVO(Constant.getSourceName(msg.getOrderType()), COLOR_CONTENT));
 			items.add(new CommonMsgItemVO(new ClientTextStyleVO("娓犻亾鏉ユ簮", COLOR_TITLE), contentList));
 
+			String orderId = msg.getOrderId();
+			MsgTypeOrderTypeEnum type = msg.getType();
+			if (type == MsgTypeOrderTypeEnum.invite || type == MsgTypeOrderTypeEnum.share) {
+				orderId = UserUtil.filterOrderId(orderId);
+			}
+			contentList = new ArrayList<>();
+			contentList.add(new ClientTextStyleVO(orderId, COLOR_CONTENT));
+			items.add(new CommonMsgItemVO(new ClientTextStyleVO("璁㈠崟鍙�", COLOR_TITLE), contentList, false));
+
+			contentList = new ArrayList<>();
+			contentList.add(new ClientTextStyleVO(msg.getType().getDesc(), COLOR_CONTENT));
+			items.add(new CommonMsgItemVO(new ClientTextStyleVO("璁㈠崟绫诲瀷", COLOR_TITLE), contentList));
+
+			contentList = new ArrayList<>();
+			if (msg.getState() == HongBaoV2.STATE_BUKELINGQU||msg.getState() == HongBaoV2.STATE_KELINGQU)
+				contentList.add(new ClientTextStyleVO("宸蹭粯娆�", COLOR_HIGHLIGHT_CONTENT));
+			else if (msg.getState() == HongBaoV2.STATE_SHIXIAO)
+				contentList.add(new ClientTextStyleVO("鏈粯娆�/宸查��娆�", COLOR_HIGHLIGHT_CONTENT));
+
+			items.add(new CommonMsgItemVO(new ClientTextStyleVO("璁㈠崟鐘舵��", COLOR_TITLE), contentList));
+
+			contentList = new ArrayList<>();
+			contentList.add(new ClientTextStyleVO("楼" + filterMoney(msg.getPayMoney()), COLOR_HIGHLIGHT_CONTENT));
+			items.add(new CommonMsgItemVO(new ClientTextStyleVO("浠樻閲戦", COLOR_TITLE), contentList));
+
+			contentList = new ArrayList<>();
+			contentList.add(new ClientTextStyleVO("楼" + filterMoney(msg.getHongBaoMoney()), COLOR_HIGHLIGHT_CONTENT));
+
+			items.add(new CommonMsgItemVO(new ClientTextStyleVO("杩斿埄閲戦", COLOR_TITLE), contentList));
+			if (params != null)
+				vo.setParams(params.toString());
+		} else {
+			contentList = new ArrayList<>();
+			contentList.add(new ClientTextStyleVO(Constant.getSourceName(msg.getOrderType()), COLOR_CONTENT));
+			items.add(new CommonMsgItemVO(new ClientTextStyleVO("娓犻亾鏉ユ簮", COLOR_TITLE), contentList));
 
 			String orderId = msg.getOrderId();
 			MsgTypeOrderTypeEnum type = msg.getType();
@@ -254,11 +293,11 @@
 			return new UserMsgVO("http://img.flqapp.com/resource/msg/icon_msg_extract.png", "鎻愮幇璐﹀彿楠岃瘉",
 					msg.getUpdateTime() == null ? msg.getCreateTime() : msg.getUpdateTime(), items);
 		} else if (msg.getMsgType() == MsgTypeMoneyTypeEnum.fanli) {
-			
+
 			contentList = new ArrayList<>();
 			contentList.add(new ClientTextStyleVO(Constant.getSourceName(msg.getOrderType()), COLOR_CONTENT));
 			items.add(new CommonMsgItemVO(new ClientTextStyleVO("娓犻亾鏉ユ簮", COLOR_TITLE), contentList));
-			
+
 			contentList = new ArrayList<>();
 			// 杩斿埄鍒拌处
 			contentList.add(new ClientTextStyleVO(msg.getOrderId(), COLOR_CONTENT));
@@ -286,14 +325,41 @@
 			return new UserMsgVO("http://img.flqapp.com/resource/msg/icon_msg_fanli.png", "杩斿埄鍒拌处",
 					msg.getUpdateTime() == null ? msg.getCreateTime() : msg.getUpdateTime(), items);
 
+		} else if (msg.getMsgType() == MsgTypeMoneyTypeEnum.fanliElme) {
+
+			contentList = new ArrayList<>();
+			contentList.add(new ClientTextStyleVO("楗夸簡涔�", COLOR_CONTENT));
+			items.add(new CommonMsgItemVO(new ClientTextStyleVO("娓犻亾鏉ユ簮", COLOR_TITLE), contentList));
+
+			contentList = new ArrayList<>();
+			// 杩斿埄鍒拌处
+			contentList.add(new ClientTextStyleVO(msg.getOrderId(), 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("楼" + filterMoney(msg.getBalance()) + "", 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_msg_fanli.png", "杩斿埄鍒拌处",
+					msg.getUpdateTime() == null ? msg.getCreateTime() : msg.getUpdateTime(), items);
+
 		} else if (msg.getMsgType() == MsgTypeMoneyTypeEnum.invite || msg.getMsgType() == MsgTypeMoneyTypeEnum.share) {
 
 			contentList = new ArrayList<>();
 			contentList.add(new ClientTextStyleVO(Constant.getSourceName(msg.getOrderType()), COLOR_CONTENT));
 			items.add(new CommonMsgItemVO(new ClientTextStyleVO("娓犻亾鏉ユ簮", COLOR_TITLE), contentList));
-			
+
 			contentList = new ArrayList<>();
-			
+
 			// 閭�璇峰閲�,鍒嗕韩濂栭噾
 
 			contentList.add(new ClientTextStyleVO(msg.getOrderCount() + "", COLOR_CONTENT));
@@ -336,9 +402,9 @@
 			contentList = new ArrayList<>();
 			contentList.add(new ClientTextStyleVO(Constant.getSourceName(msg.getOrderType()), COLOR_CONTENT));
 			items.add(new CommonMsgItemVO(new ClientTextStyleVO("娓犻亾鏉ユ簮", COLOR_TITLE), contentList));
-			
+
 			contentList = new ArrayList<>();
-			
+
 			contentList.add(new ClientTextStyleVO(msg.getOrderId(), COLOR_CONTENT));
 			items.add(new CommonMsgItemVO(new ClientTextStyleVO("杩斿埄璁㈠崟", COLOR_TITLE), contentList));
 
@@ -365,10 +431,9 @@
 			contentList = new ArrayList<>();
 			contentList.add(new ClientTextStyleVO(Constant.getSourceName(msg.getOrderType()), COLOR_CONTENT));
 			items.add(new CommonMsgItemVO(new ClientTextStyleVO("娓犻亾鏉ユ簮", COLOR_TITLE), contentList));
-			
+
 			contentList = new ArrayList<>();
-			
-			
+
 			contentList.add(new ClientTextStyleVO(msg.getOrderId(), COLOR_CONTENT));
 			items.add(new CommonMsgItemVO(new ClientTextStyleVO("閭�璇疯鍗�", COLOR_TITLE), contentList));
 
@@ -396,9 +461,9 @@
 			contentList = new ArrayList<>();
 			contentList.add(new ClientTextStyleVO(Constant.getSourceName(msg.getOrderType()), COLOR_CONTENT));
 			items.add(new CommonMsgItemVO(new ClientTextStyleVO("娓犻亾鏉ユ簮", COLOR_TITLE), contentList));
-			
+
 			contentList = new ArrayList<>();
-			
+
 			contentList.add(new ClientTextStyleVO(msg.getOrderId(), COLOR_CONTENT));
 			items.add(new CommonMsgItemVO(new ClientTextStyleVO("閭�璇疯鍗�", COLOR_TITLE), contentList));
 
@@ -426,9 +491,9 @@
 			contentList = new ArrayList<>();
 			contentList.add(new ClientTextStyleVO(Constant.getSourceName(msg.getOrderType()), COLOR_CONTENT));
 			items.add(new CommonMsgItemVO(new ClientTextStyleVO("娓犻亾鏉ユ簮", COLOR_TITLE), contentList));
-			
+
 			contentList = new ArrayList<>();
-			
+
 			contentList.add(new ClientTextStyleVO(msg.getOrderId(), COLOR_CONTENT));
 			items.add(new CommonMsgItemVO(new ClientTextStyleVO("濂栧姳璁㈠崟", COLOR_TITLE), contentList));
 
@@ -469,8 +534,250 @@
 			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.extractAutoWX) { // 寰俊鑷姩鎻愮幇
+			contentList = new ArrayList<>();
+			contentList.add(new ClientTextStyleVO("鑷姩鎻愮幇寰俊绾㈠寘鎴愬姛鎺ㄩ��", COLOR_CONTENT));
+			items.add(new CommonMsgItemVO(new ClientTextStyleVO("绫诲埆", COLOR_TITLE), contentList));
 
+			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(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/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;
 	}
 
@@ -539,8 +846,54 @@
 	 * @return
 	 */
 	public static UserMsgVO create(MsgInviteDetail msg) {
+		MsgTypeInviteTypeEnum msgType = msg.getMsgType();
+		if (msgType != null && msgType == MsgTypeInviteTypeEnum.receiveGift) {
+			if (StringUtil.isNullOrEmpty(msg.getDesc()))
+				return null;
+
+			MsgInviteContentDTO dto = new Gson().fromJson(msg.getDesc(), MsgInviteContentDTO.class);
+			if (dto == null)
+				return null;
+
+			List<CommonMsgItemVO> items = new ArrayList<>();
+			List<ClientTextStyleVO> contentList = new ArrayList<>();
+
+			if (!StringUtil.isNullOrEmpty(dto.getState())) {
+				contentList = new ArrayList<>();
+				contentList.add(new ClientTextStyleVO(dto.getState() + "", COLOR_CONTENT));
+				items.add(new CommonMsgItemVO(new ClientTextStyleVO("鐘舵��", COLOR_TITLE), contentList));
+			}
+
+			if (!StringUtil.isNullOrEmpty(dto.getCode())) {
+				contentList = new ArrayList<>();
+				contentList.add(new ClientTextStyleVO(dto.getCode() + "", COLOR_CONTENT));
+				items.add(new CommonMsgItemVO(new ClientTextStyleVO("閭�璇风爜", COLOR_TITLE), contentList));
+			}
+
+			if (!StringUtil.isNullOrEmpty(dto.getInviter())) {
+				contentList = new ArrayList<>();
+				contentList.add(new ClientTextStyleVO(dto.getInviter() + "", COLOR_CONTENT));
+				items.add(new CommonMsgItemVO(new ClientTextStyleVO("閭�璇蜂汉", COLOR_TITLE), contentList));
+			}
+
+			if (!StringUtil.isNullOrEmpty(dto.getMode())) {
+				contentList = new ArrayList<>();
+				contentList.add(new ClientTextStyleVO(dto.getMode() + "", 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_msg_invite.png", dto.getTitle(),
+					msg.getUpdateTime() == null ? msg.getCreateTime() : msg.getUpdateTime(), items);
+		}
+
 		if (msg.getInviteUser() == null || msg.getInviteUser().getWorker() == null)
 			return null;
+
 		List<CommonMsgItemVO> items = new ArrayList<>();
 		List<ClientTextStyleVO> contentList = new ArrayList<>();
 		LogHelper.test("閭�璇锋秷鎭�:" + new Gson().toJson(msg));
@@ -628,7 +981,7 @@
 			if (dto.getLeftDay() != null) {
 				contentList = new ArrayList<>();
 				contentList.add(new ClientTextStyleVO(dto.getLeftDay() + "", COLOR_HIGHLIGHT_CONTENT));
-				
+
 				if (msg.getType() == MsgTypeOtherTypeEnum.couponReward) {
 					contentList.add(new ClientTextStyleVO("澶╋紙鏈娇鐢ㄥ皢浼氳繃鏈燂級", COLOR_CONTENT));
 				} else if (msg.getType() == MsgTypeOtherTypeEnum.couponMianDan) {
@@ -636,7 +989,7 @@
 				} else {
 					contentList.add(new ClientTextStyleVO("澶�", COLOR_CONTENT));
 				}
-				
+
 				items.add(new CommonMsgItemVO(new ClientTextStyleVO("鍓╀綑澶╂暟", COLOR_TITLE), contentList));
 			}
 
@@ -710,15 +1063,14 @@
 				return null;
 
 			String type = dto.getType();
-			if (type == null) 
+			if (type == null)
 				return null;
-			
+
 			if (MsgOtherGiveContentDTO.TYEP_COUPON.equalsIgnoreCase(type)) {
 				icon = "http://img.flqapp.com/resource/msg/icon_msg_other_coupon.png";
 			} else {
 				icon = "http://img.flqapp.com/resource/msg/icon_msg_other_tlj.png";
 			}
-			
 
 			List<ClientTextStyleVO> contentList = new ArrayList<>();
 			contentList.add(new ClientTextStyleVO(dto.getGiveType(), COLOR_CONTENT));
@@ -736,13 +1088,12 @@
 				items.add(new CommonMsgItemVO(new ClientTextStyleVO("璧犻�佹椂闂�", COLOR_TITLE), contentList));
 			}
 
-
 			if (!StringUtil.isNullOrEmpty(dto.getReceiveTime())) {
 				contentList = new ArrayList<>();
 				contentList.add(new ClientTextStyleVO(dto.getReceiveTime() + "", COLOR_CONTENT));
 				items.add(new CommonMsgItemVO(new ClientTextStyleVO("棰嗗彇鏃堕棿", COLOR_TITLE), contentList));
 			}
-			
+
 			if (!StringUtil.isNullOrEmpty(dto.getReturnTime())) {
 				contentList = new ArrayList<>();
 				contentList.add(new ClientTextStyleVO(dto.getReturnTime() + "", COLOR_CONTENT));
@@ -753,7 +1104,7 @@
 			contentList.add(new ClientTextStyleVO(StringUtil.isNullOrEmpty(msg.getBeiZhu()) ? "鏃�" : msg.getBeiZhu(),
 					COLOR_CONTENT));
 			items.add(new CommonMsgItemVO(new ClientTextStyleVO("澶囨敞", COLOR_TITLE), contentList));
-			
+
 			UserMsgVO userMsgVO = new UserMsgVO();
 			userMsgVO.setIcon(icon);
 			userMsgVO.setTitle(dto.getTitle());
@@ -769,7 +1120,7 @@
 				return null;
 
 			icon = "http://img.flqapp.com/resource/msg/icon_msg_other_integral.png";
-			
+
 			List<ClientTextStyleVO> contentList = new ArrayList<>();
 			contentList.add(new ClientTextStyleVO(dto.getState(), COLOR_CONTENT));
 			items.add(new CommonMsgItemVO(new ClientTextStyleVO("鐘舵��", COLOR_TITLE), contentList));
@@ -805,7 +1156,7 @@
 				return null;
 
 			icon = "http://img.flqapp.com/resource/msg/icon_msg_other_coupon.png";
-			
+
 			List<ClientTextStyleVO> contentList = new ArrayList<>();
 			contentList.add(new ClientTextStyleVO(dto.getType(), COLOR_CONTENT));
 			items.add(new CommonMsgItemVO(new ClientTextStyleVO("绫诲埆", COLOR_TITLE), contentList));
@@ -827,7 +1178,7 @@
 				contentList.add(new ClientTextStyleVO(dto.getReceiveTime() + "", COLOR_CONTENT));
 				items.add(new CommonMsgItemVO(new ClientTextStyleVO("鑾疯禒鏃堕棿", COLOR_TITLE), contentList));
 			}
-			
+
 			if (!StringUtil.isNullOrEmpty(dto.getValidityTime())) {
 				contentList = new ArrayList<>();
 				contentList.add(new ClientTextStyleVO(dto.getValidityTime() + "", COLOR_CONTENT));
@@ -838,7 +1189,7 @@
 			contentList.add(new ClientTextStyleVO(StringUtil.isNullOrEmpty(msg.getBeiZhu()) ? "鏃�" : msg.getBeiZhu(),
 					COLOR_CONTENT));
 			items.add(new CommonMsgItemVO(new ClientTextStyleVO("澶囨敞", COLOR_TITLE), contentList));
-			
+
 			UserMsgVO userMsgVO = new UserMsgVO();
 			userMsgVO.setIcon(icon);
 			userMsgVO.setTitle(dto.getTitle());
@@ -854,9 +1205,9 @@
 				return null;
 
 			icon = "http://img.flqapp.com/resource/msg/icon_msg_other_integral.png";
-			
+
 			List<ClientTextStyleVO> contentList = new ArrayList<>();
-			
+
 			if (!StringUtil.isNullOrEmpty(dto.getSource())) {
 				contentList = new ArrayList<>();
 				contentList.add(new ClientTextStyleVO(dto.getSource() + "", COLOR_CONTENT));
@@ -874,7 +1225,7 @@
 				contentList.add(new ClientTextStyleVO(dto.getTotal() + "", COLOR_CONTENT));
 				items.add(new CommonMsgItemVO(new ClientTextStyleVO("鍓╀綑", COLOR_TITLE), contentList));
 			}
-			
+
 			if (!StringUtil.isNullOrEmpty(dto.getExplain())) {
 				contentList = new ArrayList<>();
 				contentList.add(new ClientTextStyleVO(dto.getExplain() + "", COLOR_CONTENT));
@@ -885,15 +1236,68 @@
 			contentList.add(new ClientTextStyleVO(StringUtil.isNullOrEmpty(msg.getBeiZhu()) ? "鏃�" : msg.getBeiZhu(),
 					COLOR_CONTENT));
 			items.add(new CommonMsgItemVO(new ClientTextStyleVO("澶囨敞", COLOR_TITLE), contentList));
-			
+
 			UserMsgVO userMsgVO = new UserMsgVO();
 			userMsgVO.setIcon(icon);
 			userMsgVO.setTitle(dto.getTitle());
 			userMsgVO.setTime(msg.getUpdateTime() == null ? msg.getCreateTime() : msg.getUpdateTime());
 			userMsgVO.setContentItems(items);
 			return userMsgVO;
-		}
+		} else if (msg.getType() == MsgTypeOtherTypeEnum.systemGive) {
+			if (StringUtil.isNullOrEmpty(msg.getContent()))
+				return null;
 
+			MsgOtherSystemGiveDTO dto = new Gson().fromJson(msg.getContent(), MsgOtherSystemGiveDTO.class);
+			if (dto == null)
+				return null;
+
+			icon = "http://img.flqapp.com/resource/msg/icon_msg_other_system_give.png";
+
+			List<ClientTextStyleVO> contentList = new ArrayList<>();
+
+			if (!StringUtil.isNullOrEmpty(dto.getName())) {
+				contentList = new ArrayList<>();
+				contentList.add(new ClientTextStyleVO(dto.getName() + "", COLOR_CONTENT));
+				items.add(new CommonMsgItemVO(new ClientTextStyleVO("璧犲搧", COLOR_TITLE), contentList));
+			}
+
+			if (dto.getCount() != null) {
+				contentList = new ArrayList<>();
+				contentList.add(new ClientTextStyleVO(dto.getCount() + "寮�", COLOR_CONTENT));
+				items.add(new CommonMsgItemVO(new ClientTextStyleVO("鏁伴噺", COLOR_TITLE), contentList));
+			}
+
+			if (!StringUtil.isNullOrEmpty(dto.getReason())) {
+				contentList = new ArrayList<>();
+				contentList.add(new ClientTextStyleVO(dto.getReason() + "", COLOR_CONTENT));
+				items.add(new CommonMsgItemVO(new ClientTextStyleVO("鍘熷洜", COLOR_TITLE), contentList));
+			}
+
+			if (!StringUtil.isNullOrEmpty(dto.getOrderId())) {
+				contentList = new ArrayList<>();
+				contentList.add(new ClientTextStyleVO(
+						"[" + Constant.getSourceName(dto.getOrderType()) + "]" + dto.getOrderId() + "", COLOR_CONTENT));
+				items.add(new CommonMsgItemVO(new ClientTextStyleVO("璁㈠崟", COLOR_TITLE), contentList));
+			}
+
+			if (!StringUtil.isNullOrEmpty(dto.getDesc())) {
+				contentList = new ArrayList<>();
+				contentList.add(new ClientTextStyleVO(dto.getDesc(), 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));
+
+			UserMsgVO userMsgVO = new UserMsgVO();
+			userMsgVO.setIcon(icon);
+			userMsgVO.setTitle(msg.getType().getDesc());
+			userMsgVO.setTime(msg.getUpdateTime() == null ? msg.getCreateTime() : msg.getUpdateTime());
+			userMsgVO.setContentItems(items);
+			return userMsgVO;
+		}
 
 		return new UserMsgVO(icon, msg.getType().getDesc(),
 				msg.getUpdateTime() == null ? msg.getCreateTime() : msg.getUpdateTime(), items);

--
Gitblit v1.8.0