From a3ea58065f61d16f06a0883737eae320eef5c33a Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期四, 01 八月 2019 15:47:12 +0800
Subject: [PATCH] 非任务模式不执行京东/拼多多订单

---
 fanli/src/main/java/com/yeshi/fanli/util/factory/msg/UserMsgVOFactory.java |   61 +++++++++++++++++++++++++++++-
 1 files changed, 59 insertions(+), 2 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 96b3490..7be7ea3 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
@@ -21,6 +21,7 @@
 import com.yeshi.fanli.entity.bus.user.Extract;
 import com.yeshi.fanli.entity.common.JumpDetailV2;
 import com.yeshi.fanli.log.LogHelper;
+import com.yeshi.fanli.util.Constant;
 import com.yeshi.fanli.util.StringUtil;
 import com.yeshi.fanli.util.TimeUtil;
 import com.yeshi.fanli.util.account.UserUtil;
@@ -58,6 +59,13 @@
 		List<CommonMsgItemVO> items = new ArrayList<>();
 		List<ClientTextStyleVO> contentList = new ArrayList<>();
 		if (msg.getType() == MsgTypeOrderTypeEnum.found) {
+			
+			
+			contentList = new ArrayList<>();
+			contentList.add(new ClientTextStyleVO(Constant.getSourceName(msg.getOrderType()), COLOR_CONTENT));
+			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));
 
@@ -80,7 +88,19 @@
 			items.add(new CommonMsgItemVO(new ClientTextStyleVO("鎵惧洖閲戦", COLOR_TITLE), contentList));
 
 		} else {
-			contentList.add(new ClientTextStyleVO(msg.getOrderId(), COLOR_CONTENT));
+
+			contentList = new ArrayList<>();
+			contentList.add(new ClientTextStyleVO(Constant.getSourceName(msg.getOrderType()), COLOR_CONTENT));
+			items.add(new CommonMsgItemVO(new ClientTextStyleVO("娓犻亾鏉ユ簮", COLOR_TITLE), contentList));
+
+
+			String orderId = msg.getOrderId();
+			MsgTypeOrderTypeEnum type = msg.getType();
+			if (type == MsgTypeOrderTypeEnum.invite || type == MsgTypeOrderTypeEnum.share) {
+				orderId = UserUtil.filterOrderId(orderId);
+			}
+			contentList = new ArrayList<>();
+			contentList.add(new ClientTextStyleVO(orderId, COLOR_CONTENT));
 			items.add(new CommonMsgItemVO(new ClientTextStyleVO("璁㈠崟鍙�", COLOR_TITLE), contentList, true));
 
 			contentList = new ArrayList<>();
@@ -230,6 +250,12 @@
 			return new UserMsgVO("http://img.flqapp.com/resource/msg/icon_msg_extract.png", "鎻愮幇璐﹀彿楠岃瘉",
 					msg.getUpdateTime() == null ? msg.getCreateTime() : msg.getUpdateTime(), items);
 		} else if (msg.getMsgType() == MsgTypeMoneyTypeEnum.fanli) {
+			
+			contentList = new ArrayList<>();
+			contentList.add(new ClientTextStyleVO(Constant.getSourceName(msg.getOrderType()), 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));
@@ -258,6 +284,12 @@
 
 		} else if (msg.getMsgType() == MsgTypeMoneyTypeEnum.invite || msg.getMsgType() == MsgTypeMoneyTypeEnum.share) {
 
+			contentList = new ArrayList<>();
+			contentList.add(new ClientTextStyleVO(Constant.getSourceName(msg.getOrderType()), COLOR_CONTENT));
+			items.add(new CommonMsgItemVO(new ClientTextStyleVO("娓犻亾鏉ユ簮", COLOR_TITLE), contentList));
+			
+			contentList = new ArrayList<>();
+			
 			// 閭�璇峰閲�,鍒嗕韩濂栭噾
 
 			contentList.add(new ClientTextStyleVO(msg.getOrderCount() + "", COLOR_CONTENT));
@@ -297,6 +329,12 @@
 						msg.getUpdateTime() == null ? msg.getCreateTime() : msg.getUpdateTime(), items);
 
 		} else if (msg.getMsgType() == MsgTypeMoneyTypeEnum.fanliWeiQuan) {
+			contentList = new ArrayList<>();
+			contentList.add(new ClientTextStyleVO(Constant.getSourceName(msg.getOrderType()), 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));
 
@@ -320,6 +358,13 @@
 			return new UserMsgVO("http://img.flqapp.com/resource/msg/icon_msg_fanli.png", msg.getMsgType().getDesc(),
 					msg.getUpdateTime() == null ? msg.getCreateTime() : msg.getUpdateTime(), items);
 		} else if (msg.getMsgType() == MsgTypeMoneyTypeEnum.shareWeiQuan) {
+			contentList = new ArrayList<>();
+			contentList.add(new ClientTextStyleVO(Constant.getSourceName(msg.getOrderType()), 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));
 
@@ -344,6 +389,12 @@
 					msg.getMsgType().getDesc(), msg.getUpdateTime() == null ? msg.getCreateTime() : msg.getUpdateTime(),
 					items);
 		} else if (msg.getMsgType() == MsgTypeMoneyTypeEnum.inviteWeiQuan) {
+			contentList = new ArrayList<>();
+			contentList.add(new ClientTextStyleVO(Constant.getSourceName(msg.getOrderType()), 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));
 
@@ -368,6 +419,12 @@
 					msg.getMsgType().getDesc(), msg.getUpdateTime() == null ? msg.getCreateTime() : msg.getUpdateTime(),
 					items);
 		} else if (msg.getMsgType() == MsgTypeMoneyTypeEnum.orderReward) {// 濂栧姳璁㈠崟
+			contentList = new ArrayList<>();
+			contentList.add(new ClientTextStyleVO(Constant.getSourceName(msg.getOrderType()), 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));
 
@@ -387,7 +444,7 @@
 			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);
-		} else if (msg.getMsgType() == MsgTypeMoneyTypeEnum.systemEqualize) {// 濂栧姳璁㈠崟
+		} else if (msg.getMsgType() == MsgTypeMoneyTypeEnum.systemEqualize) {// 绯荤粺琛ュ伩
 			contentList = new ArrayList<>();
 			contentList.add(new ClientTextStyleVO("楼" + filterMoney(msg.getMoney()) + "", COLOR_HIGHLIGHT_CONTENT));
 			items.add(new CommonMsgItemVO(new ClientTextStyleVO("琛ラ綈閲戦", COLOR_TITLE), contentList));

--
Gitblit v1.8.0