From 1e92eff67b997263ecefa255c63eb6641c47b57f Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期五, 14 六月 2019 10:22:33 +0800
Subject: [PATCH] 设备消息BUG解决，品牌

---
 fanli/src/main/java/com/yeshi/fanli/util/factory/msg/UserMsgVOFactory.java |  227 ++++++++++++++++++++++++++++++++++++++++++--------------
 1 files changed, 170 insertions(+), 57 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 56ad13b..9fb13a4 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
@@ -1,20 +1,23 @@
 package com.yeshi.fanli.util.factory.msg;
 
+import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.Calendar;
 import java.util.List;
 
 import com.google.gson.Gson;
+import com.yeshi.fanli.dto.msg.MsgOtherCouponContentDTO;
 import com.yeshi.fanli.entity.bus.msg.MsgAccountDetail;
 import com.yeshi.fanli.entity.bus.msg.MsgInviteDetail;
 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;
 import com.yeshi.fanli.entity.bus.msg.MsgOrderDetail.MsgTypeOrderTypeEnum;
+import com.yeshi.fanli.entity.bus.msg.MsgOtherDetail;
+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.log.LogHelper;
-import com.yeshi.fanli.util.MoneyBigDecimalUtil;
 import com.yeshi.fanli.util.StringUtil;
 import com.yeshi.fanli.util.TimeUtil;
 import com.yeshi.fanli.util.account.UserUtil;
@@ -28,6 +31,13 @@
 	private final static String COLOR_CONTENT = "#000000";
 	private final static String COLOR_HIGHLIGHT_CONTENT = "#E5005C";
 
