From 48077e8c704216f38939cfbf1702f45d7190801d Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期二, 12 十一月 2019 15:26:39 +0800
Subject: [PATCH] Merge branch 'div' of ssh://193.112.35.168:29418/fanli-server into div
---
fanli/src/main/java/com/yeshi/fanli/util/factory/msg/UserMsgVOFactory.java | 186 +++++++++++++++++++++++++++++++++++----------
1 files changed, 143 insertions(+), 43 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 ff11ec4..72fffa5 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
@@ -17,6 +17,7 @@
import com.yeshi.fanli.dto.msg.MsgRedPackAddContentDTO;
import com.yeshi.fanli.dto.msg.MsgRedPackExchangeContentDTO;
import com.yeshi.fanli.dto.msg.MsgRedPackGiveContentDTO;
+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 +116,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));
@@ -567,25 +568,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 +591,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 +609,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 +618,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 +636,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 +645,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 +653,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 +668,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 +690,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,23 +726,21 @@
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));
-
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.redPackNewUserReward
|| msg.getMsgType() == MsgTypeMoneyTypeEnum.redPackInviteSucceed
|| msg.getMsgType() == MsgTypeMoneyTypeEnum.redPackFirstSharedOrder
@@ -756,7 +751,7 @@
MsgRedPackAddContentDTO dto = new Gson().fromJson(msg.getContent(), MsgRedPackAddContentDTO.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));
@@ -768,15 +763,120 @@
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",
- dto.getTitle(), msg.getUpdateTime() == null ? msg.getCreateTime() : msg.getUpdateTime(),
- items);
+ return new UserMsgVO("http://img.flqapp.com/img/tlj/icon_tlj.png", dto.getTitle(),
+ 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;
}
--
Gitblit v1.8.0