From 28cf328a098334b51a3e9d2d56f983fb8c862211 Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期六, 23 五月 2020 09:54:38 +0800
Subject: [PATCH] 足迹、收藏订单兼容新需求

---
 fanli/src/main/java/com/yeshi/fanli/util/factory/msg/UserMsgVOFactory.java | 1079 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++---
 1 files changed, 1,016 insertions(+), 63 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..4b35824 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,25 @@
 import java.util.List;
 
 import com.google.gson.Gson;
+import com.google.gson.reflect.TypeToken;
+import com.yeshi.fanli.dto.msg.MsgAccountVipDTO;
+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.MsgOtherVIPDTO;
+import com.yeshi.fanli.dto.msg.MsgRedPackExchangeContentDTO;
+import com.yeshi.fanli.dto.msg.MsgRedPackGiveContentDTO;
+import com.yeshi.fanli.dto.msg.MsgRedPackTeamRewardContentDTO;
+import com.yeshi.fanli.dto.msg.MsgRedPackUseContentDTO;
 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 +33,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;
@@ -56,19 +67,37 @@
 	 * @return
 	 */
 	public static UserMsgVO create(MsgOrderDetail msg, JumpDetailV2 jumpDetail, JSONObject params) {
-
-		UserMsgVO vo = new UserMsgVO("http://img.flqapp.com/resource/msg/icon_msg_order.png", "璁㈠崟娑堟伅",
-				msg.getUpdateTime() == null ? msg.getCreateTime() : msg.getUpdateTime(), null);
-
 		List<CommonMsgItemVO> items = new ArrayList<>();
+		
+		// 鏂扮増娑堟伅
+		if (!StringUtil.isNullOrEmpty(msg.getExtraInfo())) {
+			Gson gson = new Gson();
+			items.addAll(gson.fromJson(msg.getExtraInfo(), new TypeToken<ArrayList<CommonMsgItemVO>>() {}.getType()));
+
+			UserMsgVO userMsgVO = new UserMsgVO();
+			userMsgVO.setId(msg.getId());
+			userMsgVO.setIcon(msg.getType().getIcon());
+			userMsgVO.setTitle(msg.getType().getDesc());
+			userMsgVO.setTime(msg.getUpdateTime() == null ? msg.getCreateTime() : msg.getUpdateTime());
+			userMsgVO.setContentItems(items);
+			
+			userMsgVO.setJumpDetail(jumpDetail);
+			if (params != null)
+				userMsgVO.setParams(params.toString());
+			
+			return userMsgVO;
+		}
+			 
+		
+		UserMsgVO vo = new UserMsgVO(msg.getId(), "http://img.flqapp.com/resource/msg/icon_msg_order.png", "璁㈠崟娑堟伅",
+				msg.getUpdateTime() == null ? msg.getCreateTime() : msg.getUpdateTime(), null);
+		
 		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,16 +120,50 @@
 					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) {
+				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();
-			if (type == MsgTypeOrderTypeEnum.invite || type == MsgTypeOrderTypeEnum.share) {
+			if (type == MsgTypeOrderTypeEnum.invite) {
 				orderId = UserUtil.filterOrderId(orderId);
 			}
 			contentList = new ArrayList<>();
@@ -163,9 +226,21 @@
 	 * @return
 	 */
 	public static UserMsgVO create(MsgMoneyDetail msg) {
-
 		List<CommonMsgItemVO> items = new ArrayList<>();
+		// 鏂扮増娑堟伅
+		if (!StringUtil.isNullOrEmpty(msg.getExtraInfo())) {
+			Gson gson = new Gson();
+			items.addAll(gson.fromJson(msg.getExtraInfo(), new TypeToken<ArrayList<CommonMsgItemVO>>() {}.getType()));
 
+			UserMsgVO userMsgVO = new UserMsgVO();
+			userMsgVO.setId(msg.getId());
+			userMsgVO.setIcon(msg.getMsgType().getIcon());
+			userMsgVO.setTitle(msg.getMsgType().getDesc());
+			userMsgVO.setTime(msg.getUpdateTime() == null ? msg.getCreateTime() : msg.getUpdateTime());
+			userMsgVO.setContentItems(items);
+			return userMsgVO;
+		}
+				
 		List<ClientTextStyleVO> contentList = new ArrayList<>();
 
 		// 鎻愮幇
@@ -222,7 +297,8 @@
 			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_extract.png", "鎻愮幇",
+			
+			return new UserMsgVO(msg.getId(),"http://img.flqapp.com/resource/msg/icon_msg_extract.png", "鎻愮幇",
 					msg.getUpdateTime() == null ? msg.getCreateTime() : msg.getUpdateTime(), items);
 		} else if (msg.getMsgType() == MsgTypeMoneyTypeEnum.extractValid) {
 			BindingAccount ba = new BindingAccount();
@@ -251,14 +327,14 @@
 					COLOR_CONTENT));
 			items.add(new CommonMsgItemVO(new ClientTextStyleVO("澶囨敞", COLOR_TITLE), contentList));
 
-			return new UserMsgVO("http://img.flqapp.com/resource/msg/icon_msg_extract.png", "鎻愮幇璐﹀彿楠岃瘉",
+			return new UserMsgVO(msg.getId(), "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));
@@ -283,7 +359,34 @@
 					COLOR_CONTENT));
 			items.add(new CommonMsgItemVO(new ClientTextStyleVO("澶囨敞", COLOR_TITLE), contentList));
 
-			return new UserMsgVO("http://img.flqapp.com/resource/msg/icon_msg_fanli.png", "杩斿埄鍒拌处",
+			return new UserMsgVO(msg.getId(),"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(msg.getId(),"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) {
@@ -291,9 +394,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.getOrderCount() + "", COLOR_CONTENT));
@@ -324,11 +427,11 @@
 			String date = ca.get(Calendar.YEAR) + "骞�" + (ca.get(Calendar.MONTH) + 1) + "鏈�";
 
 			if (msg.getMsgType() == MsgTypeMoneyTypeEnum.share)
-				return new UserMsgVO("http://img.flqapp.com/resource/msg/icon_msg_share_money.png",
+				return new UserMsgVO(msg.getId(),"http://img.flqapp.com/resource/msg/icon_msg_share_money.png",
 						date + msg.getMsgType().getDesc(),
 						msg.getUpdateTime() == null ? msg.getCreateTime() : msg.getUpdateTime(), items);
 			else
-				return new UserMsgVO("http://img.flqapp.com/resource/msg/icon_msg_invite_money.png",
+				return new UserMsgVO(msg.getId(),"http://img.flqapp.com/resource/msg/icon_msg_invite_money.png",
 						date + msg.getMsgType().getDesc(),
 						msg.getUpdateTime() == null ? msg.getCreateTime() : msg.getUpdateTime(), items);
 
@@ -336,14 +439,13 @@
 			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));
 
 			contentList = new ArrayList<>();
-			contentList.add(new ClientTextStyleVO("璁㈠崟缁存潈", COLOR_CONTENT));
+			contentList.add(new ClientTextStyleVO("璁㈠崟鍞悗", COLOR_CONTENT));
 			items.add(new CommonMsgItemVO(new ClientTextStyleVO("鎵ｉ櫎璇存槑", COLOR_TITLE), contentList));
 
 			contentList = new ArrayList<>();
@@ -359,21 +461,20 @@
 					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.getMsgType().getDesc(),
+			return new UserMsgVO(msg.getId(),"http://img.flqapp.com/resource/msg/icon_msg_fanli.png", msg.getMsgType().getDesc(),
 					msg.getUpdateTime() == null ? msg.getCreateTime() : msg.getUpdateTime(), items);
 		} else if (msg.getMsgType() == MsgTypeMoneyTypeEnum.shareWeiQuan) {
 			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));
 
 			contentList = new ArrayList<>();
