From 06bbeaeb73178a6cff0f207a1a284a73f6445e25 Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期四, 02 四月 2020 17:04:13 +0800
Subject: [PATCH] 消息
---
fanli/src/main/java/com/yeshi/fanli/util/factory/msg/UserMsgVOFactory.java | 29 ++++++++---------------------
1 files changed, 8 insertions(+), 21 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 222b9aa..9dc69b8 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
@@ -6,6 +6,7 @@
import java.util.List;
import com.google.gson.Gson;
+import com.google.gson.reflect.TypeToken;
import com.yeshi.fanli.dto.msg.MsgAccountVipDTO;
import com.yeshi.fanli.dto.msg.MsgInviteContentDTO;
import com.yeshi.fanli.dto.msg.MsgOtherCouponActivateDTO;
@@ -1227,7 +1228,9 @@
if (msg.getType() == MsgTypeOtherTypeEnum.couponMianDan
|| msg.getType() == MsgTypeOtherTypeEnum.couponWelfareMianDan
- || msg.getType() == MsgTypeOtherTypeEnum.couponReward) {
+ || msg.getType() == MsgTypeOtherTypeEnum.couponReward
+ || msg.getType() == MsgTypeOtherTypeEnum.freeCouponBuy
+ || msg.getType() == MsgTypeOtherTypeEnum.freeCouponGive) {
if (StringUtil.isNullOrEmpty(msg.getContent()))
return null;
@@ -1750,28 +1753,12 @@
if (StringUtil.isNullOrEmpty(msg.getContent()))
return null;
- MsgOtherSystemGiveDTO dto = new Gson().fromJson(msg.getContent(), MsgOtherSystemGiveDTO.class);
- if (dto == null)
- return null;
-
- List<ClientTextStyleVO> contentList = new ArrayList<>();
-
- 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.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(),
- COLOR_CONTENT));
- items.add(new CommonMsgItemVO(new ClientTextStyleVO("澶� 娉�", COLOR_TITLE), contentList));
+ Gson gson = new Gson();
+ items.addAll(gson.fromJson(msg.getContent(), new TypeToken<ArrayList<CommonMsgItemVO>>() {}.getType()));
UserMsgVO userMsgVO = new UserMsgVO();
- userMsgVO.setIcon("http://img.flqapp.com/resource/msg/icon_msg_vip.png");
- userMsgVO.setTitle(dto.getName());
+ userMsgVO.setIcon(msg.getType().getIcon());
+ userMsgVO.setTitle(msg.getType().getDesc());
userMsgVO.setTime(msg.getUpdateTime() == null ? msg.getCreateTime() : msg.getUpdateTime());
userMsgVO.setContentItems(items);
return userMsgVO;
--
Gitblit v1.8.0