From 21a5d62894e6cca7d536ffcc1d63898ffaf16185 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期一, 25 二月 2019 11:41:17 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
fanli/src/main/java/com/yeshi/fanli/util/factory/msg/UserMsgVOFactory.java | 19 ++++++++++++-------
1 files changed, 12 insertions(+), 7 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..826e6c7 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
@@ -4,6 +4,7 @@
import java.util.Calendar;
import java.util.List;
+import com.google.gson.Gson;
import com.yeshi.fanli.entity.bus.msg.MsgAccountDetail;
import com.yeshi.fanli.entity.bus.msg.MsgInviteDetail;
import com.yeshi.fanli.entity.bus.msg.MsgMoneyDetail;
@@ -12,6 +13,7 @@
import com.yeshi.fanli.entity.bus.msg.MsgOrderDetail.MsgTypeOrderTypeEnum;
import com.yeshi.fanli.entity.bus.user.BindingAccount;
import com.yeshi.fanli.entity.bus.user.Extract;
+import com.yeshi.fanli.log.LogHelper;
import com.yeshi.fanli.util.MoneyBigDecimalUtil;
import com.yeshi.fanli.util.StringUtil;
import com.yeshi.fanli.util.TimeUtil;
@@ -134,11 +136,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 +253,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);
@@ -389,9 +392,11 @@
* @return
*/
public static UserMsgVO create(MsgInviteDetail msg) {
+ if (msg.getInviteUser() == null || msg.getInviteUser().getWorker() == null)
+ return null;
List<CommonMsgItemVO> items = new ArrayList<>();
List<ClientTextStyleVO> contentList = new ArrayList<>();
-
+ LogHelper.test("閭�璇锋秷鎭�:" + new Gson().toJson(msg));
contentList.add(new ClientTextStyleVO(msg.getInviteUser().getWorker().getNickName() + "", COLOR_CONTENT,
msg.getInviteUser().getWorker().getPortrait()));
items.add(new CommonMsgItemVO(new ClientTextStyleVO("琚個璇蜂汉", COLOR_TITLE), contentList));
--
Gitblit v1.8.0