From 8cbb5ef78af910b4193e45fd6454d2dc862e0a8c Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期二, 10 十二月 2019 17:08:08 +0800
Subject: [PATCH] 维权订单不显示奖励券入口
---
fanli/src/main/java/com/yeshi/fanli/util/factory/msg/UserMsgVOFactory.java | 35 ++++++++++++++++++++++++++++++++---
1 files changed, 32 insertions(+), 3 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 2977f18..25a2023 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
@@ -772,6 +772,35 @@
return new UserMsgVO("http://img.flqapp.com/img/tlj/icon_tlj.png", msg.getMsgType().getDesc(),
msg.getUpdateTime() == null ? msg.getCreateTime() : msg.getUpdateTime(), items);
+ } else if (msg.getMsgType() == MsgTypeMoneyTypeEnum.redPackForbidRemove) { // 绾㈠寘灏佺瑙ｉ櫎娑堟伅
+ if (StringUtil.isNullOrEmpty(msg.getContent()))
+ return null;
+
+ MsgRedPackExchangeContentDTO dto = new Gson().fromJson(msg.getContent(),
+ MsgRedPackExchangeContentDTO.class);
+ if (dto == null)
+ return null;
+
+ contentList = new ArrayList<>();
+
+ contentList.add(new ClientTextStyleVO(dto.getReason() + "", COLOR_CONTENT));
+ items.add(new CommonMsgItemVO(new ClientTextStyleVO("鍘熷洜", COLOR_TITLE), contentList));
+
+ contentList = new ArrayList<>();
+ contentList.add(new ClientTextStyleVO(dto.getTime() + "", COLOR_CONTENT));
+ items.add(new CommonMsgItemVO(new ClientTextStyleVO("绾㈠寘鐘舵��", COLOR_TITLE), contentList));
+
+ contentList = new ArrayList<>();
+ contentList.add(new ClientTextStyleVO(dto.getHandle(), 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/img/tlj/icon_tlj.png", msg.getMsgType().getDesc(),
+ msg.getUpdateTime() == null ? msg.getCreateTime() : msg.getUpdateTime(), items);
} else if (msg.getMsgType() == MsgTypeMoneyTypeEnum.redPackDeduct) { // 绾㈠寘鎵ｉ櫎娑堟伅
if (StringUtil.isNullOrEmpty(msg.getContent()))
return null;
@@ -1564,7 +1593,7 @@
items.add(new CommonMsgItemVO(new ClientTextStyleVO("澶� 娉�", COLOR_TITLE), contentList));
UserMsgVO userMsgVO = new UserMsgVO();
- userMsgVO.setIcon("http://img.flqapp.com/resource/msg/icon_msg_other_system_give.png");
+ userMsgVO.setIcon("http://img.flqapp.com/resource/msg/icon_msg_vip.png");
userMsgVO.setTitle(msg.getType().getDesc());
userMsgVO.setTime(msg.getUpdateTime() == null ? msg.getCreateTime() : msg.getUpdateTime());
userMsgVO.setContentItems(items);
@@ -1597,7 +1626,7 @@
items.add(new CommonMsgItemVO(new ClientTextStyleVO("澶� 娉�", COLOR_TITLE), contentList));
UserMsgVO userMsgVO = new UserMsgVO();
- userMsgVO.setIcon("http://img.flqapp.com/resource/msg/icon_msg_other_system_give.png");
+ userMsgVO.setIcon("http://img.flqapp.com/resource/msg/icon_msg_notify.png");
userMsgVO.setTitle(msg.getType().getDesc());
userMsgVO.setTime(msg.getUpdateTime() == null ? msg.getCreateTime() : msg.getUpdateTime());
userMsgVO.setContentItems(items);
@@ -1630,7 +1659,7 @@
items.add(new CommonMsgItemVO(new ClientTextStyleVO("澶� 娉�", COLOR_TITLE), contentList));
UserMsgVO userMsgVO = new UserMsgVO();
- userMsgVO.setIcon("http://img.flqapp.com/resource/msg/icon_msg_other_system_give.png");
+ userMsgVO.setIcon("http://img.flqapp.com/resource/msg/icon_msg_invite_break.png");
userMsgVO.setTitle(msg.getType().getDesc());
userMsgVO.setTime(msg.getUpdateTime() == null ? msg.getCreateTime() : msg.getUpdateTime());
userMsgVO.setContentItems(items);
--
Gitblit v1.8.0