-			contentList.add(new ClientTextStyleVO("璁㈠崟缁存潈", COLOR_CONTENT));
+
+			contentList.add(new ClientTextStyleVO(msg.getOrderId(), 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));
 
 			contentList = new ArrayList<>();
@@ -389,21 +490,21 @@
 					COLOR_CONTENT));
 			items.add(new CommonMsgItemVO(new ClientTextStyleVO("澶囨敞", COLOR_TITLE), contentList));
 
-			return new UserMsgVO("http://img.flqapp.com/resource/msg/icon_msg_share_money.png",
+			return new UserMsgVO(msg.getId(),"http://img.flqapp.com/resource/msg/icon_msg_share_money.png",
 					msg.getMsgType().getDesc(), msg.getUpdateTime() == null ? msg.getCreateTime() : msg.getUpdateTime(),
 					items);
 		} else if (msg.getMsgType() == MsgTypeMoneyTypeEnum.inviteWeiQuan) {
 			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));
 
 			contentList = new ArrayList<>();
-			contentList.add(new ClientTextStyleVO("璁㈠崟缁存潈", COLOR_CONTENT));
+			contentList.add(new ClientTextStyleVO("璁㈠崟鍞悗", COLOR_CONTENT));
 			items.add(new CommonMsgItemVO(new ClientTextStyleVO("鎵ｉ櫎璇存槑", COLOR_TITLE), contentList));
 
 			contentList = new ArrayList<>();
