From 1a0640f90362a3088851f56ae298486e41070471 Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期四, 11 七月 2019 15:53:38 +0800
Subject: [PATCH] Merge branch 'master_bug' into div
---
fanli/src/main/java/com/yeshi/fanli/util/factory/msg/UserMsgVOFactory.java | 19 +++++++++++++++++++
1 files changed, 19 insertions(+), 0 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 4e80078..a2b88b1 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
@@ -574,12 +574,31 @@
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<>();
contentList.add(new ClientTextStyleVO("楼" + filterMoney(dto.getMoney().setScale(2)),
COLOR_HIGHLIGHT_CONTENT));
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(),
--
Gitblit v1.8.0