From 69bee82b81626b82b7f39f0e459e4f56b1699b51 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 13 三月 2019 12:02:16 +0800
Subject: [PATCH] 正式数据库修改
---
fanli/src/main/java/com/yeshi/fanli/util/factory/msg/UserMsgVOFactory.java | 36 +++++++++++++++++++++++++++++++++++-
1 files changed, 35 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 0369775..1f26278 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
@@ -461,6 +461,33 @@
contentList.add(new ClientTextStyleVO(dto.getState(), COLOR_CONTENT));
items.add(new CommonMsgItemVO(new ClientTextStyleVO("鐘舵��", COLOR_TITLE), contentList));
+ if (!StringUtil.isNullOrEmpty(dto.getOrderId())) {
+ contentList = new ArrayList<>();
+ contentList.add(new ClientTextStyleVO(dto.getOrderId() + "", COLOR_CONTENT));
+ items.add(new CommonMsgItemVO(new ClientTextStyleVO("璁㈠崟鍙�", COLOR_TITLE), contentList));
+ }
+
+ if (dto.getFanLiMoney() != null) {
+ contentList = new ArrayList<>();
+ 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<>();
contentList.add(new ClientTextStyleVO(dto.getSource() + "", COLOR_CONTENT));
@@ -479,13 +506,20 @@
contentList.add(new ClientTextStyleVO("澶�", COLOR_CONTENT));
items.add(new CommonMsgItemVO(new ClientTextStyleVO("鍓╀綑澶╂暟", COLOR_TITLE), contentList));
}
+
+ if (!StringUtil.isNullOrEmpty(dto.getDesc())) {
+ contentList = new ArrayList<>();
+ contentList.add(new ClientTextStyleVO(dto.getDesc(), 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_invite.png", msg.getType().getDesc(),
+ return new UserMsgVO("http://img.flqapp.com/resource/msg/icon_msg_other_coupon.png", msg.getType().getDesc(),
msg.getUpdateTime() == null ? msg.getCreateTime() : msg.getUpdateTime(), items);
}
--
Gitblit v1.8.0