From f4a0f2acc63d7785eab108419a4e16f5f688cb95 Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期六, 18 一月 2020 12:06:27 +0800
Subject: [PATCH] 用户注册信息
---
fanli/src/main/java/com/yeshi/fanli/util/factory/msg/UserMsgVOFactory.java | 456 ++++++++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 388 insertions(+), 68 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 44c4f3f..6b73fe6 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
@@ -14,9 +14,11 @@
import com.yeshi.fanli.dto.msg.MsgOtherRewardIntegralDTO;
import com.yeshi.fanli.dto.msg.MsgOtherSystemGiveDTO;
import com.yeshi.fanli.dto.msg.MsgOtherTaoLiJinContentDTO;
-import com.yeshi.fanli.dto.msg.MsgRedPackAddContentDTO;
+import com.yeshi.fanli.dto.msg.MsgOtherVIPDTO;
import com.yeshi.fanli.dto.msg.MsgRedPackExchangeContentDTO;
import com.yeshi.fanli.dto.msg.MsgRedPackGiveContentDTO;
+import com.yeshi.fanli.dto.msg.MsgRedPackTeamRewardContentDTO;
+import com.yeshi.fanli.dto.msg.MsgRedPackUseContentDTO;
import com.yeshi.fanli.entity.bus.msg.MsgAccountDetail;
import com.yeshi.fanli.entity.bus.msg.MsgAccountDetail.MsgTypeAccountTypeEnum;
import com.yeshi.fanli.entity.bus.msg.MsgInviteDetail;
@@ -115,7 +117,7 @@
items.add(new CommonMsgItemVO(new ClientTextStyleVO("璁㈠崟绫诲瀷", COLOR_TITLE), contentList));
contentList = new ArrayList<>();
- if (msg.getState() == HongBaoV2.STATE_BUKELINGQU||msg.getState() == HongBaoV2.STATE_KELINGQU)
+ if (msg.getState() == HongBaoV2.STATE_BUKELINGQU || msg.getState() == HongBaoV2.STATE_KELINGQU)
contentList.add(new ClientTextStyleVO("宸蹭粯娆�", COLOR_HIGHLIGHT_CONTENT));
else if (msg.getState() == HongBaoV2.STATE_SHIXIAO)
contentList.add(new ClientTextStyleVO("鏈粯娆�/宸查��娆�", COLOR_HIGHLIGHT_CONTENT));
@@ -409,7 +411,7 @@
items.add(new CommonMsgItemVO(new ClientTextStyleVO("杩斿埄璁㈠崟", COLOR_TITLE), contentList));
contentList = new ArrayList<>();
- contentList.add(new ClientTextStyleVO("璁㈠崟缁存潈", COLOR_CONTENT));
+ contentList.add(new ClientTextStyleVO("璁㈠崟鍞悗", COLOR_CONTENT));
items.add(new CommonMsgItemVO(new ClientTextStyleVO("鎵ｉ櫎璇存槑", COLOR_TITLE), contentList));
contentList = new ArrayList<>();
@@ -438,7 +440,7 @@
items.add(new CommonMsgItemVO(new ClientTextStyleVO("閭�璇疯鍗�", COLOR_TITLE), contentList));
contentList = new ArrayList<>();
- contentList.add(new ClientTextStyleVO("璁㈠崟缁存潈", COLOR_CONTENT));
+ contentList.add(new ClientTextStyleVO("璁㈠崟鍞悗", COLOR_CONTENT));
items.add(new CommonMsgItemVO(new ClientTextStyleVO("鎵ｉ櫎璇存槑", COLOR_TITLE), contentList));
contentList = new ArrayList<>();
@@ -468,7 +470,7 @@
items.add(new CommonMsgItemVO(new ClientTextStyleVO("閭�璇疯鍗�", COLOR_TITLE), contentList));
contentList = new ArrayList<>();
- contentList.add(new ClientTextStyleVO("璁㈠崟缁存潈", COLOR_CONTENT));
+ contentList.add(new ClientTextStyleVO("璁㈠崟鍞悗", COLOR_CONTENT));
items.add(new CommonMsgItemVO(new ClientTextStyleVO("鎵ｉ櫎璇存槑", COLOR_TITLE), contentList));
contentList = new ArrayList<>();
@@ -567,25 +569,22 @@
contentList = new ArrayList<>();
contentList.add(new ClientTextStyleVO("楼" + filterMoney(msg.getMoney()), COLOR_HIGHLIGHT_CONTENT));
items.add(new CommonMsgItemVO(new ClientTextStyleVO("閲戦", COLOR_TITLE), contentList));
-
-
+
contentList = new ArrayList<>();
contentList.add(new ClientTextStyleVO(msg.getDesc(), COLOR_CONTENT));
items.add(new CommonMsgItemVO(new ClientTextStyleVO("鏉ユ簮", COLOR_TITLE), contentList));
-
contentList = new ArrayList<>();
contentList.add(new ClientTextStyleVO("楼" + filterMoney(msg.getBalance()), COLOR_HIGHLIGHT_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/resource/msg/icon_msg_subsidy.png",
- msg.getMsgType().getDesc(), msg.getUpdateTime() == null ? msg.getCreateTime() : msg.getUpdateTime(),
- items);
+
+ return new UserMsgVO("http://img.flqapp.com/resource/msg/icon_msg_subsidy.png", msg.getMsgType().getDesc(),
+ msg.getUpdateTime() == null ? msg.getCreateTime() : msg.getUpdateTime(), items);
} else if (msg.getMsgType() == MsgTypeMoneyTypeEnum.redPackReceiveOff) { // 绾㈠寘鎴愬姛棰嗗彇
if (StringUtil.isNullOrEmpty(msg.getContent()))
return null;
@@ -593,7 +592,7 @@
MsgRedPackGiveContentDTO dto = new Gson().fromJson(msg.getContent(), MsgRedPackGiveContentDTO.class);
if (dto == null)
return null;
-
+
contentList = new ArrayList<>();
contentList.add(new ClientTextStyleVO(dto.getUserInfo() + "", COLOR_CONTENT));
items.add(new CommonMsgItemVO(new ClientTextStyleVO("璧犻�佷汉", COLOR_TITLE), contentList));
@@ -611,9 +610,8 @@
COLOR_CONTENT));
items.add(new CommonMsgItemVO(new ClientTextStyleVO("澶囨敞", COLOR_TITLE), contentList));
- return new UserMsgVO("http://img.flqapp.com/resource/msg/icon_hongbao_give.png",
- dto.getTitle(), msg.getUpdateTime() == null ? msg.getCreateTime() : msg.getUpdateTime(),
- items);
+ return new UserMsgVO("http://img.flqapp.com/resource/msg/icon_hongbao_give.png", dto.getTitle(),
+ msg.getUpdateTime() == null ? msg.getCreateTime() : msg.getUpdateTime(), items);
} else if (msg.getMsgType() == MsgTypeMoneyTypeEnum.redPackGiveOff) { // 绾㈠寘琚垚鍔熼鍙�
if (StringUtil.isNullOrEmpty(msg.getContent()))
return null;
@@ -621,7 +619,7 @@
MsgRedPackGiveContentDTO dto = new Gson().fromJson(msg.getContent(), MsgRedPackGiveContentDTO.class);
if (dto == null)
return null;
-
+
contentList = new ArrayList<>();
contentList.add(new ClientTextStyleVO(dto.getUserInfo() + "", COLOR_CONTENT));
items.add(new CommonMsgItemVO(new ClientTextStyleVO("棰嗗彇浜�", COLOR_TITLE), contentList));
@@ -639,9 +637,8 @@
COLOR_CONTENT));
items.add(new CommonMsgItemVO(new ClientTextStyleVO("澶囨敞", COLOR_TITLE), contentList));
- return new UserMsgVO("http://img.flqapp.com/resource/msg/icon_hongbao_give.png",
- dto.getTitle(), msg.getUpdateTime() == null ? msg.getCreateTime() : msg.getUpdateTime(),
- items);
+ return new UserMsgVO("http://img.flqapp.com/resource/msg/icon_hongbao_give.png", dto.getTitle(),
+ msg.getUpdateTime() == null ? msg.getCreateTime() : msg.getUpdateTime(), items);
} else if (msg.getMsgType() == MsgTypeMoneyTypeEnum.redPackGiveBack) { // 绾㈠寘鏈棰嗗彇閫�鍥�
if (StringUtil.isNullOrEmpty(msg.getContent()))
return null;
@@ -649,7 +646,7 @@
MsgRedPackGiveContentDTO dto = new Gson().fromJson(msg.getContent(), MsgRedPackGiveContentDTO.class);
if (dto == null)
return null;
-
+
contentList = new ArrayList<>();
contentList.add(new ClientTextStyleVO(dto.getTitle() + "", COLOR_CONTENT));
items.add(new CommonMsgItemVO(new ClientTextStyleVO("璧犻�佺被鍒�", COLOR_TITLE), contentList));
@@ -657,11 +654,11 @@
contentList = new ArrayList<>();
contentList.add(new ClientTextStyleVO(dto.getMoney() + "", COLOR_HIGHLIGHT_CONTENT));
items.add(new CommonMsgItemVO(new ClientTextStyleVO("璧犻�侀噾棰�", COLOR_TITLE), contentList));
-
+
contentList = new ArrayList<>();
contentList.add(new ClientTextStyleVO(dto.getGiveTime() + "", 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));
@@ -672,16 +669,17 @@
items.add(new CommonMsgItemVO(new ClientTextStyleVO("澶囨敞", COLOR_TITLE), contentList));
return new UserMsgVO("http://img.flqapp.com/resource/msg/icon_hongbao_give.png",
- MsgTypeMoneyTypeEnum.redPackGiveBack.getDesc(), msg.getUpdateTime() == null ? msg.getCreateTime() : msg.getUpdateTime(),
- items);
+ MsgTypeMoneyTypeEnum.redPackGiveBack.getDesc(),
+ msg.getUpdateTime() == null ? msg.getCreateTime() : msg.getUpdateTime(), items);
} else if (msg.getMsgType() == MsgTypeMoneyTypeEnum.redPackExchangePass) { // 绾㈠寘鎻愮幇鎴愬姛
if (StringUtil.isNullOrEmpty(msg.getContent()))
return null;
- MsgRedPackExchangeContentDTO dto = new Gson().fromJson(msg.getContent(), MsgRedPackExchangeContentDTO.class);
+ MsgRedPackExchangeContentDTO dto = new Gson().fromJson(msg.getContent(),
+ MsgRedPackExchangeContentDTO.class);
if (dto == null)
return null;
-
+
contentList = new ArrayList<>();
contentList.add(new ClientTextStyleVO(msg.getMsgType().getDesc() + "", COLOR_CONTENT));
items.add(new CommonMsgItemVO(new ClientTextStyleVO("绫诲埆", COLOR_TITLE), contentList));
@@ -693,31 +691,31 @@
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(dto.getMoney() + "", COLOR_HIGHLIGHT_CONTENT));
items.add(new CommonMsgItemVO(new ClientTextStyleVO("鎻愮幇閲戦", COLOR_TITLE), contentList));
-
+
contentList = new ArrayList<>();
contentList.add(new ClientTextStyleVO(dto.getBalance() + "", COLOR_HIGHLIGHT_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/resource/msg/icon_hongbao_tixian.png",
- dto.getTitle(), msg.getUpdateTime() == null ? msg.getCreateTime() : msg.getUpdateTime(),
- items);
+
+ 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.redPackExchangeReject) { // 绾㈠寘鎻愮幇鎷掔粷
if (StringUtil.isNullOrEmpty(msg.getContent()))
return null;
- MsgRedPackExchangeContentDTO dto = new Gson().fromJson(msg.getContent(), MsgRedPackExchangeContentDTO.class);
+ MsgRedPackExchangeContentDTO dto = new Gson().fromJson(msg.getContent(),
+ MsgRedPackExchangeContentDTO.class);
if (dto == null)
return null;
-
+
contentList = new ArrayList<>();
contentList.add(new ClientTextStyleVO(msg.getMsgType().getDesc() + "", COLOR_CONTENT));
items.add(new CommonMsgItemVO(new ClientTextStyleVO("绫诲埆", COLOR_TITLE), contentList));
@@ -729,54 +727,249 @@
contentList = new ArrayList<>();
contentList.add(new ClientTextStyleVO(dto.getReason() + "", COLOR_CONTENT));
items.add(new CommonMsgItemVO(new ClientTextStyleVO("澶辫触鍘熷洜", COLOR_TITLE), contentList));
-
+
String handle = dto.getHandle();
- if (StringUtil.isNullOrEmpty(handle))
- handle = "鏃�";
- contentList = new ArrayList<>();
- contentList.add(new ClientTextStyleVO(handle, COLOR_CONTENT));
- items.add(new CommonMsgItemVO(new ClientTextStyleVO("澶勭悊", COLOR_TITLE), contentList));
-
+ if (!StringUtil.isNullOrEmpty(handle)) {
+ contentList = new ArrayList<>();
+ contentList.add(new ClientTextStyleVO(handle, 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/resource/msg/icon_hongbao_tixian.png",
- dto.getTitle(), msg.getUpdateTime() == null ? msg.getCreateTime() : msg.getUpdateTime(),
- items);
- } else if (msg.getMsgType() == MsgTypeMoneyTypeEnum.redPackNewUserReward
- || msg.getMsgType() == MsgTypeMoneyTypeEnum.redPackInviteSucceed
- || msg.getMsgType() == MsgTypeMoneyTypeEnum.redPackFirstSharedOrder
- || msg.getMsgType() == MsgTypeMoneyTypeEnum.redPackMonthSharedOrder) { // 绾㈠寘閭�璇疯幏寰�
+ 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;
- MsgRedPackAddContentDTO dto = new Gson().fromJson(msg.getContent(), MsgRedPackAddContentDTO.class);
+ MsgRedPackExchangeContentDTO dto = new Gson().fromJson(msg.getContent(),
+ MsgRedPackExchangeContentDTO.class);
if (dto == null)
return null;
-
- contentList = new ArrayList<>();
- contentList.add(new ClientTextStyleVO(msg.getMsgType().getDesc() + "", COLOR_CONTENT));
- items.add(new CommonMsgItemVO(new ClientTextStyleVO("澧炲姞鍘熷洜", COLOR_TITLE), contentList));
contentList = new ArrayList<>();
- contentList.add(new ClientTextStyleVO(dto.getMoney() + "", COLOR_HIGHLIGHT_CONTENT));
- items.add(new CommonMsgItemVO(new ClientTextStyleVO("閲� 棰�", COLOR_TITLE), contentList));
+
+ 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.getBalance() + "", COLOR_HIGHLIGHT_CONTENT));
- items.add(new CommonMsgItemVO(new ClientTextStyleVO("绾㈠寘浣欓", COLOR_TITLE), contentList));
-
+ 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",
- dto.getTitle(), msg.getUpdateTime() == null ? msg.getCreateTime() : msg.getUpdateTime(),
- items);
+ 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.redPackForbidRemove) { // 绾㈠寘灏佺瑙ｉ櫎娑堟伅
+ 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.redPackDeduct) { // 绾㈠寘鎵ｉ櫎娑堟伅
+ 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.getMoney() + "", COLOR_HIGHLIGHT_CONTENT));
+ items.add(new CommonMsgItemVO(new ClientTextStyleVO("鎵ｉ櫎閲戦", COLOR_TITLE), contentList));
+
+ contentList = new ArrayList<>();
+ contentList.add(new ClientTextStyleVO("楼" + dto.getBalance(), COLOR_HIGHLIGHT_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) { // 绾㈠寘閭�璇疯幏寰�
+ if (StringUtil.isNullOrEmpty(msg.getContent()))
+ return null;
+
+ MsgRedPackTeamRewardContentDTO dto = new Gson().fromJson(msg.getContent(),
+ MsgRedPackTeamRewardContentDTO.class);
+ if (dto == null)
+ return null;
+
+ contentList = new ArrayList<>();
+ contentList.add(new ClientTextStyleVO(dto.getNickName() + "", COLOR_CONTENT, dto.getPortrait()));
+ items.add(new CommonMsgItemVO(new ClientTextStyleVO("琚個璇蜂汉", COLOR_TITLE), contentList));
+
+ contentList = new ArrayList<>();
+ contentList.add(new ClientTextStyleVO(msg.getStateDesc(), COLOR_CONTENT));
+ items.add(new CommonMsgItemVO(new ClientTextStyleVO("绾㈠寘杩涚▼", COLOR_TITLE), contentList));
+
+ contentList = new ArrayList<>();
+ contentList.add(new ClientTextStyleVO("楼" + filterMoney(msg.getMoney()) + "", COLOR_HIGHLIGHT_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.getUpdateTime() == null ? msg.getCreateTime() : msg.getUpdateTime(), items);
+ } else if (msg.getMsgType() == MsgTypeMoneyTypeEnum.redPackUseSuccess) { // 绾㈠寘浣跨敤鎴愬姛
+ if (StringUtil.isNullOrEmpty(msg.getContent()))
+ return null;
+
+ MsgRedPackUseContentDTO dto = new Gson().fromJson(msg.getContent(), MsgRedPackUseContentDTO.class);
+ if (dto == null)
+ return null;
+
+ String useType = "";
+ boolean moneyPay = dto.getMoney() != null && dto.getMoney().compareTo(new BigDecimal(0)) > 0;
+ boolean hongBaoPay = dto.getHongBao() != null && dto.getHongBao().compareTo(new BigDecimal(0)) > 0;
+ if (moneyPay && hongBaoPay) {
+ useType = "绾㈠寘+鐜伴噾";
+ } else if (hongBaoPay)
+ useType = "浠呯孩鍖�";
+ else if (moneyPay)
+ useType = "浠呯幇閲�";
+
+ contentList = new ArrayList<>();
+ contentList.add(new ClientTextStyleVO("绾㈠寘浣跨敤鎴愬姛", COLOR_CONTENT));
+ items.add(new CommonMsgItemVO(new ClientTextStyleVO("鐘舵��", COLOR_TITLE), contentList));
+
+ contentList = new ArrayList<>();
+ contentList.add(new ClientTextStyleVO(dto.getGoodsSetName() + "", COLOR_CONTENT));
+ items.add(new CommonMsgItemVO(new ClientTextStyleVO("鍏戞崲鍟嗗搧", COLOR_TITLE), contentList));
+
+ contentList = new ArrayList<>();
+ contentList.add(new ClientTextStyleVO(useType, COLOR_CONTENT));
+ items.add(new CommonMsgItemVO(new ClientTextStyleVO("鍏戞崲鏂瑰紡", COLOR_TITLE), contentList));
+
+ if (hongBaoPay) {
+ contentList = new ArrayList<>();
+ contentList.add(
+ new ClientTextStyleVO("楼" + dto.getHongBao().setScale(2).toString(), COLOR_HIGHLIGHT_CONTENT));
+ items.add(new CommonMsgItemVO(new ClientTextStyleVO("娑堣�楃孩鍖�", COLOR_TITLE), contentList));
+ }
+
+ if (moneyPay) {
+ contentList = new ArrayList<>();
+ contentList.add(
+ new ClientTextStyleVO("楼" + dto.getMoney().setScale(2).toString(), COLOR_HIGHLIGHT_CONTENT));
+ items.add(new CommonMsgItemVO(new ClientTextStyleVO("娑堣�楃幇閲�", COLOR_TITLE), contentList));
+ }
+
+ contentList = new ArrayList<>();
+ contentList.add(new ClientTextStyleVO(
+ "浜哄伐瀹℃牳[" + TimeUtil.getGernalTime(dto.getTime().getTime(), "yyyy.MM.dd HH:mm") + "]",
+ 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.getUpdateTime() == null ? msg.getCreateTime() : msg.getUpdateTime(), items);
+ } else if (msg.getMsgType() == MsgTypeMoneyTypeEnum.redPackUseFail) { // 绾㈠寘浣跨敤澶辫触
+ if (StringUtil.isNullOrEmpty(msg.getContent()))
+ return null;
+
+ MsgRedPackUseContentDTO dto = new Gson().fromJson(msg.getContent(), MsgRedPackUseContentDTO.class);
+ if (dto == null)
+ return null;
+
+ String useType = "";
+ boolean moneyPay = dto.getMoney() != null && dto.getMoney().compareTo(new BigDecimal(0)) > 0;
+ boolean hongBaoPay = dto.getHongBao() != null && dto.getHongBao().compareTo(new BigDecimal(0)) > 0;
+ if (moneyPay && hongBaoPay) {
+ useType = "绾㈠寘+鐜伴噾";
+ } else if (hongBaoPay)
+ useType = "浠呯孩鍖�";
+ else if (moneyPay)
+ useType = "浠呯幇閲�";
+
+ contentList = new ArrayList<>();
+ contentList.add(new ClientTextStyleVO("绾㈠寘浣跨敤澶辫触", COLOR_CONTENT));
+ items.add(new CommonMsgItemVO(new ClientTextStyleVO("鐘舵��", COLOR_TITLE), contentList));
+
+ contentList = new ArrayList<>();
+ contentList.add(new ClientTextStyleVO(dto.getGoodsSetName() + "", COLOR_CONTENT));
+ items.add(new CommonMsgItemVO(new ClientTextStyleVO("鍏戞崲鍟嗗搧", COLOR_TITLE), contentList));
+
+ contentList = new ArrayList<>();
+ contentList.add(new ClientTextStyleVO(useType, COLOR_CONTENT));
+ items.add(new CommonMsgItemVO(new ClientTextStyleVO("鍏戞崲鏂瑰紡", COLOR_TITLE), contentList));
+
+ if (hongBaoPay) {
+ contentList = new ArrayList<>();
+ contentList.add(
+ new ClientTextStyleVO("楼" + dto.getHongBao().setScale(2).toString(), COLOR_HIGHLIGHT_CONTENT));
+ items.add(new CommonMsgItemVO(new ClientTextStyleVO("娑堣�楃孩鍖�", COLOR_TITLE), contentList));
+ }
+
+ if (moneyPay) {
+ contentList = new ArrayList<>();
+ contentList.add(new ClientTextStyleVO("楼" + dto.getMoney().setScale(2).toString() + "[宸插師璺��鍥瀅",
+ COLOR_HIGHLIGHT_CONTENT));
+ items.add(new CommonMsgItemVO(new ClientTextStyleVO("娑堣�楃幇閲�", COLOR_TITLE), contentList));
+ }
+
+ 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(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.getUpdateTime() == null ? msg.getCreateTime() : msg.getUpdateTime(), items);
}
return null;
}
@@ -888,6 +1081,31 @@
items.add(new CommonMsgItemVO(new ClientTextStyleVO("澶囨敞", COLOR_TITLE), contentList));
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.inviteSucceed) {
+ if (msg.getInviteUser() == null || msg.getInviteUser().getWorker() == null)
+ return null;
+
+ List<CommonMsgItemVO> items = new ArrayList<>();
+ List<ClientTextStyleVO> contentList = new ArrayList<>();
+ contentList.add(new ClientTextStyleVO(msg.getInviteUser().getWorker().getNickName() + "", COLOR_CONTENT,
+ msg.getInviteUser().getWorker().getPortrait()));
+ items.add(new CommonMsgItemVO(new ClientTextStyleVO("琚個璇蜂汉", COLOR_TITLE), contentList));
+
+ contentList = new ArrayList<>();
+ contentList.add(new ClientTextStyleVO("閭�璇风矇涓濇垚鍔�", COLOR_CONTENT));
+ items.add(new CommonMsgItemVO(new ClientTextStyleVO("閭�璇风姸鎬�", COLOR_TITLE), contentList));
+
+ contentList = new ArrayList<>();
+ 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(),
+ COLOR_CONTENT));
+ items.add(new CommonMsgItemVO(new ClientTextStyleVO("澶� 娉�", COLOR_TITLE), contentList));
+
+ return new UserMsgVO("http://img.flqapp.com/resource/msg/icon_msg_invite.png", "閭�璇锋彁閱� ",
msg.getUpdateTime() == null ? msg.getCreateTime() : msg.getUpdateTime(), items);
}
@@ -1312,13 +1530,13 @@
if (!StringUtil.isNullOrEmpty(dto.getExplain())) {
contentList = new ArrayList<>();
contentList.add(new ClientTextStyleVO(dto.getExplain() + "", COLOR_CONTENT));
- items.add(new CommonMsgItemVO(new ClientTextStyleVO("鍘熷洜", COLOR_TITLE), contentList));
+ items.add(new CommonMsgItemVO(new ClientTextStyleVO("鍘� 鍥�", COLOR_TITLE), contentList));
}
if (dto.getTotal() != null) {
contentList = new ArrayList<>();
contentList.add(new ClientTextStyleVO(dto.getTotal(), COLOR_CONTENT));
- items.add(new CommonMsgItemVO(new ClientTextStyleVO("鍙垯绠楅", COLOR_TITLE), contentList));
+ items.add(new CommonMsgItemVO(new ClientTextStyleVO("鍙姌绠楅", COLOR_TITLE), contentList));
}
if (!StringUtil.isNullOrEmpty(dto.getNum())) {
@@ -1330,13 +1548,13 @@
if (!StringUtil.isNullOrEmpty(dto.getSource())) {
contentList = new ArrayList<>();
contentList.add(new ClientTextStyleVO(dto.getSource(), 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(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));
UserMsgVO userMsgVO = new UserMsgVO();
userMsgVO.setIcon(icon);
@@ -1344,6 +1562,108 @@
userMsgVO.setTime(msg.getUpdateTime() == null ? msg.getCreateTime() : msg.getUpdateTime());
userMsgVO.setContentItems(items);
return userMsgVO;
+ } else if (msg.getType() == MsgTypeOtherTypeEnum.passVIPApply
+ || msg.getType() == MsgTypeOtherTypeEnum.rejectVIPApply) {
+ if (StringUtil.isNullOrEmpty(msg.getContent()))
+ return null;
+
+ MsgOtherVIPDTO dto = new Gson().fromJson(msg.getContent(), MsgOtherVIPDTO.class);
+ if (dto == null)
+ return null;
+
+ List<ClientTextStyleVO> contentList = new ArrayList<>();
+
+ contentList = new ArrayList<>();
+ contentList.add(new ClientTextStyleVO(dto.getContent1(), COLOR_CONTENT));
+ items.add(new CommonMsgItemVO(new ClientTextStyleVO("瀹℃牳鐘舵��", COLOR_TITLE), contentList));
+
+ contentList = new ArrayList<>();
+ contentList.add(new ClientTextStyleVO(dto.getContent2(), COLOR_CONTENT));
+ items.add(new CommonMsgItemVO(new ClientTextStyleVO("鍘� 鍥�", COLOR_TITLE), contentList));
+
+ if (!StringUtil.isNullOrEmpty(dto.getContent3())) {
+ contentList = new ArrayList<>();
+ contentList.add(new ClientTextStyleVO(dto.getContent3() + "", 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));
+
+ UserMsgVO userMsgVO = new UserMsgVO();
+ userMsgVO.setIcon("http://img.flqapp.com/resource/msg/icon_msg_vip.png");
+ userMsgVO.setTitle(msg.getType().getDesc());
+ userMsgVO.setTime(msg.getUpdateTime() == null ? msg.getCreateTime() : msg.getUpdateTime());
+ userMsgVO.setContentItems(items);
+ return userMsgVO;
+ } else if (msg.getType() == MsgTypeOtherTypeEnum.teamVIPCallBoss) {
+ if (StringUtil.isNullOrEmpty(msg.getContent()))
+ return null;
+
+ MsgOtherVIPDTO dto = new Gson().fromJson(msg.getContent(), MsgOtherVIPDTO.class);
+ if (dto == null)
+ return null;
+
+ List<ClientTextStyleVO> contentList = new ArrayList<>();
+
+ contentList = new ArrayList<>();
+ contentList.add(new ClientTextStyleVO(dto.getContent1(), COLOR_CONTENT));
+ items.add(new CommonMsgItemVO(new ClientTextStyleVO("鐩存帴绮変笣", COLOR_TITLE), contentList));
+
+ contentList = new ArrayList<>();
+ contentList.add(new ClientTextStyleVO(dto.getContent2(), COLOR_CONTENT));
+ items.add(new CommonMsgItemVO(new ClientTextStyleVO("浼氬憳鐘舵��", COLOR_TITLE), contentList));
+
+ contentList = new ArrayList<>();
+ contentList.add(new ClientTextStyleVO(dto.getContent3() + "", 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));
+
+ UserMsgVO userMsgVO = new UserMsgVO();
+ userMsgVO.setIcon("http://img.flqapp.com/resource/msg/icon_msg_notify.png");
+ userMsgVO.setTitle(msg.getType().getDesc());
+ userMsgVO.setTime(msg.getUpdateTime() == null ? msg.getCreateTime() : msg.getUpdateTime());
+ userMsgVO.setContentItems(items);
+ return userMsgVO;
+ } else if (msg.getType() == MsgTypeOtherTypeEnum.teamSplitCallBoss) {
+ if (StringUtil.isNullOrEmpty(msg.getContent()))
+ return null;
+
+ MsgOtherVIPDTO dto = new Gson().fromJson(msg.getContent(), MsgOtherVIPDTO.class);
+ if (dto == null)
+ return null;
+
+ List<ClientTextStyleVO> contentList = new ArrayList<>();
+
+ contentList = new ArrayList<>();
+ contentList.add(new ClientTextStyleVO(dto.getContent1(), COLOR_CONTENT));
+ items.add(new CommonMsgItemVO(new ClientTextStyleVO("鐩存帴绮変笣", COLOR_TITLE), contentList));
+
+ contentList = new ArrayList<>();
+ contentList.add(new ClientTextStyleVO(dto.getContent2(), COLOR_CONTENT));
+ items.add(new CommonMsgItemVO(new ClientTextStyleVO("鑴辩鍘熷洜", COLOR_TITLE), contentList));
+
+ contentList = new ArrayList<>();
+ contentList.add(new ClientTextStyleVO(dto.getContent3() + "", 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));
+
+ UserMsgVO userMsgVO = new UserMsgVO();
+ userMsgVO.setIcon("http://img.flqapp.com/resource/msg/icon_msg_invite_break.png");
+ 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