From 3ac30b4c17cf071ce9c66a59c069ab83efae6d2d Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期一, 14 十月 2019 17:44:13 +0800
Subject: [PATCH] Merge branch 'div' of ssh://193.112.35.168:29418/fanli-server into div
---
fanli/src/main/java/com/yeshi/fanli/util/factory/msg/UserMsgVOFactory.java | 66 ++++++++++++++++++++++++++++++++-
1 files changed, 64 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 dd69b1d..87ae60b 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
@@ -26,6 +26,7 @@
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.entity.bus.user.HongBaoV2;
import com.yeshi.fanli.entity.common.JumpDetailV2;
import com.yeshi.fanli.log.LogHelper;
import com.yeshi.fanli.util.Constant;
@@ -66,7 +67,6 @@
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));
@@ -93,8 +93,43 @@
COLOR_HIGHLIGHT_CONTENT));
items.add(new CommonMsgItemVO(new ClientTextStyleVO("鎵惧洖閲戦", COLOR_TITLE), contentList));
- } else {
+ } else if (msg.getType() == MsgTypeOrderTypeEnum.elme) {
+ 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, false));
+
+ 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() == HongBaoV2.STATE_BUKELINGQU||msg.getState() == HongBaoV2.STATE_KELINGQU)
+ contentList.add(new ClientTextStyleVO("宸蹭粯娆�", COLOR_HIGHLIGHT_CONTENT));
+ else if (msg.getState() == HongBaoV2.STATE_SHIXIAO)
+ 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));
+
+ items.add(new CommonMsgItemVO(new ClientTextStyleVO("杩斿埄閲戦", COLOR_TITLE), contentList));
+ if (params != null)
+ vo.setParams(params.toString());
+ } else {
contentList = new ArrayList<>();
contentList.add(new ClientTextStyleVO(Constant.getSourceName(msg.getOrderType()), COLOR_CONTENT));
items.add(new CommonMsgItemVO(new ClientTextStyleVO("娓犻亾鏉ユ簮", COLOR_TITLE), contentList));
@@ -287,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