From 39c683421f75449c7a85280fa499bae3a2f5241b Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期一, 26 八月 2019 09:27:49 +0800
Subject: [PATCH] 金币领取
---
fanli/src/main/java/com/yeshi/fanli/util/factory/msg/UserMsgVOFactory.java | 172 +++++++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 167 insertions(+), 5 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 96b3490..f2df404 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
@@ -7,20 +7,23 @@
import com.google.gson.Gson;
import com.yeshi.fanli.dto.msg.MsgOtherCouponContentDTO;
+import com.yeshi.fanli.dto.msg.MsgOtherExchangeContentDTO;
+import com.yeshi.fanli.dto.msg.MsgOtherGiveContentDTO;
import com.yeshi.fanli.dto.msg.MsgOtherTaoLiJinContentDTO;
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;
import com.yeshi.fanli.entity.bus.msg.MsgMoneyDetail;
import com.yeshi.fanli.entity.bus.msg.MsgMoneyDetail.MsgTypeMoneyTypeEnum;
import com.yeshi.fanli.entity.bus.msg.MsgOrderDetail;
import com.yeshi.fanli.entity.bus.msg.MsgOrderDetail.MsgTypeOrderTypeEnum;
import com.yeshi.fanli.entity.bus.msg.MsgOtherDetail;
-import com.yeshi.fanli.entity.bus.msg.MsgAccountDetail.MsgTypeAccountTypeEnum;
import com.yeshi.fanli.entity.bus.msg.MsgOtherDetail.MsgTypeOtherTypeEnum;
import com.yeshi.fanli.entity.bus.user.BindingAccount;
import com.yeshi.fanli.entity.bus.user.Extract;
import com.yeshi.fanli.entity.common.JumpDetailV2;
import com.yeshi.fanli.log.LogHelper;
+import com.yeshi.fanli.util.Constant;
import com.yeshi.fanli.util.StringUtil;
import com.yeshi.fanli.util.TimeUtil;
import com.yeshi.fanli.util.account.UserUtil;
@@ -58,6 +61,13 @@
List<CommonMsgItemVO> items = new ArrayList<>();
List<ClientTextStyleVO> contentList = new ArrayList<>();
if (msg.getType() == MsgTypeOrderTypeEnum.found) {
+
+
+ contentList = new ArrayList<>();
+ contentList.add(new ClientTextStyleVO(Constant.getSourceName(msg.getOrderType()), COLOR_CONTENT));
+ 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));
@@ -80,7 +90,19 @@
items.add(new CommonMsgItemVO(new ClientTextStyleVO("鎵惧洖閲戦", COLOR_TITLE), contentList));
} else {
- contentList.add(new ClientTextStyleVO(msg.getOrderId(), COLOR_CONTENT));
+
+ contentList = new ArrayList<>();
+ contentList.add(new ClientTextStyleVO(Constant.getSourceName(msg.getOrderType()), COLOR_CONTENT));
+ items.add(new CommonMsgItemVO(new ClientTextStyleVO("娓犻亾鏉ユ簮", COLOR_TITLE), contentList));
+
+
+ String orderId = msg.getOrderId();
+ MsgTypeOrderTypeEnum type = msg.getType();
+ if (type == MsgTypeOrderTypeEnum.invite || type == MsgTypeOrderTypeEnum.share) {
+ orderId = UserUtil.filterOrderId(orderId);
+ }
+ contentList = new ArrayList<>();
+ contentList.add(new ClientTextStyleVO(orderId, COLOR_CONTENT));
items.add(new CommonMsgItemVO(new ClientTextStyleVO("璁㈠崟鍙�", COLOR_TITLE), contentList, true));
contentList = new ArrayList<>();
@@ -215,7 +237,7 @@
items.add(new CommonMsgItemVO(new ClientTextStyleVO("鎻愮幇閲戦", COLOR_TITLE), contentList));
contentList = new ArrayList<>();
- contentList.add(new ClientTextStyleVO("楼楠岃瘉鎴愬姛", COLOR_HIGHLIGHT_CONTENT));
+ contentList.add(new ClientTextStyleVO("楠岃瘉鎴愬姛", COLOR_HIGHLIGHT_CONTENT));
items.add(new CommonMsgItemVO(new ClientTextStyleVO("楠岃瘉鐘舵��", COLOR_TITLE), contentList));
contentList = new ArrayList<>();
@@ -230,6 +252,12 @@
return new UserMsgVO("http://img.flqapp.com/resource/msg/icon_msg_extract.png", "鎻愮幇璐﹀彿楠岃瘉",
msg.getUpdateTime() == null ? msg.getCreateTime() : msg.getUpdateTime(), items);
} else if (msg.getMsgType() == MsgTypeMoneyTypeEnum.fanli) {
+
+ contentList = new ArrayList<>();
+ contentList.add(new ClientTextStyleVO(Constant.getSourceName(msg.getOrderType()), COLOR_CONTENT));
+ 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));
@@ -258,6 +286,12 @@
} else if (msg.getMsgType() == MsgTypeMoneyTypeEnum.invite || msg.getMsgType() == MsgTypeMoneyTypeEnum.share) {
+ contentList = new ArrayList<>();
+ contentList.add(new ClientTextStyleVO(Constant.getSourceName(msg.getOrderType()), COLOR_CONTENT));
+ items.add(new CommonMsgItemVO(new ClientTextStyleVO("娓犻亾鏉ユ簮", COLOR_TITLE), contentList));
+
+ contentList = new ArrayList<>();
+
// 閭�璇峰閲�,鍒嗕韩濂栭噾
contentList.add(new ClientTextStyleVO(msg.getOrderCount() + "", COLOR_CONTENT));
@@ -297,6 +331,12 @@
msg.getUpdateTime() == null ? msg.getCreateTime() : msg.getUpdateTime(), items);
} else if (msg.getMsgType() == MsgTypeMoneyTypeEnum.fanliWeiQuan) {
+ contentList = new ArrayList<>();
+ contentList.add(new ClientTextStyleVO(Constant.getSourceName(msg.getOrderType()), COLOR_CONTENT));
+ 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));
@@ -320,6 +360,13 @@
return new UserMsgVO("http://img.flqapp.com/resource/msg/icon_msg_fanli.png", msg.getMsgType().getDesc(),
msg.getUpdateTime() == null ? msg.getCreateTime() : msg.getUpdateTime(), items);
} else if (msg.getMsgType() == MsgTypeMoneyTypeEnum.shareWeiQuan) {
+ contentList = new ArrayList<>();
+ contentList.add(new ClientTextStyleVO(Constant.getSourceName(msg.getOrderType()), COLOR_CONTENT));
+ 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));
@@ -344,6 +391,12 @@
msg.getMsgType().getDesc(), msg.getUpdateTime() == null ? msg.getCreateTime() : msg.getUpdateTime(),
items);
} else if (msg.getMsgType() == MsgTypeMoneyTypeEnum.inviteWeiQuan) {
+ contentList = new ArrayList<>();
+ contentList.add(new ClientTextStyleVO(Constant.getSourceName(msg.getOrderType()), COLOR_CONTENT));
+ 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));
@@ -368,6 +421,12 @@
msg.getMsgType().getDesc(), msg.getUpdateTime() == null ? msg.getCreateTime() : msg.getUpdateTime(),
items);
} else if (msg.getMsgType() == MsgTypeMoneyTypeEnum.orderReward) {// 濂栧姳璁㈠崟
+ contentList = new ArrayList<>();
+ contentList.add(new ClientTextStyleVO(Constant.getSourceName(msg.getOrderType()), COLOR_CONTENT));
+ 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));
@@ -387,7 +446,7 @@
return new UserMsgVO("http://img.flqapp.com/resource/msg/icon_msg_order_reward.png",
msg.getMsgType().getDesc(), msg.getUpdateTime() == null ? msg.getCreateTime() : msg.getUpdateTime(),
items);
- } else if (msg.getMsgType() == MsgTypeMoneyTypeEnum.systemEqualize) {// 濂栧姳璁㈠崟
+ } else if (msg.getMsgType() == MsgTypeMoneyTypeEnum.systemEqualize) {// 绯荤粺琛ュ伩
contentList = new ArrayList<>();
contentList.add(new ClientTextStyleVO("楼" + filterMoney(msg.getMoney()) + "", COLOR_HIGHLIGHT_CONTENT));
items.add(new CommonMsgItemVO(new ClientTextStyleVO("琛ラ綈閲戦", COLOR_TITLE), contentList));
@@ -567,7 +626,15 @@
if (dto.getLeftDay() != null) {
contentList = new ArrayList<>();
contentList.add(new ClientTextStyleVO(dto.getLeftDay() + "", COLOR_HIGHLIGHT_CONTENT));
- contentList.add(new ClientTextStyleVO("澶�", COLOR_CONTENT));
+
+ if (msg.getType() == MsgTypeOtherTypeEnum.couponReward) {
+ contentList.add(new ClientTextStyleVO("澶╋紙鏈娇鐢ㄥ皢浼氳繃鏈燂級", COLOR_CONTENT));
+ } else if (msg.getType() == MsgTypeOtherTypeEnum.couponMianDan) {
+ contentList.add(new ClientTextStyleVO("澶╋紙鏈娇鐢ㄥ皢浼氳繃鏈燂級", COLOR_CONTENT));
+ } else {
+ contentList.add(new ClientTextStyleVO("澶�", COLOR_CONTENT));
+ }
+
items.add(new CommonMsgItemVO(new ClientTextStyleVO("鍓╀綑澶╂暟", COLOR_TITLE), contentList));
}
@@ -632,6 +699,101 @@
COLOR_CONTENT));
items.add(new CommonMsgItemVO(new ClientTextStyleVO("澶囨敞", COLOR_TITLE), contentList));
+ } else if (msg.getType() == MsgTypeOtherTypeEnum.give) {
+ if (StringUtil.isNullOrEmpty(msg.getContent()))
+ return null;
+
+ MsgOtherGiveContentDTO dto = new Gson().fromJson(msg.getContent(), MsgOtherGiveContentDTO.class);
+ if (dto == null)
+ return null;
+
+ String type = dto.getType();
+ if (type == null)
+ return null;
+
+ if (MsgOtherGiveContentDTO.TYEP_COUPON.equalsIgnoreCase(type)) {
+ icon = "http://img.flqapp.com/resource/msg/icon_msg_other_coupon.png";
+ } else {
+ icon = "http://img.flqapp.com/resource/msg/icon_msg_other_tlj.png";
+ }
+
+
+ List<ClientTextStyleVO> contentList = new ArrayList<>();
+ contentList.add(new ClientTextStyleVO(dto.getGiveType(), COLOR_CONTENT));
+ items.add(new CommonMsgItemVO(new ClientTextStyleVO("璧犻�佺被鍒�", COLOR_TITLE), contentList));
+
+ if (!StringUtil.isNullOrEmpty(dto.getReceiveInfo())) {
+ contentList = new ArrayList<>();
+ contentList.add(new ClientTextStyleVO(dto.getReceiveInfo() + "", COLOR_CONTENT));
+ items.add(new CommonMsgItemVO(new ClientTextStyleVO("棰嗗彇鐢ㄦ埛", COLOR_TITLE), contentList));
+ }
+
+ if (!StringUtil.isNullOrEmpty(dto.getGiveTime())) {
+ contentList = new ArrayList<>();
+ contentList.add(new ClientTextStyleVO(dto.getGiveTime() + "", COLOR_CONTENT));
+ items.add(new CommonMsgItemVO(new ClientTextStyleVO("璧犻�佹椂闂�", COLOR_TITLE), contentList));
+ }
+
+
+ if (!StringUtil.isNullOrEmpty(dto.getReceiveTime())) {
+ contentList = new ArrayList<>();
+ contentList.add(new ClientTextStyleVO(dto.getReceiveTime() + "", COLOR_CONTENT));
+ items.add(new CommonMsgItemVO(new ClientTextStyleVO("棰嗗彇鏃堕棿", COLOR_TITLE), contentList));
+ }
+
+ if (!StringUtil.isNullOrEmpty(dto.getReturnTime())) {
+ contentList = new ArrayList<>();
+ contentList.add(new ClientTextStyleVO(dto.getReturnTime() + "", 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(icon);
+ userMsgVO.setTitle(dto.getTitle());
+ userMsgVO.setTime(msg.getUpdateTime() == null ? msg.getCreateTime() : msg.getUpdateTime());
+ userMsgVO.setContentItems(items);
+ return userMsgVO;
+ } else if (msg.getType() == MsgTypeOtherTypeEnum.exchange) {
+ if (StringUtil.isNullOrEmpty(msg.getContent()))
+ return null;
+
+ MsgOtherExchangeContentDTO dto = new Gson().fromJson(msg.getContent(), MsgOtherExchangeContentDTO.class);
+ if (dto == null)
+ return null;
+
+ icon = "http://img.flqapp.com/resource/msg/icon_msg_other_integral.png";
+
+ List<ClientTextStyleVO> contentList = new ArrayList<>();
+ contentList.add(new ClientTextStyleVO(dto.getState(), COLOR_CONTENT));
+ items.add(new CommonMsgItemVO(new ClientTextStyleVO("鐘舵��", COLOR_TITLE), contentList));
+
+ if (!StringUtil.isNullOrEmpty(dto.getExpend())) {
+ contentList = new ArrayList<>();
+ contentList.add(new ClientTextStyleVO(dto.getExpend() + "", COLOR_CONTENT));
+ items.add(new CommonMsgItemVO(new ClientTextStyleVO("娑堣��", COLOR_TITLE), contentList));
+ }
+
+ if (!StringUtil.isNullOrEmpty(dto.getTotalGold())) {
+ contentList = new ArrayList<>();
+ contentList.add(new ClientTextStyleVO(dto.getTotalGold() + "", COLOR_CONTENT));
+ items.add(new CommonMsgItemVO(new ClientTextStyleVO("閲戝竵鎬绘暟", COLOR_TITLE), contentList));
+ }
+
+ if (!StringUtil.isNullOrEmpty(dto.getThing())) {
+ contentList = new ArrayList<>();
+ contentList.add(new ClientTextStyleVO(dto.getThing() + "", 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(icon, msg.getType().getDesc(),
--
Gitblit v1.8.0