From d2c88e6ba5780393715898ec15477526330555fe Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 08 五月 2019 11:21:57 +0800
Subject: [PATCH] 热销商品
---
fanli/src/main/java/com/yeshi/fanli/util/factory/msg/UserMsgVOFactory.java | 93 ++++++++++++++++++++++++++++------------------
1 files changed, 57 insertions(+), 36 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 1f26278..05e5e78 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
@@ -40,53 +40,74 @@
public static UserMsgVO create(MsgOrderDetail msg) {
List<CommonMsgItemVO> items = new ArrayList<>();
-
List<ClientTextStyleVO> contentList = new ArrayList<>();
- contentList.add(new ClientTextStyleVO(msg.getOrderId(), COLOR_CONTENT));
- items.add(new CommonMsgItemVO(new ClientTextStyleVO("璁㈠崟鍙�", COLOR_TITLE), contentList));
+ if (msg.getType() == MsgTypeOrderTypeEnum.found) {
+ contentList.add(new ClientTextStyleVO("璁㈠崟鎵惧洖", COLOR_CONTENT));
+ items.add(new CommonMsgItemVO(new ClientTextStyleVO("绫诲埆", COLOR_TITLE), contentList));
- contentList = new ArrayList<>();
- contentList.add(new ClientTextStyleVO("鍏�", COLOR_CONTENT));
- contentList.add(new ClientTextStyleVO(msg.getGoodsCount() + "", COLOR_HIGHLIGHT_CONTENT));
- contentList.add(new ClientTextStyleVO("浠跺晢鍝�", COLOR_CONTENT));
- items.add(new CommonMsgItemVO(new ClientTextStyleVO("鍟嗗搧鏁伴噺", COLOR_TITLE), contentList));
+ contentList = new ArrayList<>();
+ contentList.add(new ClientTextStyleVO(msg.getOrderId(), COLOR_CONTENT));
+ items.add(new CommonMsgItemVO(new ClientTextStyleVO("璁㈠崟鍙�", COLOR_TITLE), contentList));
- contentList = new ArrayList<>();
- contentList.add(new ClientTextStyleVO(msg.getType().getDesc(), COLOR_CONTENT));
- items.add(new CommonMsgItemVO(new ClientTextStyleVO("璁㈠崟绫诲瀷", COLOR_TITLE), contentList));
+ contentList = new ArrayList<>();
+ contentList.add(new ClientTextStyleVO(TimeUtil.getGernalTime(msg.getHappendDate().getTime(),"yyyy.MM.dd HH:mm"), COLOR_CONTENT));
+ items.add(new CommonMsgItemVO(new ClientTextStyleVO("鎻愪氦鏃堕棿", COLOR_TITLE), contentList));
- contentList = new ArrayList<>();
- if (msg.getState() == MsgOrderDetail.STATE_FK)
- contentList.add(new ClientTextStyleVO("宸蹭粯娆�", COLOR_HIGHLIGHT_CONTENT));
- else if (msg.getState() == MsgOrderDetail.STATE_JS)
- contentList.add(new ClientTextStyleVO("宸叉敹璐�", COLOR_HIGHLIGHT_CONTENT));
- else if (msg.getState() == MsgOrderDetail.STATE_SX)
- contentList.add(new ClientTextStyleVO("鏈粯娆�/宸查��娆�", COLOR_HIGHLIGHT_CONTENT));
- else if (msg.getState() == MsgOrderDetail.STATE_WQ)
- contentList.add(new ClientTextStyleVO("宸茬淮鏉�", COLOR_HIGHLIGHT_CONTENT));
+ contentList = new ArrayList<>();
+ contentList.add(new ClientTextStyleVO(msg.getState() == 1 ? "璁㈠崟鎵惧洖鎴愬姛" : "璁㈠崟鎵惧洖澶辫触", 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(msg.getState() == 1 ? "楼" + msg.getPayMoney() : "鏃�", COLOR_HIGHLIGHT_CONTENT));
+ items.add(new CommonMsgItemVO(new ClientTextStyleVO("鎵惧洖閲戦", COLOR_TITLE), contentList));
- contentList = new ArrayList<>();
- contentList.add(new ClientTextStyleVO("楼" + MoneyBigDecimalUtil.getWithNoZera(msg.getPayMoney()),
- COLOR_HIGHLIGHT_CONTENT));
- items.add(new CommonMsgItemVO(new ClientTextStyleVO("浠樻閲戦", COLOR_TITLE), contentList));
+ } else {
+ contentList.add(new ClientTextStyleVO(msg.getOrderId(), COLOR_CONTENT));
+ items.add(new CommonMsgItemVO(new ClientTextStyleVO("璁㈠崟鍙�", COLOR_TITLE), contentList));
- contentList = new ArrayList<>();
- contentList.add(new ClientTextStyleVO("楼" + MoneyBigDecimalUtil.getWithNoZera(msg.getHongBaoMoney()),
- COLOR_HIGHLIGHT_CONTENT));
+ contentList = new ArrayList<>();
+ contentList.add(new ClientTextStyleVO("鍏�", COLOR_CONTENT));
+ contentList.add(new ClientTextStyleVO(msg.getGoodsCount() + "", COLOR_HIGHLIGHT_CONTENT));
+ contentList.add(new ClientTextStyleVO("浠跺晢鍝�", COLOR_CONTENT));
+ items.add(new CommonMsgItemVO(new ClientTextStyleVO("鍟嗗搧鏁伴噺", COLOR_TITLE), contentList));
- if (msg.getType() == MsgTypeOrderTypeEnum.fanli)
- items.add(new CommonMsgItemVO(new ClientTextStyleVO("杩斿埄閲戦", COLOR_TITLE), contentList));
- else if (msg.getType() == MsgTypeOrderTypeEnum.share)
- items.add(new CommonMsgItemVO(new ClientTextStyleVO("鍒嗕韩濂栭噾", COLOR_TITLE), contentList));
- else if (msg.getType() == MsgTypeOrderTypeEnum.invite)
- items.add(new CommonMsgItemVO(new ClientTextStyleVO("閭�璇峰閲�", COLOR_TITLE), contentList));
+ contentList = new ArrayList<>();
+ contentList.add(new ClientTextStyleVO(msg.getType().getDesc(), COLOR_CONTENT));
+ items.add(new CommonMsgItemVO(new ClientTextStyleVO("璁㈠崟绫诲瀷", COLOR_TITLE), contentList));
+ contentList = new ArrayList<>();
+ if (msg.getState() == MsgOrderDetail.STATE_FK)
+ contentList.add(new ClientTextStyleVO("宸蹭粯娆�", COLOR_HIGHLIGHT_CONTENT));
+ else if (msg.getState() == MsgOrderDetail.STATE_JS)
+ contentList.add(new ClientTextStyleVO("宸叉敹璐�", COLOR_HIGHLIGHT_CONTENT));
+ else if (msg.getState() == MsgOrderDetail.STATE_SX)
+ contentList.add(new ClientTextStyleVO("鏈粯娆�/宸查��娆�", COLOR_HIGHLIGHT_CONTENT));
+ else if (msg.getState() == MsgOrderDetail.STATE_WQ)
+ contentList.add(new ClientTextStyleVO("宸茬淮鏉�", COLOR_HIGHLIGHT_CONTENT));
+
+ items.add(new CommonMsgItemVO(new ClientTextStyleVO("璁㈠崟鐘舵��", COLOR_TITLE), contentList));
+
+ contentList = new ArrayList<>();
+ contentList.add(new ClientTextStyleVO("楼" + MoneyBigDecimalUtil.getWithNoZera(msg.getPayMoney()),
+ COLOR_HIGHLIGHT_CONTENT));
+ items.add(new CommonMsgItemVO(new ClientTextStyleVO("浠樻閲戦", COLOR_TITLE), contentList));
+
+ contentList = new ArrayList<>();
+ contentList.add(new ClientTextStyleVO("楼" + MoneyBigDecimalUtil.getWithNoZera(msg.getHongBaoMoney()),
+ COLOR_HIGHLIGHT_CONTENT));
+
+ if (msg.getType() == MsgTypeOrderTypeEnum.fanli)
+ items.add(new CommonMsgItemVO(new ClientTextStyleVO("杩斿埄閲戦", COLOR_TITLE), contentList));
+ else if (msg.getType() == MsgTypeOrderTypeEnum.share)
+ items.add(new CommonMsgItemVO(new ClientTextStyleVO("鍒嗕韩濂栭噾", COLOR_TITLE), contentList));
+ else if (msg.getType() == MsgTypeOrderTypeEnum.invite)
+ 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_order.png", "璁㈠崟娑堟伅",
msg.getUpdateTime() == null ? msg.getCreateTime() : msg.getUpdateTime(), items);
}
@@ -473,14 +494,14 @@
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()),
--
Gitblit v1.8.0