From aad0554cc7f18a6ec05e2e5e646b5e501d41617d Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期三, 10 七月 2019 17:13:49 +0800
Subject: [PATCH] 冲突文件
---
fanli/src/main/java/com/yeshi/fanli/util/factory/msg/UserMsgVOFactory.java | 97 ++++++++++++++++++++++++++++++++++++------------
1 files changed, 72 insertions(+), 25 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 05e5e78..4e80078 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
@@ -1,11 +1,13 @@
package com.yeshi.fanli.util.factory.msg;
+import java.math.BigDecimal;
import java.util.ArrayList;
import java.util.Calendar;
import java.util.List;
import com.google.gson.Gson;
import com.yeshi.fanli.dto.msg.MsgOtherCouponContentDTO;
+import com.yeshi.fanli.dto.msg.MsgOtherTaoLiJinContentDTO;
import com.yeshi.fanli.entity.bus.msg.MsgAccountDetail;
import com.yeshi.fanli.entity.bus.msg.MsgInviteDetail;
import com.yeshi.fanli.entity.bus.msg.MsgMoneyDetail;
@@ -17,7 +19,6 @@
import com.yeshi.fanli.entity.bus.user.BindingAccount;
import com.yeshi.fanli.entity.bus.user.Extract;
import com.yeshi.fanli.log.LogHelper;
-import com.yeshi.fanli.util.MoneyBigDecimalUtil;
import com.yeshi.fanli.util.StringUtil;
import com.yeshi.fanli.util.TimeUtil;
import com.yeshi.fanli.util.account.UserUtil;
@@ -30,6 +31,13 @@
private final static String COLOR_TITLE = "#888888";
private final static String COLOR_CONTENT = "#000000";
private final static String COLOR_HIGHLIGHT_CONTENT = "#E5005C";
+
+ private static BigDecimal filterMoney(BigDecimal money) {
+ if (money == null)
+ return null;
+ else
+ return money.setScale(2);
+ }
/**
* 璁㈠崟娑堟伅
@@ -50,7 +58,8 @@
items.add(new CommonMsgItemVO(new ClientTextStyleVO("璁㈠崟鍙�", COLOR_TITLE), contentList));
contentList = new ArrayList<>();
- contentList.add(new ClientTextStyleVO(TimeUtil.getGernalTime(msg.getHappendDate().getTime(),"yyyy.MM.dd HH:mm"), COLOR_CONTENT));
+ contentList.add(new ClientTextStyleVO(
+ TimeUtil.getGernalTime(msg.getHappendDate().getTime(), "yyyy.MM.dd HH:mm"), COLOR_CONTENT));
items.add(new CommonMsgItemVO(new ClientTextStyleVO("鎻愪氦鏃堕棿", COLOR_TITLE), contentList));
contentList = new ArrayList<>();
@@ -58,7 +67,8 @@
items.add(new CommonMsgItemVO(new ClientTextStyleVO("鎵惧洖鐘舵��", COLOR_TITLE), contentList));
contentList = new ArrayList<>();
- contentList.add(new ClientTextStyleVO(msg.getState() == 1 ? "楼" + msg.getPayMoney() : "鏃�", COLOR_HIGHLIGHT_CONTENT));
+ contentList.add(new ClientTextStyleVO(msg.getState() == 1 ? "楼" +filterMoney( msg.getPayMoney()) : "鏃�",
+ COLOR_HIGHLIGHT_CONTENT));
items.add(new CommonMsgItemVO(new ClientTextStyleVO("鎵惧洖閲戦", COLOR_TITLE), contentList));
} else {
@@ -88,12 +98,12 @@
items.add(new CommonMsgItemVO(new ClientTextStyleVO("璁㈠崟鐘舵��", COLOR_TITLE), contentList));
contentList = new ArrayList<>();
- contentList.add(new ClientTextStyleVO("楼" + MoneyBigDecimalUtil.getWithNoZera(msg.getPayMoney()),
+ 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("楼" + MoneyBigDecimalUtil.getWithNoZera(msg.getHongBaoMoney()),
+ contentList.add(new ClientTextStyleVO("楼" + filterMoney(msg.getHongBaoMoney()),
COLOR_HIGHLIGHT_CONTENT));
if (msg.getType() == MsgTypeOrderTypeEnum.fanli)
@@ -136,7 +146,7 @@
items.add(new CommonMsgItemVO(new ClientTextStyleVO("鎻愮幇璐﹀彿", COLOR_TITLE), contentList));
contentList = new ArrayList<>();
- contentList.add(new ClientTextStyleVO("楼" + MoneyBigDecimalUtil.getWithNoZera(msg.getExtract().getMoney()),
+ contentList.add(new ClientTextStyleVO("楼" +filterMoney(msg.getExtract().getMoney()),
COLOR_HIGHLIGHT_CONTENT));
items.add(new CommonMsgItemVO(new ClientTextStyleVO("鎻愮幇閲戦", COLOR_TITLE), contentList));
@@ -191,7 +201,7 @@
items.add(new CommonMsgItemVO(new ClientTextStyleVO("鎻愮幇璐﹀彿", COLOR_CONTENT), contentList));
contentList = new ArrayList<>();
- contentList.add(new ClientTextStyleVO("楼" + MoneyBigDecimalUtil.getWithNoZera(msg.getMoney()),
+ contentList.add(new ClientTextStyleVO("楼" + filterMoney(msg.getMoney()),
COLOR_HIGHLIGHT_CONTENT));
items.add(new CommonMsgItemVO(new ClientTextStyleVO("鎻愮幇閲戦", COLOR_TITLE), contentList));
@@ -222,12 +232,12 @@
items.add(new CommonMsgItemVO(new ClientTextStyleVO("鍟嗗搧鏁伴噺", COLOR_TITLE), contentList));
contentList = new ArrayList<>();
- contentList.add(new ClientTextStyleVO("楼" + MoneyBigDecimalUtil.getWithNoZera(msg.getMoney()) + "",
+ 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("楼" + MoneyBigDecimalUtil.getWithNoZera(msg.getBalance()) + "",
+ contentList.add(new ClientTextStyleVO("楼" + filterMoney(msg.getBalance()) + "",
COLOR_CONTENT));
items.add(new CommonMsgItemVO(new ClientTextStyleVO("璐﹀彿浣欓", COLOR_TITLE), contentList));
@@ -253,12 +263,12 @@
items.add(new CommonMsgItemVO(new ClientTextStyleVO("濂栭噾鍟嗗搧", COLOR_TITLE), contentList));
contentList = new ArrayList<>();
- contentList.add(new ClientTextStyleVO("楼" + MoneyBigDecimalUtil.getWithNoZera(msg.getMoney()) + "",
+ 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("楼" + MoneyBigDecimalUtil.getWithNoZera(msg.getBalance()) + "",
+ contentList.add(new ClientTextStyleVO("楼" + filterMoney(msg.getBalance()) + "",
COLOR_CONTENT));
items.add(new CommonMsgItemVO(new ClientTextStyleVO("璐﹀彿浣欓", COLOR_TITLE), contentList));
@@ -290,12 +300,12 @@
items.add(new CommonMsgItemVO(new ClientTextStyleVO("鎵ｉ櫎璇存槑", COLOR_TITLE), contentList));
contentList = new ArrayList<>();
- contentList.add(new ClientTextStyleVO("楼" + MoneyBigDecimalUtil.getWithNoZera(msg.getMoney()) + "",
+ 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("楼" + MoneyBigDecimalUtil.getWithNoZera(msg.getBalance()) + "",
+ contentList.add(new ClientTextStyleVO("楼" + filterMoney(msg.getBalance()) + "",
COLOR_CONTENT));
items.add(new CommonMsgItemVO(new ClientTextStyleVO("璐﹀彿浣欓", COLOR_TITLE), contentList));
@@ -315,12 +325,12 @@
items.add(new CommonMsgItemVO(new ClientTextStyleVO("鎵ｉ櫎璇存槑", COLOR_TITLE), contentList));
contentList = new ArrayList<>();
- contentList.add(new ClientTextStyleVO("楼" + MoneyBigDecimalUtil.getWithNoZera(msg.getMoney()) + "",
+ 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("楼" + MoneyBigDecimalUtil.getWithNoZera(msg.getBalance()) + "",
+ contentList.add(new ClientTextStyleVO("楼" + filterMoney(msg.getBalance()) + "",
COLOR_CONTENT));
items.add(new CommonMsgItemVO(new ClientTextStyleVO("璐﹀彿浣欓", COLOR_TITLE), contentList));
@@ -341,12 +351,12 @@
items.add(new CommonMsgItemVO(new ClientTextStyleVO("鎵ｉ櫎璇存槑", COLOR_TITLE), contentList));
contentList = new ArrayList<>();
- contentList.add(new ClientTextStyleVO("楼" + MoneyBigDecimalUtil.getWithNoZera(msg.getMoney()) + "",
+ 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("楼" + MoneyBigDecimalUtil.getWithNoZera(msg.getBalance()) + "",
+ contentList.add(new ClientTextStyleVO("楼" + filterMoney(msg.getBalance()) + "",
COLOR_CONTENT));
items.add(new CommonMsgItemVO(new ClientTextStyleVO("璐﹀彿浣欓", COLOR_TITLE), contentList));
@@ -363,12 +373,12 @@
items.add(new CommonMsgItemVO(new ClientTextStyleVO("濂栧姳璁㈠崟", COLOR_TITLE), contentList));
contentList = new ArrayList<>();
- contentList.add(new ClientTextStyleVO("楼" + MoneyBigDecimalUtil.getWithNoZera(msg.getMoney()) + "",
+ 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("楼" + MoneyBigDecimalUtil.getWithNoZera(msg.getBalance()) + "",
+ contentList.add(new ClientTextStyleVO("楼" + filterMoney(msg.getBalance()) + "",
COLOR_CONTENT));
items.add(new CommonMsgItemVO(new ClientTextStyleVO("璐﹀彿浣欓", COLOR_TITLE), contentList));
@@ -468,6 +478,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) {
@@ -477,7 +490,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));
@@ -490,21 +505,21 @@
if (dto.getFanLiMoney() != null) {
contentList = new ArrayList<>();
- contentList.add(new ClientTextStyleVO("楼" + MoneyBigDecimalUtil.getWithNoZera(dto.getFanLiMoney()),
+ 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("楼" + MoneyBigDecimalUtil.getWithNoZera(dto.getOrderFanLiMoney()),
+ 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("楼" + MoneyBigDecimalUtil.getWithNoZera(dto.getRewardMoney()),
+ contentList.add(new ClientTextStyleVO("楼" + filterMoney(dto.getRewardMoney()),
COLOR_HIGHLIGHT_CONTENT));
items.add(new CommonMsgItemVO(new ClientTextStyleVO("濂栧姳閲�", COLOR_TITLE), contentList));
}
@@ -538,10 +553,42 @@
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));
+
+ 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));
+ }
+
+ if (dto.getMoney() != null) {
+ contentList = new ArrayList<>();
+ contentList.add(new ClientTextStyleVO("楼" + filterMoney(dto.getMoney().setScale(2)),
+ 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_other_coupon.png", 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