@@ -419,16 +520,16 @@
 					COLOR_CONTENT));
 			items.add(new CommonMsgItemVO(new ClientTextStyleVO("澶囨敞", COLOR_TITLE), contentList));
 
-			return new UserMsgVO("http://img.flqapp.com/resource/msg/icon_msg_invite_money.png",
+			return new UserMsgVO(msg.getId(),"http://img.flqapp.com/resource/msg/icon_msg_invite_money.png",
 					msg.getMsgType().getDesc(), msg.getUpdateTime() == null ? msg.getCreateTime() : msg.getUpdateTime(),
 					items);
 		} else if (msg.getMsgType() == MsgTypeMoneyTypeEnum.orderReward) {// 濂栧姳璁㈠崟
 			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));
 
@@ -445,7 +546,7 @@
 					COLOR_CONTENT));
 			items.add(new CommonMsgItemVO(new ClientTextStyleVO("澶囨敞", COLOR_TITLE), contentList));
 
-			return new UserMsgVO("http://img.flqapp.com/resource/msg/icon_msg_order_reward.png",
+			return new UserMsgVO(msg.getId(),"http://img.flqapp.com/resource/msg/icon_msg_order_reward.png",
 					msg.getMsgType().getDesc(), msg.getUpdateTime() == null ? msg.getCreateTime() : msg.getUpdateTime(),
 					items);
 		} else if (msg.getMsgType() == MsgTypeMoneyTypeEnum.systemEqualize) {// 绯荤粺琛ュ伩
@@ -466,11 +567,468 @@
 					COLOR_CONTENT));
 			items.add(new CommonMsgItemVO(new ClientTextStyleVO("澶囨敞", COLOR_TITLE), contentList));
 
