From 17e98d7bcc27072f97976d24eb504abb02914891 Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期六, 11 四月 2020 09:20:14 +0800
Subject: [PATCH] 消息
---
fanli/src/main/java/com/yeshi/fanli/util/factory/msg/UserMsgVOFactory.java | 40 ++++++++++++++++++++++++++++++++++------
1 files changed, 34 insertions(+), 6 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..7575185 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;
@@ -66,11 +67,24 @@
* @return
*/
public static UserMsgVO create(MsgOrderDetail msg, JumpDetailV2 jumpDetail, JSONObject params) {
+ List<CommonMsgItemVO> items = new ArrayList<>();
+
+ // 鏂扮増娑堟伅
+ if (!StringUtil.isNullOrEmpty(msg.getExtraInfo())) {
+ Gson gson = new Gson();
+ items.addAll(gson.fromJson(msg.getExtraInfo(), 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;
+ }
+
+
UserMsgVO vo = new UserMsgVO("http://img.flqapp.com/resource/msg/icon_msg_order.png", "璁㈠崟娑堟伅",
msg.getUpdateTime() == null ? msg.getCreateTime() : msg.getUpdateTime(), null);
-
- List<CommonMsgItemVO> items = new ArrayList<>();
List<ClientTextStyleVO> contentList = new ArrayList<>();
if (msg.getType() == MsgTypeOrderTypeEnum.found) {
contentList = new ArrayList<>();
@@ -407,7 +421,6 @@
items.add(new CommonMsgItemVO(new ClientTextStyleVO("娓犻亾鏉ユ簮", COLOR_TITLE), contentList));
contentList = new ArrayList<>();
-
contentList.add(new ClientTextStyleVO(msg.getOrderId(), COLOR_CONTENT));
items.add(new CommonMsgItemVO(new ClientTextStyleVO("杩斿埄璁㈠崟", COLOR_TITLE), contentList));
@@ -438,7 +451,7 @@
contentList = new ArrayList<>();
contentList.add(new ClientTextStyleVO(msg.getOrderId(), COLOR_CONTENT));
- items.add(new CommonMsgItemVO(new ClientTextStyleVO("閭�璇疯鍗�", COLOR_TITLE), contentList));
+ items.add(new CommonMsgItemVO(new ClientTextStyleVO("鍒嗕韩璁㈠崟", COLOR_TITLE), contentList));
contentList = new ArrayList<>();
contentList.add(new ClientTextStyleVO("璁㈠崟鍞悗", COLOR_CONTENT));
@@ -608,7 +621,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()))
@@ -1227,7 +1240,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;
@@ -1746,6 +1761,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