From 5ea0046f422a3e84ad89a93dff33fe8ccb7cbbfb Mon Sep 17 00:00:00 2001
From: yujian <yujian>
Date: 星期二, 29 一月 2019 16:46:40 +0800
Subject: [PATCH] 取有效订单结算时间
---
fanli/src/main/java/com/yeshi/fanli/util/factory/msg/UserMsgVOFactory.java | 13 +++++++------
1 files changed, 7 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 1d0fbf4..b7c0f84 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
@@ -134,11 +134,12 @@
contentList.add(new ClientTextStyleVO(msg.getExtract().getReason(), COLOR_CONTENT));
items.add(new CommonMsgItemVO(new ClientTextStyleVO("鐘舵�佽鏄�", COLOR_TITLE), contentList));
- contentList = new ArrayList<>();
- contentList.add(new ClientTextStyleVO(TimeUtil.getGernalTime(
- msg.getExtract().getExtractTime() + 1000 * 60 * 60 * 24L, "yyyy-MM-dd HH:mm"), COLOR_CONTENT));
- items.add(new CommonMsgItemVO(new ClientTextStyleVO("棰勮鍒拌处", COLOR_TITLE), contentList));
-
+ if (msg.getExtract().getState() != Extract.STATE_REJECT) {
+ contentList = new ArrayList<>();
+ contentList.add(new ClientTextStyleVO(TimeUtil.getGernalTime(
+ msg.getExtract().getExtractTime() + 1000 * 60 * 60 * 24L, "yyyy-MM-dd HH:mm"), COLOR_CONTENT));
+ items.add(new CommonMsgItemVO(new ClientTextStyleVO("棰勮鍒拌处", COLOR_TITLE), contentList));
+ }
if (msg.getExtract().getState() == Extract.STATE_PASS) {//
contentList = new ArrayList<>();
contentList.add(new ClientTextStyleVO(
@@ -250,7 +251,7 @@
date + msg.getMsgType().getDesc(),
msg.getUpdateTime() == null ? msg.getCreateTime() : msg.getUpdateTime(), items);
else
- return new UserMsgVO("http://img.flqapp.com/resource/msg/icon_msg_invite_money.png.png",
+ return new UserMsgVO("http://img.flqapp.com/resource/msg/icon_msg_invite_money.png",
date + msg.getMsgType().getDesc(),
msg.getUpdateTime() == null ? msg.getCreateTime() : msg.getUpdateTime(), items);
--
Gitblit v1.8.0