From 69bee82b81626b82b7f39f0e459e4f56b1699b51 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 13 三月 2019 12:02:16 +0800
Subject: [PATCH] 正式数据库修改

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

diff --git a/fanli/src/main/java/com/yeshi/fanli/util/factory/msg/UserMsgVOFactory.java b/fanli/src/main/java/com/yeshi/fanli/util/factory/msg/UserMsgVOFactory.java
index a6fed7e..1f26278 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
@@ -5,12 +5,15 @@
 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;
@@ -334,7 +337,7 @@
 			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));
 
@@ -436,4 +439,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("楼" + MoneyBigDecimalUtil.getWithNoZera(dto.getFanLiMoney()),
+						COLOR_CONTENT));
+				items.add(new CommonMsgItemVO(new ClientTextStyleVO("棰勪及杩斿埄", COLOR_TITLE), contentList));
+			}
+			
+			if (dto.getOrderFanLiMoney() != null) {
+				contentList = new ArrayList<>();
+				contentList.add(new ClientTextStyleVO("楼" + MoneyBigDecimalUtil.getWithNoZera(dto.getOrderFanLiMoney()),
+						COLOR_CONTENT));
+				items.add(new CommonMsgItemVO(new ClientTextStyleVO("璁㈠崟杩斿埄", COLOR_TITLE), contentList));
+			}
+			
+			if (dto.getRewardMoney() != null) {
+				contentList = new ArrayList<>();
+				contentList.add(new ClientTextStyleVO("楼" + MoneyBigDecimalUtil.getWithNoZera(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