From 8ba58b43d48b81733dbe5e4c9894e3c919a049bf Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期六, 23 十一月 2019 15:24:24 +0800
Subject: [PATCH] 红包封禁消息
---
fanli/src/main/java/com/yeshi/fanli/util/factory/msg/UserMsgVOFactory.java | 55 ++++++++++++++++++++++++++++++++++++-------------------
1 files changed, 36 insertions(+), 19 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 74a58a4..6d458cf 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
@@ -741,6 +741,35 @@
return new UserMsgVO("http://img.flqapp.com/resource/msg/icon_hongbao_tixian.png", dto.getTitle(),
msg.getUpdateTime() == null ? msg.getCreateTime() : msg.getUpdateTime(), items);
+ } else if (msg.getMsgType() == MsgTypeMoneyTypeEnum.redPackForbid) { // 绾㈠寘灏佺娑堟伅
+ 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.redPackOneStageReward
|| msg.getMsgType() == MsgTypeMoneyTypeEnum.redPackTwoStageReward
|| msg.getMsgType() == MsgTypeMoneyTypeEnum.redPackThreeStageReward) { // 绾㈠寘閭�璇疯幏寰�
@@ -766,7 +795,7 @@
contentList = new ArrayList<>();
contentList.add(new ClientTextStyleVO(StringUtil.isNullOrEmpty(msg.getBeiZhu()) ? "鏃�" : msg.getBeiZhu(),
COLOR_CONTENT));
- items.add(new CommonMsgItemVO(new ClientTextStyleVO("澶� 娉�", COLOR_TITLE), contentList));
+ items.add(new CommonMsgItemVO(new ClientTextStyleVO("澶囨敞", COLOR_TITLE), contentList));
return new UserMsgVO("http://img.flqapp.com/img/tlj/icon_tlj.png", "绾㈠寘鎻愰啋",
msg.getUpdateTime() == null ? msg.getCreateTime() : msg.getUpdateTime(), items);
@@ -988,14 +1017,10 @@
return new UserMsgVO("http://img.flqapp.com/resource/msg/icon_msg_invite.png", dto.getTitle(),
msg.getUpdateTime() == null ? msg.getCreateTime() : msg.getUpdateTime(), items);
- } else if (msgType == MsgTypeInviteTypeEnum.inviteNew) {
- if (StringUtil.isNullOrEmpty(msg.getDesc()))
+ } else if (msgType == MsgTypeInviteTypeEnum.inviteSucceed) {
+ if (msg.getInviteUser() == null || msg.getInviteUser().getWorker() == null)
return null;
-
- MsgInviteContentDTO dto = new Gson().fromJson(msg.getDesc(), MsgInviteContentDTO.class);
- if (dto == null)
- return null;
-
+
List<CommonMsgItemVO> items = new ArrayList<>();
List<ClientTextStyleVO> contentList = new ArrayList<>();
contentList.add(new ClientTextStyleVO(msg.getInviteUser().getWorker().getNickName() + "", COLOR_CONTENT,
@@ -1003,20 +1028,12 @@
items.add(new CommonMsgItemVO(new ClientTextStyleVO("琚個璇蜂汉", COLOR_TITLE), contentList));
contentList = new ArrayList<>();
- contentList.add(new ClientTextStyleVO(dto.getState() + "", COLOR_CONTENT));
+ contentList.add(new ClientTextStyleVO("閭�璇烽槦鍛樻垚鍔�", COLOR_CONTENT));
items.add(new CommonMsgItemVO(new ClientTextStyleVO("閭�璇风姸鎬�", COLOR_TITLE), contentList));
contentList = new ArrayList<>();
- contentList.add(new ClientTextStyleVO(dto.getMode() + "", COLOR_CONTENT));
- items.add(new CommonMsgItemVO(new ClientTextStyleVO("鐔熺粌浣跨敤", COLOR_TITLE), contentList));
-
- contentList = new ArrayList<>();
- contentList.add(new ClientTextStyleVO(dto.getCode() + "", COLOR_CONTENT));
- items.add(new CommonMsgItemVO(new ClientTextStyleVO("蹇呰鏉′欢", COLOR_TITLE), contentList));
-
- contentList = new ArrayList<>();
- contentList.add(new ClientTextStyleVO(dto.getInviter() + "", COLOR_CONTENT));
- items.add(new CommonMsgItemVO(new ClientTextStyleVO("閫夋嫨鏉′欢", COLOR_TITLE), contentList));
+ contentList.add(new ClientTextStyleVO(msg.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(),
--
Gitblit v1.8.0