From d222232204b5ba3d3039ae8689dad743ea06723f Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期五, 12 七月 2019 09:12:51 +0800
Subject: [PATCH] Merge branch 'master' into div
---
fanli/src/main/java/com/yeshi/fanli/util/factory/msg/UserMsgVOFactory.java | 31 +++++++++++++++++++++++++------
1 files changed, 25 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 ee7a16a..a1ce4dc 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
@@ -244,7 +244,7 @@
contentList = new ArrayList<>();
contentList.add(new ClientTextStyleVO("楼" + filterMoney(msg.getBalance()) + "", 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(),
@@ -273,7 +273,7 @@
contentList = new ArrayList<>();
contentList.add(new ClientTextStyleVO("楼" + filterMoney(msg.getBalance()) + "", 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(),
@@ -308,7 +308,7 @@
contentList = new ArrayList<>();
contentList.add(new ClientTextStyleVO("楼" + filterMoney(msg.getBalance()) + "", 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(),
@@ -331,7 +331,7 @@
contentList = new ArrayList<>();
contentList.add(new ClientTextStyleVO("楼" + filterMoney(msg.getBalance()) + "", 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(),
@@ -355,7 +355,7 @@
contentList = new ArrayList<>();
contentList.add(new ClientTextStyleVO("楼" + filterMoney(msg.getBalance()) + "", 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(),
@@ -375,7 +375,7 @@
contentList = new ArrayList<>();
contentList.add(new ClientTextStyleVO("楼" + filterMoney(msg.getBalance()) + "", 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(),
@@ -566,6 +566,12 @@
contentList.add(new ClientTextStyleVO(dto.getSource() + "", COLOR_CONTENT));
items.add(new CommonMsgItemVO(new ClientTextStyleVO("鏉ユ簮", COLOR_TITLE), contentList));
}
+
+ if (!StringUtil.isNullOrEmpty(dto.getTimeDesc())) {
+ contentList = new ArrayList<>();
+ contentList.add(new ClientTextStyleVO(dto.getTimeDesc() + "", COLOR_CONTENT));
+ items.add(new CommonMsgItemVO(new ClientTextStyleVO("鏃堕棿", COLOR_TITLE), contentList));
+ }
if (dto.getMoney() != null) {
contentList = new ArrayList<>();
@@ -574,6 +580,19 @@
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));
+ }
+
+ if (!StringUtil.isNullOrEmpty(dto.getResult())) {
+ contentList = new ArrayList<>();
+ contentList.add(new ClientTextStyleVO(dto.getResult() + "", 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));
--
Gitblit v1.8.0