From 0ec22dcf4fd9c4496e6f681e7fab89f56c6e4e8a Mon Sep 17 00:00:00 2001 From: yujian <yujian@163.com> Date: 星期四, 02 四月 2020 14:45:20 +0800 Subject: [PATCH] vip 消息 --- fanli/src/main/java/com/yeshi/fanli/util/factory/msg/UserMsgVOFactory.java | 16 +++++++++++++++- 1 files changed, 15 insertions(+), 1 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 6f877f8..b513dea 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; @@ -608,7 +609,7 @@ COLOR_CONTENT)); items.add(new CommonMsgItemVO(new ClientTextStyleVO("澶囨敞", COLOR_TITLE), contentList)); - return new UserMsgVO("http://img.flqapp.com/resource/msg/icon_msg_subsidy.png", msg.getMsgType().getDesc(), + return new UserMsgVO("http://img.flqapp.com/resource/msg/icon_msg_team_reward.png", msg.getMsgType().getDesc(), msg.getUpdateTime() == null ? msg.getCreateTime() : msg.getUpdateTime(), items); } else if (msg.getMsgType() == MsgTypeMoneyTypeEnum.redPackReceiveOff) { // 绾㈠寘鎴愬姛棰嗗彇 if (StringUtil.isNullOrEmpty(msg.getContent())) @@ -1746,6 +1747,19 @@ userMsgVO.setTime(msg.getUpdateTime() == null ? msg.getCreateTime() : msg.getUpdateTime()); userMsgVO.setContentItems(items); return userMsgVO; + } else if (msg.getType() == MsgTypeOtherTypeEnum.vipUpgradeReward) { + if (StringUtil.isNullOrEmpty(msg.getContent())) + return null; + + Gson gson = new Gson(); + items.addAll(gson.fromJson(msg.getContent(), new TypeToken<ArrayList<CommonMsgItemVO>>() {}.getType())); + + UserMsgVO userMsgVO = new UserMsgVO(); + userMsgVO.setIcon(msg.getType().getIcon()); + userMsgVO.setTitle(msg.getType().getDesc()); + userMsgVO.setTime(msg.getUpdateTime() == null ? msg.getCreateTime() : msg.getUpdateTime()); + userMsgVO.setContentItems(items); + return userMsgVO; } return new UserMsgVO(icon, msg.getType().getDesc(), -- Gitblit v1.8.0