-			return new UserMsgVO("http://img.flqapp.com/resource/money_detail/icon_system.png",
+			return new UserMsgVO(msg.getId(),"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(msg.getId(),"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(msg.getId(),"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.orderTeamReward) { // 鍥㈤槦濂栧姳
+			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(msg.getId(),"http://img.flqapp.com/resource/msg/icon_msg_team_reward.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(msg.getId(),"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(msg.getId(),"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(msg.getId(),"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(msg.getId(),"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)) {
+				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(msg.getId(),"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.redPackForbid) { // 绾㈠寘灏佺娑堟伅
+			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(dto.getReason() + "", 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(StringUtil.isNullOrEmpty(msg.getBeiZhu()) ? "鏃�" : msg.getBeiZhu(),
+					COLOR_CONTENT));
+			items.add(new CommonMsgItemVO(new ClientTextStyleVO("澶囨敞", COLOR_TITLE), contentList));
+
+			return new UserMsgVO(msg.getId(),"http://img.flqapp.com/img/tlj/icon_tlj.png", msg.getMsgType().getDesc(),
+					msg.getUpdateTime() == null ? msg.getCreateTime() : msg.getUpdateTime(), items);
+		} else if (msg.getMsgType() == MsgTypeMoneyTypeEnum.redPackForbidRemove) { // 绾㈠寘灏佺瑙ｉ櫎娑堟伅
+			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(dto.getReason() + "", 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(StringUtil.isNullOrEmpty(msg.getBeiZhu()) ? "鏃�" : msg.getBeiZhu(),
+					COLOR_CONTENT));
+			items.add(new CommonMsgItemVO(new ClientTextStyleVO("澶囨敞", COLOR_TITLE), contentList));
+
+			return new UserMsgVO(msg.getId(),"http://img.flqapp.com/img/tlj/icon_tlj.png", msg.getMsgType().getDesc(),
+					msg.getUpdateTime() == null ? msg.getCreateTime() : msg.getUpdateTime(), items);
+		} else if (msg.getMsgType() == MsgTypeMoneyTypeEnum.redPackDeduct) { // 绾㈠寘鎵ｉ櫎娑堟伅
+			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(dto.getReason() + "", 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(msg.getId(),"http://img.flqapp.com/img/tlj/icon_tlj.png", msg.getMsgType().getDesc(),
+					msg.getUpdateTime() == null ? msg.getCreateTime() : msg.getUpdateTime(), items);
+		} else if (msg.getMsgType() == MsgTypeMoneyTypeEnum.redPackOneStageReward
+				|| msg.getMsgType() == MsgTypeMoneyTypeEnum.redPackTwoStageReward
+				|| msg.getMsgType() == MsgTypeMoneyTypeEnum.redPackThreeStageReward) { // 绾㈠寘閭�璇疯幏寰�
+			if (StringUtil.isNullOrEmpty(msg.getContent()))
+				return null;
+
+			MsgRedPackTeamRewardContentDTO dto = new Gson().fromJson(msg.getContent(),
+					MsgRedPackTeamRewardContentDTO.class);
+			if (dto == null)
+				return null;
+
+			contentList = new ArrayList<>();
+			contentList.add(new ClientTextStyleVO(dto.getNickName() + "", COLOR_CONTENT, dto.getPortrait()));
+			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(StringUtil.isNullOrEmpty(msg.getBeiZhu()) ? "鏃�" : msg.getBeiZhu(),
+					COLOR_CONTENT));
+			items.add(new CommonMsgItemVO(new ClientTextStyleVO("澶囨敞", COLOR_TITLE), contentList));
+
+			return new UserMsgVO(msg.getId(),"http://img.flqapp.com/img/tlj/icon_tlj.png", "绾㈠寘鎻愰啋",
+					msg.getUpdateTime() == null ? msg.getCreateTime() : msg.getUpdateTime(), items);
+		} else if (msg.getMsgType() == MsgTypeMoneyTypeEnum.redPackUseSuccess) { // 绾㈠寘浣跨敤鎴愬姛
+			if (StringUtil.isNullOrEmpty(msg.getContent()))
+				return null;
+
+			MsgRedPackUseContentDTO dto = new Gson().fromJson(msg.getContent(), MsgRedPackUseContentDTO.class);
+			if (dto == null)
+				return null;
+
+			String useType = "";
+			boolean moneyPay = dto.getMoney() != null && dto.getMoney().compareTo(new BigDecimal(0)) > 0;
+			boolean hongBaoPay = dto.getHongBao() != null && dto.getHongBao().compareTo(new BigDecimal(0)) > 0;
+			if (moneyPay && hongBaoPay) {
+				useType = "绾㈠寘+鐜伴噾";
+			} else if (hongBaoPay)
+				useType = "浠呯孩鍖�";
+			else if (moneyPay)
+				useType = "浠呯幇閲�";
+
+			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(dto.getGoodsSetName() + "", COLOR_CONTENT));
+			items.add(new CommonMsgItemVO(new ClientTextStyleVO("鍏戞崲鍟嗗搧", COLOR_TITLE), contentList));
+
+			contentList = new ArrayList<>();
+			contentList.add(new ClientTextStyleVO(useType, COLOR_CONTENT));
+			items.add(new CommonMsgItemVO(new ClientTextStyleVO("鍏戞崲鏂瑰紡", COLOR_TITLE), contentList));
+
+			if (hongBaoPay) {
+				contentList = new ArrayList<>();
+				contentList.add(
+						new ClientTextStyleVO("楼" + dto.getHongBao().setScale(2).toString(), COLOR_HIGHLIGHT_CONTENT));
+				items.add(new CommonMsgItemVO(new ClientTextStyleVO("娑堣�楃孩鍖�", COLOR_TITLE), contentList));
+			}
+
+			if (moneyPay) {
+				contentList = new ArrayList<>();
+				contentList.add(
+						new ClientTextStyleVO("楼" + dto.getMoney().setScale(2).toString(), COLOR_HIGHLIGHT_CONTENT));
+				items.add(new CommonMsgItemVO(new ClientTextStyleVO("娑堣�楃幇閲�", COLOR_TITLE), contentList));
+			}
+
+			contentList = new ArrayList<>();
+			contentList.add(new ClientTextStyleVO(
+					"浜哄伐瀹℃牳[" + TimeUtil.getGernalTime(dto.getTime().getTime(), "yyyy.MM.dd HH:mm") + "]",
+					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(msg.getId(),"http://img.flqapp.com/img/tlj/icon_tlj.png", "绾㈠寘娑堟伅",
+					msg.getUpdateTime() == null ? msg.getCreateTime() : msg.getUpdateTime(), items);
+		} else if (msg.getMsgType() == MsgTypeMoneyTypeEnum.redPackUseFail) { // 绾㈠寘浣跨敤澶辫触
+			if (StringUtil.isNullOrEmpty(msg.getContent()))
+				return null;
+
+			MsgRedPackUseContentDTO dto = new Gson().fromJson(msg.getContent(), MsgRedPackUseContentDTO.class);
+			if (dto == null)
+				return null;
+
+			String useType = "";
+			boolean moneyPay = dto.getMoney() != null && dto.getMoney().compareTo(new BigDecimal(0)) > 0;
+			boolean hongBaoPay = dto.getHongBao() != null && dto.getHongBao().compareTo(new BigDecimal(0)) > 0;
+			if (moneyPay && hongBaoPay) {
+				useType = "绾㈠寘+鐜伴噾";
+			} else if (hongBaoPay)
+				useType = "浠呯孩鍖�";
+			else if (moneyPay)
+				useType = "浠呯幇閲�";
+
+			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(dto.getGoodsSetName() + "", COLOR_CONTENT));
+			items.add(new CommonMsgItemVO(new ClientTextStyleVO("鍏戞崲鍟嗗搧", COLOR_TITLE), contentList));
+
+			contentList = new ArrayList<>();
+			contentList.add(new ClientTextStyleVO(useType, COLOR_CONTENT));
+			items.add(new CommonMsgItemVO(new ClientTextStyleVO("鍏戞崲鏂瑰紡", COLOR_TITLE), contentList));
+
+			if (hongBaoPay) {
+				contentList = new ArrayList<>();
+				contentList.add(
+						new ClientTextStyleVO("楼" + dto.getHongBao().setScale(2).toString(), COLOR_HIGHLIGHT_CONTENT));
+				items.add(new CommonMsgItemVO(new ClientTextStyleVO("娑堣�楃孩鍖�", COLOR_TITLE), contentList));
+			}
+
+			if (moneyPay) {
+				contentList = new ArrayList<>();
+				contentList.add(new ClientTextStyleVO("楼" + dto.getMoney().setScale(2).toString() + "[宸插師璺��鍥瀅",
+						COLOR_HIGHLIGHT_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));
+
+			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(msg.getId(),"http://img.flqapp.com/img/tlj/icon_tlj.png", "绾㈠寘娑堟伅",
+					msg.getUpdateTime() == null ? msg.getCreateTime() : msg.getUpdateTime(), items);
+		}
 		return null;
 	}
 
@@ -482,7 +1040,78 @@
 	 */
 	public static UserMsgVO create(MsgAccountDetail msg) {
 		List<CommonMsgItemVO> items = new ArrayList<>();
+		// 鏂扮増娑堟伅
+		if (!StringUtil.isNullOrEmpty(msg.getExtraInfo())) {
+			Gson gson = new Gson();
+			items.addAll(gson.fromJson(msg.getExtraInfo(), new TypeToken<ArrayList<CommonMsgItemVO>>() {}.getType()));
+
+			UserMsgVO userMsgVO = new UserMsgVO();
+			userMsgVO.setId(msg.getId());
+			userMsgVO.setIcon(msg.getType().getIcon());
+			userMsgVO.setTitle(msg.getType().getDesc());
+			userMsgVO.setTime(msg.getUpdateTime() == null ? msg.getCreateTime() : msg.getUpdateTime());
+			userMsgVO.setContentItems(items);
+			return userMsgVO;
+		}
+		
 		List<ClientTextStyleVO> contentList = new ArrayList<>();
+		
+		if (msg.getType() == MsgTypeAccountTypeEnum.vipPgrade) {// 绛夌骇鍗囩骇
+			
+			contentList.add(new ClientTextStyleVO(msg.getTitle() + "", COLOR_CONTENT));
+			items.add(new CommonMsgItemVO(new ClientTextStyleVO("璇�        鎯�", COLOR_TITLE), contentList));
+			
+			MsgAccountVipDTO dto = new Gson().fromJson(msg.getContent(), MsgAccountVipDTO.class);
+			if (dto != null) {
+				if (!StringUtil.isNullOrEmpty(dto.getStatus())) {
+					contentList = new ArrayList<>();
+					contentList.add(new ClientTextStyleVO(dto.getStatus() + "", COLOR_CONTENT));
+					items.add(new CommonMsgItemVO(new ClientTextStyleVO("鐘�        鎬�", COLOR_TITLE), contentList));
+				}
+
+				if (!StringUtil.isNullOrEmpty(dto.getEquity())) {
+					contentList = new ArrayList<>();
+					contentList.add(new ClientTextStyleVO(dto.getEquity() + "", 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));
+				}
+			}
+
+			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(msg.getId(),"http://img.flqapp.com/resource/msg/icon_msg_account.png", msg.getType().getDesc(),
+					msg.getUpdateTime() == null ? msg.getCreateTime() : msg.getUpdateTime(), items);
+		}
+		
+		
+		if (msg.getType() == MsgTypeAccountTypeEnum.vipApply) {// vip鍗囩骇鐢宠
+			
+			contentList.add(new ClientTextStyleVO(msg.getTitle() + "", COLOR_CONTENT));
+			items.add(new CommonMsgItemVO(new ClientTextStyleVO("鐢宠杩涘害", COLOR_TITLE), contentList));
+			
+			contentList = new ArrayList<>();
+			contentList.add(new ClientTextStyleVO(msg.getContent() + "", 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(msg.getId(),"http://img.flqapp.com/resource/msg/icon_msg_account.png", msg.getType().getDesc(),
+					msg.getUpdateTime() == null ? msg.getCreateTime() : msg.getUpdateTime(), items);
+		}
+		
+		
+	
 
 		contentList.add(new ClientTextStyleVO(msg.getTitle() + "", COLOR_CONTENT));
 		items.add(new CommonMsgItemVO(new ClientTextStyleVO("浜嬮」", COLOR_TITLE), contentList));
@@ -528,7 +1157,7 @@
 		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_account.png", msg.getType().getDesc(),
+		return new UserMsgVO(msg.getId(),"http://img.flqapp.com/resource/msg/icon_msg_account.png", msg.getType().getDesc(),
 				msg.getUpdateTime() == null ? msg.getCreateTime() : msg.getUpdateTime(), items);
 	}
 
@@ -539,8 +1168,96 @@
 	 * @return
 	 */
 	public static UserMsgVO create(MsgInviteDetail msg) {
+		MsgTypeInviteTypeEnum msgType = msg.getMsgType();
+		
+		// 鏂扮増娑堟伅
+		if (!StringUtil.isNullOrEmpty(msg.getExtraInfo())) {
+			Gson gson = new Gson();
+			List<CommonMsgItemVO> items = new ArrayList<>();
+			items.addAll(gson.fromJson(msg.getExtraInfo(), new TypeToken<ArrayList<CommonMsgItemVO>>() {}.getType()));
+
+			UserMsgVO userMsgVO = new UserMsgVO();
+			userMsgVO.setId(msg.getId());
+			userMsgVO.setIcon(msg.getMsgType().getIcon());
+			userMsgVO.setTitle(msg.getMsgType().getDesc());
+			userMsgVO.setTime(msg.getUpdateTime() == null ? msg.getCreateTime() : msg.getUpdateTime());
+			userMsgVO.setContentItems(items);
+			return userMsgVO;
+		}
+				
+				
+		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(msg.getId(), "http://img.flqapp.com/resource/msg/icon_msg_invite.png", dto.getTitle(),
+					msg.getUpdateTime() == null ? msg.getCreateTime() : msg.getUpdateTime(), items);
+		} else if (msgType == MsgTypeInviteTypeEnum.inviteSucceed) {
+			if (msg.getInviteUser() == null || msg.getInviteUser().getWorker() == null)
+				return null;
+
+			List<CommonMsgItemVO> items = new ArrayList<>();
+			List<ClientTextStyleVO> contentList = new ArrayList<>();
+			contentList.add(new ClientTextStyleVO(msg.getInviteUser().getWorker().getNickName() + "", COLOR_CONTENT,
+					msg.getInviteUser().getWorker().getPortrait()));
+			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));
+
+			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(msg.getId(),"http://img.flqapp.com/resource/msg/icon_msg_invite.png", "閭�璇锋彁閱� ",
+					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));
@@ -557,7 +1274,7 @@
 				COLOR_CONTENT));
 		items.add(new CommonMsgItemVO(new ClientTextStyleVO("澶囨敞", COLOR_TITLE), contentList));
 
-		return new UserMsgVO("http://img.flqapp.com/resource/msg/icon_msg_invite.png", msg.getMsgType().getDesc(),
+		return new UserMsgVO(msg.getId(),"http://img.flqapp.com/resource/msg/icon_msg_invite.png", msg.getMsgType().getDesc(),
 				msg.getUpdateTime() == null ? msg.getCreateTime() : msg.getUpdateTime(), items);
 	}
 
@@ -569,12 +1286,26 @@
 	 */
 	public static UserMsgVO create(MsgOtherDetail msg) {
 		List<CommonMsgItemVO> items = new ArrayList<>();
+		// 鏂扮増娑堟伅
+		if (!StringUtil.isNullOrEmpty(msg.getExtraInfo())) {
+			Gson gson = new Gson();
+			items.addAll(gson.fromJson(msg.getExtraInfo(), new TypeToken<ArrayList<CommonMsgItemVO>>() {}.getType()));
 
+			UserMsgVO userMsgVO = new UserMsgVO();
+			userMsgVO.setId(msg.getId());
+			userMsgVO.setIcon(msg.getType().getIcon());
+			userMsgVO.setTitle(msg.getType().getDesc());
+			userMsgVO.setTime(msg.getUpdateTime() == null ? msg.getCreateTime() : msg.getUpdateTime());
+			userMsgVO.setContentItems(items);
+			return userMsgVO;
+		}
+				
 		String icon = null;
-
 		if (msg.getType() == MsgTypeOtherTypeEnum.couponMianDan
 				|| msg.getType() == MsgTypeOtherTypeEnum.couponWelfareMianDan
-				|| msg.getType() == MsgTypeOtherTypeEnum.couponReward) {
+				|| msg.getType() == MsgTypeOtherTypeEnum.couponReward
+				|| msg.getType() == MsgTypeOtherTypeEnum.freeCouponBuy
+				|| msg.getType() == MsgTypeOtherTypeEnum.freeCouponGive) {
 
 			if (StringUtil.isNullOrEmpty(msg.getContent()))
 				return null;
@@ -628,7 +1359,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 +1367,7 @@
 				} else {
 					contentList.add(new ClientTextStyleVO("澶�", COLOR_CONTENT));
 				}
-				
+
 				items.add(new CommonMsgItemVO(new ClientTextStyleVO("鍓╀綑澶╂暟", COLOR_TITLE), contentList));
 			}
 
@@ -710,15 +1441,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 +1466,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,8 +1482,9 @@
 			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.setId(msg.getId());
 			userMsgVO.setIcon(icon);
 			userMsgVO.setTitle(dto.getTitle());
 			userMsgVO.setTime(msg.getUpdateTime() == null ? msg.getCreateTime() : msg.getUpdateTime());
@@ -769,7 +1499,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 +1535,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 +1557,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,8 +1568,9 @@
 			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.setId(msg.getId());
 			userMsgVO.setIcon(icon);
 			userMsgVO.setTitle(dto.getTitle());
 			userMsgVO.setTime(msg.getUpdateTime() == null ? msg.getCreateTime() : msg.getUpdateTime());
@@ -854,9 +1585,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 +1605,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,17 +1616,239 @@
 			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.setId(msg.getId());
 			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.setId(msg.getId());
+			userMsgVO.setIcon(icon);
+			userMsgVO.setTitle(msg.getType().getDesc());
+			userMsgVO.setTime(msg.getUpdateTime() == null ? msg.getCreateTime() : msg.getUpdateTime());
+			userMsgVO.setContentItems(items);
+			return userMsgVO;
+		} else if (msg.getType() == MsgTypeOtherTypeEnum.taoLiJinExchange) {
+			if (StringUtil.isNullOrEmpty(msg.getContent()))
+				return null;
+
+			MsgOtherRewardIntegralDTO dto = new Gson().fromJson(msg.getContent(), MsgOtherRewardIntegralDTO.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.getExplain())) {
+				contentList = new ArrayList<>();
+				contentList.add(new ClientTextStyleVO(dto.getExplain() + "", COLOR_CONTENT));
+				items.add(new CommonMsgItemVO(new ClientTextStyleVO("鍘�        鍥�", COLOR_TITLE), contentList));
+			}
+
+			if (dto.getTotal() != null) {
+				contentList = new ArrayList<>();
+				contentList.add(new ClientTextStyleVO(dto.getTotal(), COLOR_CONTENT));
+				items.add(new CommonMsgItemVO(new ClientTextStyleVO("鍙姌绠楅", COLOR_TITLE), contentList));
+			}
+
+			if (!StringUtil.isNullOrEmpty(dto.getNum())) {
+				contentList = new ArrayList<>();
+				contentList.add(new ClientTextStyleVO(dto.getNum() + "", COLOR_CONTENT));
+				items.add(new CommonMsgItemVO(new ClientTextStyleVO("鎶樼畻閲戝竵", COLOR_TITLE), contentList));
+			}
+
+			if (!StringUtil.isNullOrEmpty(dto.getSource())) {
+				contentList = new ArrayList<>();
+				contentList.add(new ClientTextStyleVO(dto.getSource(), 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.setId(msg.getId());
+			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.passVIPApply
+			    || msg.getType() == MsgTypeOtherTypeEnum.rejectVIPApply) {
+			if (StringUtil.isNullOrEmpty(msg.getContent()))
+				return null;
+
+			MsgOtherVIPDTO dto = new Gson().fromJson(msg.getContent(), MsgOtherVIPDTO.class);
+			if (dto == null)
+				return null;
+
+			List<ClientTextStyleVO> contentList = new ArrayList<>();
+
+			contentList = new ArrayList<>();
+			contentList.add(new ClientTextStyleVO(dto.getContent1(), COLOR_CONTENT));
+			items.add(new CommonMsgItemVO(new ClientTextStyleVO("瀹℃牳鐘舵��", COLOR_TITLE), contentList));
+
+			contentList = new ArrayList<>();
+			contentList.add(new ClientTextStyleVO(dto.getContent2(), COLOR_CONTENT));
+			items.add(new CommonMsgItemVO(new ClientTextStyleVO("鍘�        鍥�", COLOR_TITLE), contentList));
+
+			if (!StringUtil.isNullOrEmpty(dto.getContent3())) {
+				contentList = new ArrayList<>();
+				contentList.add(new ClientTextStyleVO(dto.getContent3() + "", 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.setId(msg.getId());
+			userMsgVO.setIcon("http://img.flqapp.com/resource/msg/icon_msg_vip.png");
+			userMsgVO.setTitle(msg.getType().getDesc());
+			userMsgVO.setTime(msg.getUpdateTime() == null ? msg.getCreateTime() : msg.getUpdateTime());
+			userMsgVO.setContentItems(items);
+			return userMsgVO;
+		} else if (msg.getType() == MsgTypeOtherTypeEnum.teamVIPCallBoss) {
+			if (StringUtil.isNullOrEmpty(msg.getContent()))
+				return null;
+
+			MsgOtherVIPDTO dto = new Gson().fromJson(msg.getContent(), MsgOtherVIPDTO.class);
+			if (dto == null)
+				return null;
+
+			List<ClientTextStyleVO> contentList = new ArrayList<>();
+
+			contentList = new ArrayList<>();
+			contentList.add(new ClientTextStyleVO(dto.getContent1(), COLOR_CONTENT));
+			items.add(new CommonMsgItemVO(new ClientTextStyleVO("鐩存帴绮変笣", COLOR_TITLE), contentList));
+
+			contentList = new ArrayList<>();
+			contentList.add(new ClientTextStyleVO(dto.getContent2(), COLOR_CONTENT));
+			items.add(new CommonMsgItemVO(new ClientTextStyleVO("浼氬憳鐘舵��", COLOR_TITLE), contentList));
+
+			contentList = new ArrayList<>();
+			contentList.add(new ClientTextStyleVO(dto.getContent3() + "", 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.setId(msg.getId());
+			userMsgVO.setIcon("http://img.flqapp.com/resource/msg/icon_msg_notify.png");
+			userMsgVO.setTitle(msg.getType().getDesc());
+			userMsgVO.setTime(msg.getUpdateTime() == null ? msg.getCreateTime() : msg.getUpdateTime());
+			userMsgVO.setContentItems(items);
+			return userMsgVO;
+		} else if (msg.getType() == MsgTypeOtherTypeEnum.teamSplitCallBoss) {
+			if (StringUtil.isNullOrEmpty(msg.getContent()))
+				return null;
+
+			MsgOtherVIPDTO dto = new Gson().fromJson(msg.getContent(), MsgOtherVIPDTO.class);
+			if (dto == null)
+				return null;
+
+			List<ClientTextStyleVO> contentList = new ArrayList<>();
+
+			contentList = new ArrayList<>();
+			contentList.add(new ClientTextStyleVO(dto.getContent1(), COLOR_CONTENT));
+			items.add(new CommonMsgItemVO(new ClientTextStyleVO("鐩存帴绮変笣", COLOR_TITLE), contentList));
+
+			contentList = new ArrayList<>();
+			contentList.add(new ClientTextStyleVO(dto.getContent2(), COLOR_CONTENT));
+			items.add(new CommonMsgItemVO(new ClientTextStyleVO("鑴辩鍘熷洜", COLOR_TITLE), contentList));
+
+			contentList = new ArrayList<>();
+			contentList.add(new ClientTextStyleVO(dto.getContent3() + "", 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.setId(msg.getId());
+			userMsgVO.setIcon("http://img.flqapp.com/resource/msg/icon_msg_invite_break.png");
+			userMsgVO.setTitle(msg.getType().getDesc());
+			userMsgVO.setTime(msg.getUpdateTime() == null ? msg.getCreateTime() : msg.getUpdateTime());
+			userMsgVO.setContentItems(items);
+			return userMsgVO;
+		} else if (msg.getType() == MsgTypeOtherTypeEnum.vipUpgradeReward) {
+			if (StringUtil.isNullOrEmpty(msg.getContent()))
+				return null;
+
+			Gson gson = new Gson();
+			items.addAll(gson.fromJson(msg.getContent(), new TypeToken<ArrayList<CommonMsgItemVO>>() {}.getType()));
+
+			UserMsgVO userMsgVO = new UserMsgVO();
+			userMsgVO.setId(msg.getId());
+			userMsgVO.setIcon(msg.getType().getIcon());
+			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(),
+		return new UserMsgVO(msg.getId(),icon, msg.getType().getDesc(),
 				msg.getUpdateTime() == null ? msg.getCreateTime() : msg.getUpdateTime(), items);
 	}
 

--
Gitblit v1.8.0