From 9d8dfb01ff72c57abad3b80f3d65e81a5354db03 Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期五, 12 七月 2019 09:10:38 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
fanli/src/main/java/com/yeshi/fanli/util/factory/msg/UserMsgVOFactory.java | 137 +++++++++++++++++++++++++--------------------
1 files changed, 75 insertions(+), 62 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 4e80078..a1ce4dc 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
@@ -18,6 +18,7 @@
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.StringUtil;
import com.yeshi.fanli.util.TimeUtil;
@@ -25,6 +26,8 @@
import com.yeshi.fanli.vo.msg.ClientTextStyleVO;
import com.yeshi.fanli.vo.msg.CommonMsgItemVO;
import com.yeshi.fanli.vo.msg.UserMsgVO;
+
+import net.sf.json.JSONObject;
public class UserMsgVOFactory {
@@ -36,7 +39,7 @@
if (money == null)
return null;
else
- return money.setScale(2);
+ return money.setScale(2);
}
/**
@@ -45,7 +48,10 @@
* @param msg
* @return
*/
- public static UserMsgVO create(MsgOrderDetail msg) {
+ public static UserMsgVO create(MsgOrderDetail msg, JumpDetailV2 jumpDetail, JSONObject params) {
+
+ 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<>();
@@ -67,13 +73,13 @@
items.add(new CommonMsgItemVO(new ClientTextStyleVO("鎵惧洖鐘舵��", COLOR_TITLE), contentList));
contentList = new ArrayList<>();
- contentList.add(new ClientTextStyleVO(msg.getState() == 1 ? "楼" +filterMoney( msg.getPayMoney()) : "鏃�",
+ contentList.add(new ClientTextStyleVO(msg.getState() == 1 ? "楼" + filterMoney(msg.getPayMoney()) : "鏃�",
COLOR_HIGHLIGHT_CONTENT));
items.add(new CommonMsgItemVO(new ClientTextStyleVO("鎵惧洖閲戦", COLOR_TITLE), contentList));
} else {
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,true));
contentList = new ArrayList<>();
contentList.add(new ClientTextStyleVO("鍏�", COLOR_CONTENT));
@@ -98,13 +104,11 @@
items.add(new CommonMsgItemVO(new ClientTextStyleVO("璁㈠崟鐘舵��", COLOR_TITLE), contentList));
contentList = new ArrayList<>();
- contentList.add(new ClientTextStyleVO("楼" +filterMoney(msg.getPayMoney()),
- COLOR_HIGHLIGHT_CONTENT));
+ contentList.add(new ClientTextStyleVO("楼" + filterMoney(msg.getPayMoney()), COLOR_HIGHLIGHT_CONTENT));
items.add(new CommonMsgItemVO(new ClientTextStyleVO("浠樻閲戦", COLOR_TITLE), contentList));
contentList = new ArrayList<>();
- contentList.add(new ClientTextStyleVO("楼" + filterMoney(msg.getHongBaoMoney()),
- COLOR_HIGHLIGHT_CONTENT));
+ contentList.add(new ClientTextStyleVO("楼" + filterMoney(msg.getHongBaoMoney()), COLOR_HIGHLIGHT_CONTENT));
if (msg.getType() == MsgTypeOrderTypeEnum.fanli)
items.add(new CommonMsgItemVO(new ClientTextStyleVO("杩斿埄閲戦", COLOR_TITLE), contentList));
@@ -112,14 +116,18 @@
items.add(new CommonMsgItemVO(new ClientTextStyleVO("鍒嗕韩濂栭噾", COLOR_TITLE), contentList));
else if (msg.getType() == MsgTypeOrderTypeEnum.invite)
items.add(new CommonMsgItemVO(new ClientTextStyleVO("閭�璇峰閲�", COLOR_TITLE), contentList));
+
+ vo.setJumpDetail(jumpDetail);
+ if (params != null)
+ vo.setParams(params.toString());
}
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_order.png", "璁㈠崟娑堟伅",
- msg.getUpdateTime() == null ? msg.getCreateTime() : msg.getUpdateTime(), items);
+ vo.setContentItems(items);
+ return vo;
}
/**
@@ -146,8 +154,8 @@
items.add(new CommonMsgItemVO(new ClientTextStyleVO("鎻愮幇璐﹀彿", COLOR_TITLE), contentList));
contentList = new ArrayList<>();
- contentList.add(new ClientTextStyleVO("楼" +filterMoney(msg.getExtract().getMoney()),
- COLOR_HIGHLIGHT_CONTENT));
+ contentList.add(
+ new ClientTextStyleVO("楼" + filterMoney(msg.getExtract().getMoney()), COLOR_HIGHLIGHT_CONTENT));
items.add(new CommonMsgItemVO(new ClientTextStyleVO("鎻愮幇閲戦", COLOR_TITLE), contentList));
contentList = new ArrayList<>();
@@ -201,8 +209,7 @@
items.add(new CommonMsgItemVO(new ClientTextStyleVO("鎻愮幇璐﹀彿", COLOR_CONTENT), contentList));
contentList = new ArrayList<>();
- contentList.add(new ClientTextStyleVO("楼" + filterMoney(msg.getMoney()),
- COLOR_HIGHLIGHT_CONTENT));
+ contentList.add(new ClientTextStyleVO("楼" + filterMoney(msg.getMoney()), COLOR_HIGHLIGHT_CONTENT));
items.add(new CommonMsgItemVO(new ClientTextStyleVO("鎻愮幇閲戦", COLOR_TITLE), contentList));
contentList = new ArrayList<>();
@@ -232,14 +239,12 @@
items.add(new CommonMsgItemVO(new ClientTextStyleVO("鍟嗗搧鏁伴噺", COLOR_TITLE), contentList));
contentList = new ArrayList<>();
- contentList.add(new ClientTextStyleVO("楼" + filterMoney(msg.getMoney()) + "",
- COLOR_HIGHLIGHT_CONTENT));
+ 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("楼" + filterMoney(msg.getBalance()) + "",
- COLOR_CONTENT));
- items.add(new CommonMsgItemVO(new ClientTextStyleVO("璐﹀彿浣欓", COLOR_TITLE), contentList));
+ contentList.add(new ClientTextStyleVO("楼" + filterMoney(msg.getBalance()) + "", COLOR_CONTENT));
+ items.add(new CommonMsgItemVO(new ClientTextStyleVO("璐︽埛浣欓", COLOR_TITLE), contentList));
contentList = new ArrayList<>();
contentList.add(new ClientTextStyleVO(StringUtil.isNullOrEmpty(msg.getBeiZhu()) ? "鏃�" : msg.getBeiZhu(),
@@ -263,14 +268,12 @@
items.add(new CommonMsgItemVO(new ClientTextStyleVO("濂栭噾鍟嗗搧", COLOR_TITLE), contentList));
contentList = new ArrayList<>();
- contentList.add(new ClientTextStyleVO("楼" + filterMoney(msg.getMoney()) + "",
- COLOR_HIGHLIGHT_CONTENT));
+ 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("楼" + filterMoney(msg.getBalance()) + "",
- COLOR_CONTENT));
- items.add(new CommonMsgItemVO(new ClientTextStyleVO("璐﹀彿浣欓", COLOR_TITLE), contentList));
+ contentList.add(new ClientTextStyleVO("楼" + filterMoney(msg.getBalance()) + "", COLOR_CONTENT));
+ items.add(new CommonMsgItemVO(new ClientTextStyleVO("璐︽埛浣欓", COLOR_TITLE), contentList));
contentList = new ArrayList<>();
contentList.add(new ClientTextStyleVO(StringUtil.isNullOrEmpty(msg.getBeiZhu()) ? "鏃�" : msg.getBeiZhu(),
@@ -300,14 +303,12 @@
items.add(new CommonMsgItemVO(new ClientTextStyleVO("鎵ｉ櫎璇存槑", COLOR_TITLE), contentList));
contentList = new ArrayList<>();
- contentList.add(new ClientTextStyleVO("楼" + filterMoney(msg.getMoney()) + "",
- COLOR_HIGHLIGHT_CONTENT));
+ 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("楼" + filterMoney(msg.getBalance()) + "",
- COLOR_CONTENT));
- items.add(new CommonMsgItemVO(new ClientTextStyleVO("璐﹀彿浣欓", COLOR_TITLE), contentList));
+ contentList.add(new ClientTextStyleVO("楼" + filterMoney(msg.getBalance()) + "", COLOR_CONTENT));
+ items.add(new CommonMsgItemVO(new ClientTextStyleVO("璐︽埛浣欓", COLOR_TITLE), contentList));
contentList = new ArrayList<>();
contentList.add(new ClientTextStyleVO(StringUtil.isNullOrEmpty(msg.getBeiZhu()) ? "鏃�" : msg.getBeiZhu(),
@@ -325,14 +326,12 @@
items.add(new CommonMsgItemVO(new ClientTextStyleVO("鎵ｉ櫎璇存槑", COLOR_TITLE), contentList));
contentList = new ArrayList<>();
- contentList.add(new ClientTextStyleVO("楼" + filterMoney(msg.getMoney()) + "",
- COLOR_HIGHLIGHT_CONTENT));
+ 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("楼" + filterMoney(msg.getBalance()) + "",
- COLOR_CONTENT));
- items.add(new CommonMsgItemVO(new ClientTextStyleVO("璐﹀彿浣欓", COLOR_TITLE), contentList));
+ contentList.add(new ClientTextStyleVO("楼" + filterMoney(msg.getBalance()) + "", COLOR_CONTENT));
+ items.add(new CommonMsgItemVO(new ClientTextStyleVO("璐︽埛浣欓", COLOR_TITLE), contentList));
contentList = new ArrayList<>();
contentList.add(new ClientTextStyleVO(StringUtil.isNullOrEmpty(msg.getBeiZhu()) ? "鏃�" : msg.getBeiZhu(),
@@ -351,14 +350,12 @@
items.add(new CommonMsgItemVO(new ClientTextStyleVO("鎵ｉ櫎璇存槑", COLOR_TITLE), contentList));
contentList = new ArrayList<>();
- contentList.add(new ClientTextStyleVO("楼" + filterMoney(msg.getMoney()) + "",
- COLOR_HIGHLIGHT_CONTENT));
+ 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("楼" + filterMoney(msg.getBalance()) + "",
- COLOR_CONTENT));
- items.add(new CommonMsgItemVO(new ClientTextStyleVO("璐﹀彿浣欓", COLOR_TITLE), contentList));
+ contentList.add(new ClientTextStyleVO("楼" + filterMoney(msg.getBalance()) + "", COLOR_CONTENT));
+ items.add(new CommonMsgItemVO(new ClientTextStyleVO("璐︽埛浣欓", COLOR_TITLE), contentList));
contentList = new ArrayList<>();
contentList.add(new ClientTextStyleVO(StringUtil.isNullOrEmpty(msg.getBeiZhu()) ? "鏃�" : msg.getBeiZhu(),
@@ -373,14 +370,12 @@
items.add(new CommonMsgItemVO(new ClientTextStyleVO("濂栧姳璁㈠崟", COLOR_TITLE), contentList));
contentList = new ArrayList<>();
- contentList.add(new ClientTextStyleVO("楼" + filterMoney(msg.getMoney()) + "",
- COLOR_HIGHLIGHT_CONTENT));
+ 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("楼" + filterMoney(msg.getBalance()) + "",
- COLOR_CONTENT));
- items.add(new CommonMsgItemVO(new ClientTextStyleVO("璐﹀彿浣欓", COLOR_TITLE), contentList));
+ contentList.add(new ClientTextStyleVO("楼" + filterMoney(msg.getBalance()) + "", COLOR_CONTENT));
+ items.add(new CommonMsgItemVO(new ClientTextStyleVO("璐︽埛浣欓", COLOR_TITLE), contentList));
contentList = new ArrayList<>();
contentList.add(new ClientTextStyleVO(StringUtil.isNullOrEmpty(msg.getBeiZhu()) ? "鏃�" : msg.getBeiZhu(),
@@ -478,9 +473,9 @@
*/
public static UserMsgVO create(MsgOtherDetail msg) {
List<CommonMsgItemVO> items = new ArrayList<>();
-
+
String icon = null;
-
+
if (msg.getType() == MsgTypeOtherTypeEnum.couponMianDan
|| msg.getType() == MsgTypeOtherTypeEnum.couponWelfareMianDan
|| msg.getType() == MsgTypeOtherTypeEnum.couponReward) {
@@ -490,9 +485,9 @@
MsgOtherCouponContentDTO dto = new Gson().fromJson(msg.getContent(), MsgOtherCouponContentDTO.class);
if (dto == null)
return null;
-
+
icon = "http://img.flqapp.com/resource/msg/icon_msg_other_coupon.png";
-
+
List<ClientTextStyleVO> contentList = new ArrayList<>();
contentList.add(new ClientTextStyleVO(dto.getState(), COLOR_CONTENT));
items.add(new CommonMsgItemVO(new ClientTextStyleVO("鐘舵��", COLOR_TITLE), contentList));
@@ -505,22 +500,20 @@
if (dto.getFanLiMoney() != null) {
contentList = new ArrayList<>();
- contentList.add(new ClientTextStyleVO("楼" + filterMoney(dto.getFanLiMoney()),
- COLOR_CONTENT));
+ contentList.add(new ClientTextStyleVO("楼" + filterMoney(dto.getFanLiMoney()), COLOR_CONTENT));
items.add(new CommonMsgItemVO(new ClientTextStyleVO("棰勪及杩斿埄", COLOR_TITLE), contentList));
}
if (dto.getOrderFanLiMoney() != null) {
contentList = new ArrayList<>();
- contentList.add(new ClientTextStyleVO("楼" + filterMoney(dto.getOrderFanLiMoney()),
- COLOR_CONTENT));
+ contentList.add(new ClientTextStyleVO("楼" + filterMoney(dto.getOrderFanLiMoney()), COLOR_CONTENT));
items.add(new CommonMsgItemVO(new ClientTextStyleVO("璁㈠崟杩斿埄", COLOR_TITLE), contentList));
}
if (dto.getRewardMoney() != null) {
contentList = new ArrayList<>();
- contentList.add(new ClientTextStyleVO("楼" + filterMoney(dto.getRewardMoney()),
- COLOR_HIGHLIGHT_CONTENT));
+ contentList
+ .add(new ClientTextStyleVO("楼" + filterMoney(dto.getRewardMoney()), COLOR_HIGHLIGHT_CONTENT));
items.add(new CommonMsgItemVO(new ClientTextStyleVO("濂栧姳閲�", COLOR_TITLE), contentList));
}
@@ -553,17 +546,17 @@
contentList.add(new ClientTextStyleVO(StringUtil.isNullOrEmpty(msg.getBeiZhu()) ? "鏃�" : msg.getBeiZhu(),
COLOR_CONTENT));
items.add(new CommonMsgItemVO(new ClientTextStyleVO("澶囨敞", COLOR_TITLE), contentList));
-
+
} else if (msg.getType() == MsgTypeOtherTypeEnum.taoLiJin) {
if (StringUtil.isNullOrEmpty(msg.getContent()))
return null;
-
+
MsgOtherTaoLiJinContentDTO dto = new Gson().fromJson(msg.getContent(), MsgOtherTaoLiJinContentDTO.class);
if (dto == null)
return null;
-
+
icon = "http://img.flqapp.com/resource/msg/icon_msg_other_tlj.png";
-
+
List<ClientTextStyleVO> contentList = new ArrayList<>();
contentList.add(new ClientTextStyleVO(dto.getState(), COLOR_CONTENT));
items.add(new CommonMsgItemVO(new ClientTextStyleVO("鐘舵��", COLOR_TITLE), contentList));
@@ -574,21 +567,41 @@
items.add(new CommonMsgItemVO(new ClientTextStyleVO("鏉ユ簮", COLOR_TITLE), contentList));
}
+ if (!StringUtil.isNullOrEmpty(dto.getTimeDesc())) {
+ contentList = new ArrayList<>();
+ contentList.add(new ClientTextStyleVO(dto.getTimeDesc() + "", COLOR_CONTENT));
+ items.add(new CommonMsgItemVO(new ClientTextStyleVO("鏃堕棿", COLOR_TITLE), contentList));
+ }
+
if (dto.getMoney() != null) {
contentList = new ArrayList<>();
- contentList.add(new ClientTextStyleVO("楼" + filterMoney(dto.getMoney().setScale(2)),
- COLOR_HIGHLIGHT_CONTENT));
+ contentList.add(
+ new ClientTextStyleVO("楼" + filterMoney(dto.getMoney().setScale(2)), COLOR_HIGHLIGHT_CONTENT));
items.add(new CommonMsgItemVO(new ClientTextStyleVO("闈㈤", COLOR_TITLE), contentList));
+ }
+
+
+ if (!StringUtil.isNullOrEmpty(dto.getReason())) {
+ contentList = new ArrayList<>();
+ contentList.add(new ClientTextStyleVO(dto.getReason() + "", COLOR_CONTENT));
+ items.add(new CommonMsgItemVO(new ClientTextStyleVO("鍘熷洜", COLOR_TITLE), contentList));
+ }
+
+ if (!StringUtil.isNullOrEmpty(dto.getResult())) {
+ contentList = new ArrayList<>();
+ contentList.add(new ClientTextStyleVO(dto.getResult() + "", 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(), msg.getUpdateTime() == null ? msg.getCreateTime() : msg.getUpdateTime(), items);
+ return new UserMsgVO(icon, msg.getType().getDesc(),
+ msg.getUpdateTime() == null ? msg.getCreateTime() : msg.getUpdateTime(), items);
}
}
--
Gitblit v1.8.0