From 59b262966f00605a39a0de1e03ce79e5e0f425d9 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期六, 12 十月 2019 10:47:30 +0800
Subject: [PATCH] 饿了么到账消息设置,分享爆款商品列表不再需要登录

---
 fanli/src/main/java/com/yeshi/fanli/util/factory/msg/UserMsgVOFactory.java |   29 ++++++++++++++++++++++++++++-
 1 files changed, 28 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 a967784..a619693 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
@@ -105,7 +105,7 @@
 			}
 			contentList = new ArrayList<>();
 			contentList.add(new ClientTextStyleVO(orderId, COLOR_CONTENT));
-			items.add(new CommonMsgItemVO(new ClientTextStyleVO("璁㈠崟鍙�", COLOR_TITLE), contentList, true));
+			items.add(new CommonMsgItemVO(new ClientTextStyleVO("璁㈠崟鍙�", COLOR_TITLE), contentList, false));
 
 			contentList = new ArrayList<>();
 			contentList.add(new ClientTextStyleVO(msg.getType().getDesc(), COLOR_CONTENT));
@@ -322,6 +322,33 @@
 			return new UserMsgVO("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("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) {
 
 			contentList = new ArrayList<>();

--
Gitblit v1.8.0