From c3a5e164cbabbfc5f66e1356cb0de657ce3f58b9 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期五, 20 三月 2020 13:56:02 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/util/factory/msg/UserMsgVOFactory.java | 42 ++++++++++++++++++++++++++++++++++++------
1 files changed, 36 insertions(+), 6 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 926e3d3..6f877f8 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
@@ -586,6 +586,30 @@
return new UserMsgVO("http://img.flqapp.com/resource/msg/icon_msg_subsidy.png", msg.getMsgType().getDesc(),
msg.getUpdateTime() == null ? msg.getCreateTime() : msg.getUpdateTime(), items);
+ }else if (msg.getMsgType() == MsgTypeMoneyTypeEnum.orderTeamReward) { // 鍥㈤槦濂栧姳
+ contentList = new ArrayList<>();
+ contentList.add(new ClientTextStyleVO(msg.getStateDesc(), 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(msg.getDesc(), COLOR_CONTENT));
+ items.add(new CommonMsgItemVO(new ClientTextStyleVO("鏉ユ簮", COLOR_TITLE), contentList));
+
+ contentList = new ArrayList<>();
+ contentList.add(new ClientTextStyleVO("楼" + filterMoney(msg.getBalance()), COLOR_HIGHLIGHT_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_subsidy.png", msg.getMsgType().getDesc(),
+ msg.getUpdateTime() == null ? msg.getCreateTime() : msg.getUpdateTime(), items);
} else if (msg.getMsgType() == MsgTypeMoneyTypeEnum.redPackReceiveOff) { // 绾㈠寘鎴愬姛棰嗗彇
if (StringUtil.isNullOrEmpty(msg.getContent()))
return null;
@@ -988,27 +1012,33 @@
if (msg.getType() == MsgTypeAccountTypeEnum.vipPgrade) {// 绛夌骇鍗囩骇
contentList.add(new ClientTextStyleVO(msg.getTitle() + "", COLOR_CONTENT));
- items.add(new CommonMsgItemVO(new ClientTextStyleVO("璇︽儏", COLOR_TITLE), contentList));
+ 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));
+ 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));
+ items.add(new CommonMsgItemVO(new ClientTextStyleVO("鏉� 鐩�", COLOR_TITLE), contentList));
+ }
+
+ if (!StringUtil.isNullOrEmpty(dto.getReason())) {
+ contentList = new ArrayList<>();
+ contentList.add(new ClientTextStyleVO(dto.getReason() + "", 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));
+ 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);
@@ -1022,12 +1052,12 @@
contentList = new ArrayList<>();
contentList.add(new ClientTextStyleVO(msg.getContent() + "", COLOR_CONTENT));
- items.add(new CommonMsgItemVO(new ClientTextStyleVO("璇存槑", COLOR_TITLE), contentList));
+ 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));
+ 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);
--
Gitblit v1.8.0