From d0f12da013131cd291cec6e81a12d661c02c4bf4 Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期二, 17 三月 2020 12:14:27 +0800
Subject: [PATCH] 2.1

---
 fanli/src/main/java/com/yeshi/fanli/util/factory/msg/UserMsgVOFactory.java |   52 ++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 52 insertions(+), 0 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 6b73fe6..926e3d3 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,7 @@
 import java.util.List;
 
 import com.google.gson.Gson;
+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;
@@ -983,6 +984,57 @@
 	public static UserMsgVO create(MsgAccountDetail msg) {
 		List<CommonMsgItemVO> items = new ArrayList<>();
 		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));
+				}
+			}
+
+			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));

--
Gitblit v1.8.0