From 31a566a0f1e2d69662dfcbce8a1418c3cbe42ad3 Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期四, 23 五月 2019 15:13:34 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 fanli/src/main/java/com/yeshi/fanli/util/factory/msg/UserMsgVOFactory.java |   53 +++++++++++++++++++++++++++++++----------------------
 1 files changed, 31 insertions(+), 22 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..9fb13a4 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,5 +1,6 @@
 package com.yeshi.fanli.util.factory.msg;
 
+import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.Calendar;
 import java.util.List;
@@ -17,7 +18,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 +30,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 +57,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 +66,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 +97,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 +145,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 +200,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 +231,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 +262,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 +299,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 +324,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 +350,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 +372,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));
 
@@ -490,21 +499,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));
 			}

--
Gitblit v1.8.0