+	private static BigDecimal filterMoney(BigDecimal money) {
+		if (money == null)
+			return null;
+		else
+		return	money.setScale(2);
+	}
+
 	/**
 	 * 璁㈠崟娑堟伅
 	 * 
@@ -37,53 +47,76 @@
 	public static UserMsgVO create(MsgOrderDetail msg) {
 
 		List<CommonMsgItemVO> items = new ArrayList<>();
-
 		List<ClientTextStyleVO> contentList = new ArrayList<>();
-		contentList.add(new ClientTextStyleVO(msg.getOrderId(), COLOR_CONTENT));
-		items.add(new CommonMsgItemVO(new ClientTextStyleVO("璁㈠崟鍙�", COLOR_TITLE), contentList));
+		if (msg.getType() == MsgTypeOrderTypeEnum.found) {
+			contentList.add(new ClientTextStyleVO("璁㈠崟鎵惧洖", 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.getGoodsCount() + "", COLOR_HIGHLIGHT_CONTENT));
-		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(msg.getType().getDesc(), COLOR_CONTENT));
-		items.add(new CommonMsgItemVO(new ClientTextStyleVO("璁㈠崟绫诲瀷", COLOR_TITLE), contentList));
+			contentList = new ArrayList<>();
+			contentList.add(new ClientTextStyleVO(
+					TimeUtil.getGernalTime(msg.getHappendDate().getTime(), "yyyy.MM.dd HH:mm"), COLOR_CONTENT));
+			items.add(new CommonMsgItemVO(new ClientTextStyleVO("鎻愪氦鏃堕棿", COLOR_TITLE), contentList));
 
-		contentList = new ArrayList<>();
-		if (msg.getState() == MsgOrderDetail.STATE_FK)
-			contentList.add(new ClientTextStyleVO("宸蹭粯娆�", COLOR_HIGHLIGHT_CONTENT));
-		else if (msg.getState() == MsgOrderDetail.STATE_JS)
-			contentList.add(new ClientTextStyleVO("宸叉敹璐�", COLOR_HIGHLIGHT_CONTENT));
-		else if (msg.getState() == MsgOrderDetail.STATE_SX)
-			contentList.add(new ClientTextStyleVO("鏈粯娆�/宸查��娆�", COLOR_HIGHLIGHT_CONTENT));
-		else if (msg.getState() == MsgOrderDetail.STATE_WQ)
-			contentList.add(new ClientTextStyleVO("宸茬淮鏉�", COLOR_HIGHLIGHT_CONTENT));
+			contentList = new ArrayList<>();
+			contentList.add(new ClientTextStyleVO(msg.getState() == 1 ? "璁㈠崟鎵惧洖鎴愬姛" : "璁㈠崟鎵惧洖澶辫触", 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(msg.getState() == 1 ? "楼" +filterMoney( msg.getPayMoney()) : "鏃�",
+					COLOR_HIGHLIGHT_CONTENT));
+			items.add(new CommonMsgItemVO(new ClientTextStyleVO("鎵惧洖閲戦", COLOR_TITLE), contentList));
 
-		contentList = new ArrayList<>();
-		contentList.add(new ClientTextStyleVO("楼" + MoneyBigDecimalUtil.getWithNoZera(msg.getPayMoney()),
-				COLOR_HIGHLIGHT_CONTENT));
-		items.add(new CommonMsgItemVO(new ClientTextStyleVO("浠樻閲戦", COLOR_TITLE), contentList));
+		} else {
+			contentList.add(new ClientTextStyleVO(msg.getOrderId(), COLOR_CONTENT));
+			items.add(new CommonMsgItemVO(new ClientTextStyleVO("璁㈠崟鍙�", COLOR_TITLE), contentList));
 
-		contentList = new ArrayList<>();
-		contentList.add(new ClientTextStyleVO("楼" + MoneyBigDecimalUtil.getWithNoZera(msg.getHongBaoMoney()),
-				COLOR_HIGHLIGHT_CONTENT));
+			contentList = new ArrayList<>();
+			contentList.add(new ClientTextStyleVO("鍏�", COLOR_CONTENT));
+			contentList.add(new ClientTextStyleVO(msg.getGoodsCount() + "", COLOR_HIGHLIGHT_CONTENT));
+			contentList.add(new ClientTextStyleVO("浠跺晢鍝�", COLOR_CONTENT));
+			items.add(new CommonMsgItemVO(new ClientTextStyleVO("鍟嗗搧鏁伴噺", COLOR_TITLE), contentList));
 
-		if (msg.getType() == MsgTypeOrderTypeEnum.fanli)
-			items.add(new CommonMsgItemVO(new ClientTextStyleVO("杩斿埄閲戦", COLOR_TITLE), contentList));
-		else if (msg.getType() == MsgTypeOrderTypeEnum.share)
-			items.add(new CommonMsgItemVO(new ClientTextStyleVO("鍒嗕韩濂栭噾", COLOR_TITLE), contentList));
-		else if (msg.getType() == MsgTypeOrderTypeEnum.invite)
-			items.add(new CommonMsgItemVO(new ClientTextStyleVO("閭�璇峰閲�", COLOR_TITLE), contentList));
+			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() == MsgOrderDetail.STATE_FK)
+				contentList.add(new ClientTextStyleVO("宸蹭粯娆�", COLOR_HIGHLIGHT_CONTENT));
+			else if (msg.getState() == MsgOrderDetail.STATE_JS)
+				contentList.add(new ClientTextStyleVO("宸叉敹璐�", COLOR_HIGHLIGHT_CONTENT));
+			else if (msg.getState() == MsgOrderDetail.STATE_SX)
+				contentList.add(new ClientTextStyleVO("鏈粯娆�/宸查��娆�", COLOR_HIGHLIGHT_CONTENT));
+			else if (msg.getState() == MsgOrderDetail.STATE_WQ)
+				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));
+
+			if (msg.getType() == MsgTypeOrderTypeEnum.fanli)
+				items.add(new CommonMsgItemVO(new ClientTextStyleVO("杩斿埄閲戦", COLOR_TITLE), contentList));
+			else if (msg.getType() == MsgTypeOrderTypeEnum.share)
+				items.add(new CommonMsgItemVO(new ClientTextStyleVO("鍒嗕韩濂栭噾", COLOR_TITLE), contentList));
+			else if (msg.getType() == MsgTypeOrderTypeEnum.invite)
+				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_order.png", "璁㈠崟娑堟伅",
 				msg.getUpdateTime() == null ? msg.getCreateTime() : msg.getUpdateTime(), items);
 	}
@@ -112,7 +145,7 @@
 			items.add(new CommonMsgItemVO(new ClientTextStyleVO("鎻愮幇璐﹀彿", COLOR_TITLE), contentList));
 
 			contentList = new ArrayList<>();
-			contentList.add(new ClientTextStyleVO("楼" + MoneyBigDecimalUtil.getWithNoZera(msg.getExtract().getMoney()),
+			contentList.add(new ClientTextStyleVO("楼" +filterMoney(msg.getExtract().getMoney()),
 					COLOR_HIGHLIGHT_CONTENT));
 			items.add(new CommonMsgItemVO(new ClientTextStyleVO("鎻愮幇閲戦", COLOR_TITLE), contentList));
 
@@ -167,7 +200,7 @@
 			items.add(new CommonMsgItemVO(new ClientTextStyleVO("鎻愮幇璐﹀彿", COLOR_CONTENT), contentList));
 
 			contentList = new ArrayList<>();
-			contentList.add(new ClientTextStyleVO("楼" + MoneyBigDecimalUtil.getWithNoZera(msg.getMoney()),
+			contentList.add(new ClientTextStyleVO("楼" + filterMoney(msg.getMoney()),
 					COLOR_HIGHLIGHT_CONTENT));
 			items.add(new CommonMsgItemVO(new ClientTextStyleVO("鎻愮幇閲戦", COLOR_TITLE), contentList));
 
@@ -198,12 +231,12 @@
 			items.add(new CommonMsgItemVO(new ClientTextStyleVO("鍟嗗搧鏁伴噺", COLOR_TITLE), contentList));
 
 			contentList = new ArrayList<>();
-			contentList.add(new ClientTextStyleVO("楼" + MoneyBigDecimalUtil.getWithNoZera(msg.getMoney()) + "",
+			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("楼" + MoneyBigDecimalUtil.getWithNoZera(msg.getBalance()) + "",
+			contentList.add(new ClientTextStyleVO("楼" + filterMoney(msg.getBalance()) + "",
 					COLOR_CONTENT));
 			items.add(new CommonMsgItemVO(new ClientTextStyleVO("璐﹀彿浣欓", COLOR_TITLE), contentList));
 
@@ -229,12 +262,12 @@
 			items.add(new CommonMsgItemVO(new ClientTextStyleVO("濂栭噾鍟嗗搧", COLOR_TITLE), contentList));
 
 			contentList = new ArrayList<>();
-			contentList.add(new ClientTextStyleVO("楼" + MoneyBigDecimalUtil.getWithNoZera(msg.getMoney()) + "",
+			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("楼" + MoneyBigDecimalUtil.getWithNoZera(msg.getBalance()) + "",
+			contentList.add(new ClientTextStyleVO("楼" + filterMoney(msg.getBalance()) + "",
 					COLOR_CONTENT));
 			items.add(new CommonMsgItemVO(new ClientTextStyleVO("璐﹀彿浣欓", COLOR_TITLE), contentList));
 
@@ -266,12 +299,12 @@
 			items.add(new CommonMsgItemVO(new ClientTextStyleVO("鎵ｉ櫎璇存槑", COLOR_TITLE), contentList));
 
 			contentList = new ArrayList<>();
-			contentList.add(new ClientTextStyleVO("楼" + MoneyBigDecimalUtil.getWithNoZera(msg.getMoney()) + "",
+			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("楼" + MoneyBigDecimalUtil.getWithNoZera(msg.getBalance()) + "",
+			contentList.add(new ClientTextStyleVO("楼" + filterMoney(msg.getBalance()) + "",
 					COLOR_CONTENT));
 			items.add(new CommonMsgItemVO(new ClientTextStyleVO("璐﹀彿浣欓", COLOR_TITLE), contentList));
 
@@ -291,12 +324,12 @@
 			items.add(new CommonMsgItemVO(new ClientTextStyleVO("鎵ｉ櫎璇存槑", COLOR_TITLE), contentList));
 
 			contentList = new ArrayList<>();
-			contentList.add(new ClientTextStyleVO("楼" + MoneyBigDecimalUtil.getWithNoZera(msg.getMoney()) + "",
+			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("楼" + MoneyBigDecimalUtil.getWithNoZera(msg.getBalance()) + "",
+			contentList.add(new ClientTextStyleVO("楼" + filterMoney(msg.getBalance()) + "",
 					COLOR_CONTENT));
 			items.add(new CommonMsgItemVO(new ClientTextStyleVO("璐﹀彿浣欓", COLOR_TITLE), contentList));
 
@@ -317,12 +350,12 @@
 			items.add(new CommonMsgItemVO(new ClientTextStyleVO("鎵ｉ櫎璇存槑", COLOR_TITLE), contentList));
 
 			contentList = new ArrayList<>();
-			contentList.add(new ClientTextStyleVO("楼" + MoneyBigDecimalUtil.getWithNoZera(msg.getMoney()) + "",
+			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("楼" + MoneyBigDecimalUtil.getWithNoZera(msg.getBalance()) + "",
+			contentList.add(new ClientTextStyleVO("楼" + filterMoney(msg.getBalance()) + "",
 					COLOR_CONTENT));
 			items.add(new CommonMsgItemVO(new ClientTextStyleVO("璐﹀彿浣欓", COLOR_TITLE), contentList));
 
@@ -334,21 +367,17 @@
 			return new UserMsgVO("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) {//濂栧姳璁㈠崟
+		} else if (msg.getMsgType() == MsgTypeMoneyTypeEnum.orderReward) {// 濂栧姳璁㈠崟
 			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));
-			items.add(new CommonMsgItemVO(new ClientTextStyleVO("鎵ｉ櫎璇存槑", COLOR_TITLE), contentList));
-
-			contentList = new ArrayList<>();
-			contentList.add(new ClientTextStyleVO("楼" + MoneyBigDecimalUtil.getWithNoZera(msg.getMoney()) + "",
+			contentList.add(new ClientTextStyleVO("楼" + filterMoney(msg.getMoney()) + "",
 					COLOR_HIGHLIGHT_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("楼" + MoneyBigDecimalUtil.getWithNoZera(msg.getBalance()) + "",
+			contentList.add(new ClientTextStyleVO("楼" + filterMoney(msg.getBalance()) + "",
 					COLOR_CONTENT));
 			items.add(new CommonMsgItemVO(new ClientTextStyleVO("璐﹀彿浣欓", COLOR_TITLE), contentList));
 
@@ -357,7 +386,7 @@
 					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("http://img.flqapp.com/resource/msg/icon_msg_order_reward.png",
 					msg.getMsgType().getDesc(), msg.getUpdateTime() == null ? msg.getCreateTime() : msg.getUpdateTime(),
 					items);
 		}
@@ -440,4 +469,88 @@
 				msg.getUpdateTime() == null ? msg.getCreateTime() : msg.getUpdateTime(), items);
 	}
 
+	/**
+	 * 鍏朵粬娑堟伅
+	 * 
+	 * @param msg
+	 * @return
+	 */
+	public static UserMsgVO create(MsgOtherDetail msg) {
+		List<CommonMsgItemVO> items = new ArrayList<>();
+		if (msg.getType() == MsgTypeOtherTypeEnum.couponMianDan
+				|| msg.getType() == MsgTypeOtherTypeEnum.couponWelfareMianDan
+				|| msg.getType() == MsgTypeOtherTypeEnum.couponReward) {
+
+			if (StringUtil.isNullOrEmpty(msg.getContent()))
+				return null;
+			MsgOtherCouponContentDTO dto = new Gson().fromJson(msg.getContent(), MsgOtherCouponContentDTO.class);
+			if (dto == null)
+				return null;
+
+			List<ClientTextStyleVO> contentList = new ArrayList<>();
+			contentList.add(new ClientTextStyleVO(dto.getState(), COLOR_CONTENT));
+			items.add(new CommonMsgItemVO(new ClientTextStyleVO("鐘舵��", COLOR_TITLE), contentList));
+
+			if (!StringUtil.isNullOrEmpty(dto.getOrderId())) {
+				contentList = new ArrayList<>();
+				contentList.add(new ClientTextStyleVO(dto.getOrderId() + "", COLOR_CONTENT));
+				items.add(new CommonMsgItemVO(new ClientTextStyleVO("璁㈠崟鍙�", COLOR_TITLE), contentList));
+			}
+
+			if (dto.getFanLiMoney() != null) {
+				contentList = new ArrayList<>();
+				contentList.add(new ClientTextStyleVO("楼" + filterMoney(dto.getFanLiMoney()),
+						COLOR_CONTENT));
+				items.add(new CommonMsgItemVO(new ClientTextStyleVO("棰勪及杩斿埄", COLOR_TITLE), contentList));
+			}
+
+			if (dto.getOrderFanLiMoney() != null) {
+				contentList = new ArrayList<>();
+				contentList.add(new ClientTextStyleVO("楼" + filterMoney(dto.getOrderFanLiMoney()),
+						COLOR_CONTENT));
+				items.add(new CommonMsgItemVO(new ClientTextStyleVO("璁㈠崟杩斿埄", COLOR_TITLE), contentList));
+			}
+
+			if (dto.getRewardMoney() != null) {
+				contentList = new ArrayList<>();
+				contentList.add(new ClientTextStyleVO("楼" + filterMoney(dto.getRewardMoney()),
+						COLOR_HIGHLIGHT_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));
+			}
+
+			if (!StringUtil.isNullOrEmpty(dto.getStartTime()) && !StringUtil.isNullOrEmpty(dto.getEndTime())) {
+				contentList = new ArrayList<>();
+				contentList.add(new ClientTextStyleVO(dto.getStartTime() + "-" + dto.getEndTime(), COLOR_CONTENT));
+				items.add(new CommonMsgItemVO(new ClientTextStyleVO("鏈夋晥鏈�", COLOR_TITLE), contentList));
+			}
+
+			if (dto.getLeftDay() != null) {
+				contentList = new ArrayList<>();
+				contentList.add(new ClientTextStyleVO(dto.getLeftDay() + "", COLOR_HIGHLIGHT_CONTENT));
+				contentList.add(new ClientTextStyleVO("澶�", 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));
+		}
+
+		return new UserMsgVO("http://img.flqapp.com/resource/msg/icon_msg_other_coupon.png", msg.getType().getDesc(),
+				msg.getUpdateTime() == null ? msg.getCreateTime() : msg.getUpdateTime(), items);
+	}
+
 }

--
Gitblit v1.8.0