From 56e258fa6c23469ea825f6b11d458df9ba577e9f Mon Sep 17 00:00:00 2001
From: yujian <yujian>
Date: 星期五, 01 三月 2019 14:38:50 +0800
Subject: [PATCH] Merge branch 'div'
---
fanli/src/main/java/com/yeshi/fanli/util/factory/msg/UserMsgVOFactory.java | 16 +++++++++++++++-
1 files changed, 15 insertions(+), 1 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 f79b617..82059a1 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
@@ -469,10 +469,24 @@
if (dto.getFanLiMoney() != null) {
contentList = new ArrayList<>();
- contentList.add(new ClientTextStyleVO(MoneyBigDecimalUtil.getWithNoZera(dto.getFanLiMoney()) + "",
+ contentList.add(new ClientTextStyleVO("楼" + MoneyBigDecimalUtil.getWithNoZera(dto.getFanLiMoney()),
COLOR_CONTENT));
items.add(new CommonMsgItemVO(new ClientTextStyleVO("棰勪及杩斿埄", COLOR_TITLE), contentList));
}
+
+ if (dto.getOrderFanLiMoney() != null) {
+ contentList = new ArrayList<>();
+ contentList.add(new ClientTextStyleVO("楼" + MoneyBigDecimalUtil.getWithNoZera(dto.getOrderFanLiMoney()),
+ COLOR_CONTENT));
+ items.add(new CommonMsgItemVO(new ClientTextStyleVO("璁㈠崟杩斿埄", COLOR_TITLE), contentList));
+ }
+
+ if (dto.getRewardMoney() != null) {
+ contentList = new ArrayList<>();
+ contentList.add(new ClientTextStyleVO("楼" + MoneyBigDecimalUtil.getWithNoZera(dto.getRewardMoney()),
+ COLOR_HIGHLIGHT_CONTENT));
+ items.add(new CommonMsgItemVO(new ClientTextStyleVO("濂栧姳閲�", COLOR_TITLE), contentList));
+ }
if (!StringUtil.isNullOrEmpty(dto.getSource())) {
contentList = new ArrayList<>();
--
Gitblit v1.8.0