From aa774af6df16ef11e1e34ac5aeed9aae0cb3e8e2 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期四, 09 四月 2020 16:25:03 +0800
Subject: [PATCH] 团队分红完善

---
 fanli/src/main/java/com/yeshi/fanli/util/factory/msg/UserMsgVOFactory.java |   14 ++++++++++++++
 1 files changed, 14 insertions(+), 0 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 80225d8..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;
@@ -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