From 24a8d17e007545f7426c48352109aa1a9c6587ee Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 06 五月 2020 12:02:09 +0800
Subject: [PATCH] IOS上线隐藏我的界面的banner与超级会员升级信息

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

diff --git a/fanli/src/main/java/com/yeshi/fanli/util/factory/msg/UserMsgVOFactory.java b/fanli/src/main/java/com/yeshi/fanli/util/factory/msg/UserMsgVOFactory.java
index 87ae60b..ec26aef 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,6 +6,8 @@
 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;
@@ -14,6 +16,11 @@
 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;
@@ -60,11 +67,29 @@
 	 * @return
 	 */
 	public static UserMsgVO create(MsgOrderDetail msg, JumpDetailV2 jumpDetail, JSONObject params) {
+		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.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("http://img.flqapp.com/resource/msg/icon_msg_order.png", "璁㈠崟娑堟伅",
 				msg.getUpdateTime() == null ? msg.getCreateTime() : msg.getUpdateTime(), null);
-
-		List<CommonMsgItemVO> items = new ArrayList<>();
 		List<ClientTextStyleVO> contentList = new ArrayList<>();
 		if (msg.getType() == MsgTypeOrderTypeEnum.found) {
 			contentList = new ArrayList<>();
@@ -100,7 +125,7 @@
 
 			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<>();
@@ -112,7 +137,7 @@
 			items.add(new CommonMsgItemVO(new ClientTextStyleVO("璁㈠崟绫诲瀷", COLOR_TITLE), contentList));
 
 			contentList = new ArrayList<>();
-			if (msg.getState() == HongBaoV2.STATE_BUKELINGQU||msg.getState() == HongBaoV2.STATE_KELINGQU)
+			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));
@@ -136,7 +161,7 @@
 
 			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<>();
@@ -199,9 +224,20 @@
 	 * @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.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<>();
 
 		// 鎻愮幇
@@ -401,12 +437,11 @@
 			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<>();
@@ -432,10 +467,10 @@
 			contentList = new ArrayList<>();
 
 			contentList.add(new ClientTextStyleVO(msg.getOrderId(), COLOR_CONTENT));
-			items.add(new CommonMsgItemVO(new ClientTextStyleVO("閭�璇疯鍗�", COLOR_TITLE), contentList));
+			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<>();
@@ -465,7 +500,7 @@
 			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<>();
@@ -556,8 +591,440 @@
 			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.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("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("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)) {
+				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.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("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("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("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("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("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("http://img.flqapp.com/img/tlj/icon_tlj.png", "绾㈠寘娑堟伅",
+					msg.getUpdateTime() == null ? msg.getCreateTime() : msg.getUpdateTime(), items);
+		}
 		return null;
 	}
 
@@ -569,7 +1036,77 @@
 	 */
 	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.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("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("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));
@@ -627,6 +1164,22 @@
 	 */
 	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.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;
@@ -669,6 +1222,31 @@
 
 			return new UserMsgVO("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("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)
@@ -702,12 +1280,25 @@
 	 */
 	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.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;
@@ -1077,6 +1668,168 @@
 			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.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.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.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.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.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(),

--
Gitblit v1.8.0