From af9720d768a775f433a01e68f8c9d995924fed44 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 20 二月 2019 12:13:35 +0800
Subject: [PATCH] 授权回调日志修改

---
 fanli/src/main/java/com/yeshi/fanli/util/factory/msg/UserMsgVOFactory.java |   98 ++++++++++++++++++++++++++----------------------
 1 files changed, 53 insertions(+), 45 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 7b4ba8d..826e6c7 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
@@ -4,6 +4,7 @@
 import java.util.Calendar;
 import java.util.List;
 
+import com.google.gson.Gson;
 import com.yeshi.fanli.entity.bus.msg.MsgAccountDetail;
 import com.yeshi.fanli.entity.bus.msg.MsgInviteDetail;
 import com.yeshi.fanli.entity.bus.msg.MsgMoneyDetail;
@@ -12,6 +13,7 @@
 import com.yeshi.fanli.entity.bus.msg.MsgOrderDetail.MsgTypeOrderTypeEnum;
 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;
@@ -37,50 +39,51 @@
 		List<CommonMsgItemVO> items = new ArrayList<>();
 
 		List<ClientTextStyleVO> contentList = new ArrayList<>();
-		contentList.add(new ClientTextStyleVO(msg.getOrderId(), "#000000"));
-		items.add(new CommonMsgItemVO(new ClientTextStyleVO("璁㈠崟鍙�", "#888888"), contentList));
+		contentList.add(new ClientTextStyleVO(msg.getOrderId(), COLOR_CONTENT));
+		items.add(new CommonMsgItemVO(new ClientTextStyleVO("璁㈠崟鍙�", COLOR_TITLE), contentList));
 
 		contentList = new ArrayList<>();
-		contentList.add(new ClientTextStyleVO("鍏�", "#000000"));
-		contentList.add(new ClientTextStyleVO(msg.getGoodsCount() + "", "#E5005C"));
-		contentList.add(new ClientTextStyleVO("浠跺晢鍝�", "#000000"));
-		items.add(new CommonMsgItemVO(new ClientTextStyleVO("鍟嗗搧鏁伴噺", "#888888"), contentList));
+		contentList.add(new ClientTextStyleVO("鍏�", COLOR_CONTENT));
+		contentList.add(new ClientTextStyleVO(msg.getGoodsCount() + "", COLOR_HIGHLIGHT_CONTENT));
+		contentList.add(new ClientTextStyleVO("浠跺晢鍝�", COLOR_CONTENT));
+		items.add(new CommonMsgItemVO(new ClientTextStyleVO("鍟嗗搧鏁伴噺", COLOR_TITLE), contentList));
 
 		contentList = new ArrayList<>();
-		contentList.add(new ClientTextStyleVO(msg.getType().getDesc(), "#000000"));
-		items.add(new CommonMsgItemVO(new ClientTextStyleVO("璁㈠崟绫诲瀷", "#888888"), contentList));
+		contentList.add(new ClientTextStyleVO(msg.getType().getDesc(), COLOR_CONTENT));
+		items.add(new CommonMsgItemVO(new ClientTextStyleVO("璁㈠崟绫诲瀷", COLOR_TITLE), contentList));
 
 		contentList = new ArrayList<>();
 		if (msg.getState() == MsgOrderDetail.STATE_FK)
-			contentList.add(new ClientTextStyleVO("宸蹭粯娆�", "#E5005C"));
+			contentList.add(new ClientTextStyleVO("宸蹭粯娆�", COLOR_HIGHLIGHT_CONTENT));
 		else if (msg.getState() == MsgOrderDetail.STATE_JS)
-			contentList.add(new ClientTextStyleVO("宸叉敹璐�", "#E5005C"));
+			contentList.add(new ClientTextStyleVO("宸叉敹璐�", COLOR_HIGHLIGHT_CONTENT));
 		else if (msg.getState() == MsgOrderDetail.STATE_SX)
-			contentList.add(new ClientTextStyleVO("鏈粯娆�/宸查��娆�", "#E5005C"));
+			contentList.add(new ClientTextStyleVO("鏈粯娆�/宸查��娆�", COLOR_HIGHLIGHT_CONTENT));
 		else if (msg.getState() == MsgOrderDetail.STATE_WQ)
-			contentList.add(new ClientTextStyleVO("宸茬淮鏉�", "#E5005C"));
+			contentList.add(new ClientTextStyleVO("宸茬淮鏉�", COLOR_HIGHLIGHT_CONTENT));
 
-		items.add(new CommonMsgItemVO(new ClientTextStyleVO("璁㈠崟鐘舵��", "#888888"), contentList));
+		items.add(new CommonMsgItemVO(new ClientTextStyleVO("璁㈠崟鐘舵��", COLOR_TITLE), contentList));
 
 		contentList = new ArrayList<>();
-		contentList.add(new ClientTextStyleVO("楼" + MoneyBigDecimalUtil.getWithNoZera(msg.getPayMoney()), "#E5005C"));
-		items.add(new CommonMsgItemVO(new ClientTextStyleVO("浠樻閲戦", "#888888"), contentList));
+		contentList.add(new ClientTextStyleVO("楼" + MoneyBigDecimalUtil.getWithNoZera(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()), "#E5005C"));
+		contentList.add(new ClientTextStyleVO("楼" + MoneyBigDecimalUtil.getWithNoZera(msg.getHongBaoMoney()),
+				COLOR_HIGHLIGHT_CONTENT));
 
 		if (msg.getType() == MsgTypeOrderTypeEnum.fanli)
-			items.add(new CommonMsgItemVO(new ClientTextStyleVO("杩斿埄閲戦", "#888888"), contentList));
+			items.add(new CommonMsgItemVO(new ClientTextStyleVO("杩斿埄閲戦", COLOR_TITLE), contentList));
 		else if (msg.getType() == MsgTypeOrderTypeEnum.share)
-			items.add(new CommonMsgItemVO(new ClientTextStyleVO("鍒嗕韩濂栭噾", "#888888"), contentList));
+			items.add(new CommonMsgItemVO(new ClientTextStyleVO("鍒嗕韩濂栭噾", COLOR_TITLE), contentList));
 		else if (msg.getType() == MsgTypeOrderTypeEnum.invite)
-			items.add(new CommonMsgItemVO(new ClientTextStyleVO("閭�璇峰閲�", "#888888"), contentList));
+			items.add(new CommonMsgItemVO(new ClientTextStyleVO("閭�璇峰閲�", COLOR_TITLE), contentList));
 
 		contentList = new ArrayList<>();
-		contentList.add(
-				new ClientTextStyleVO(StringUtil.isNullOrEmpty(msg.getBeiZhu()) ? "鏃�" : msg.getBeiZhu(), "#000000"));
-		items.add(new CommonMsgItemVO(new ClientTextStyleVO("澶囨敞", "#888888"), contentList));
+		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);
 	}
@@ -106,12 +109,12 @@
 			ba = UserUtil.filterBindingAccount(ba);
 
 			contentList.add(new ClientTextStyleVO("鏀粯瀹濓細" + ba.getName() + " " + ba.getAccount(), COLOR_CONTENT));
-			items.add(new CommonMsgItemVO(new ClientTextStyleVO("鎻愮幇璐﹀彿", COLOR_CONTENT), contentList));
+			items.add(new CommonMsgItemVO(new ClientTextStyleVO("鎻愮幇璐﹀彿", COLOR_TITLE), contentList));
 
 			contentList = new ArrayList<>();
 			contentList.add(new ClientTextStyleVO("楼" + MoneyBigDecimalUtil.getWithNoZera(msg.getExtract().getMoney()),
 					COLOR_HIGHLIGHT_CONTENT));
-			items.add(new CommonMsgItemVO(new ClientTextStyleVO("鎻愮幇閲戦", "#888888"), contentList));
+			items.add(new CommonMsgItemVO(new ClientTextStyleVO("鎻愮幇閲戦", COLOR_TITLE), contentList));
 
 			contentList = new ArrayList<>();
 			if (msg.getExtract().getState() == Extract.STATE_NOT_PROCESS
@@ -121,7 +124,7 @@
 				contentList.add(new ClientTextStyleVO("宸查�氳繃", COLOR_HIGHLIGHT_CONTENT));
 			else if (msg.getExtract().getState() == Extract.STATE_REJECT)
 				contentList.add(new ClientTextStyleVO("鎻愮幇琚嫆缁�", COLOR_HIGHLIGHT_CONTENT));
-			items.add(new CommonMsgItemVO(new ClientTextStyleVO("鎻愮幇鐘舵��", "#888888"), contentList));
+			items.add(new CommonMsgItemVO(new ClientTextStyleVO("鎻愮幇鐘舵��", COLOR_TITLE), contentList));
 
 			contentList = new ArrayList<>();
 			if (msg.getExtract().getState() == Extract.STATE_NOT_PROCESS
@@ -131,25 +134,26 @@
 				contentList.add(new ClientTextStyleVO("鏃�", COLOR_CONTENT));
 			else if (msg.getExtract().getState() == Extract.STATE_REJECT)
 				contentList.add(new ClientTextStyleVO(msg.getExtract().getReason(), COLOR_CONTENT));
-			items.add(new CommonMsgItemVO(new ClientTextStyleVO("鐘舵�佽鏄�", "#888888"), contentList));
+			items.add(new CommonMsgItemVO(new ClientTextStyleVO("鐘舵�佽鏄�", COLOR_TITLE), contentList));
 
-			contentList = new ArrayList<>();
-			contentList.add(new ClientTextStyleVO(
-					TimeUtil.getGernalTime(msg.getExtract().getExtractTime()+1000*60*60*24L, "yyyy-MM-dd HH:mm"), COLOR_CONTENT));
-			items.add(new CommonMsgItemVO(new ClientTextStyleVO("棰勮鍒拌处", "#888888"), contentList));
-
+			if (msg.getExtract().getState() != Extract.STATE_REJECT) {
+				contentList = new ArrayList<>();
+				contentList.add(new ClientTextStyleVO(TimeUtil.getGernalTime(
+						msg.getExtract().getExtractTime() + 1000 * 60 * 60 * 24L, "yyyy-MM-dd HH:mm"), COLOR_CONTENT));
+				items.add(new CommonMsgItemVO(new ClientTextStyleVO("棰勮鍒拌处", COLOR_TITLE), contentList));
+			}
 			if (msg.getExtract().getState() == Extract.STATE_PASS) {//
 				contentList = new ArrayList<>();
 				contentList.add(new ClientTextStyleVO(
 						TimeUtil.getGernalTime(msg.getExtract().getReceiveTime().getTime(), "yyyy-MM-dd HH:mm"),
 						COLOR_CONTENT));
-				items.add(new CommonMsgItemVO(new ClientTextStyleVO("瀹為檯鍒拌处", "#888888"), contentList));
+				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("澶囨敞", "#888888"), contentList));
+			items.add(new CommonMsgItemVO(new ClientTextStyleVO("澶囨敞", COLOR_TITLE), contentList));
 			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.extractValid) {
@@ -165,20 +169,20 @@
 			contentList = new ArrayList<>();
 			contentList.add(new ClientTextStyleVO("楼" + MoneyBigDecimalUtil.getWithNoZera(msg.getMoney()),
 					COLOR_HIGHLIGHT_CONTENT));
-			items.add(new CommonMsgItemVO(new ClientTextStyleVO("鎻愮幇閲戦", "#888888"), contentList));
+			items.add(new CommonMsgItemVO(new ClientTextStyleVO("鎻愮幇閲戦", COLOR_TITLE), contentList));
 
 			contentList = new ArrayList<>();
 			contentList.add(new ClientTextStyleVO("楼楠岃瘉鎴愬姛", COLOR_HIGHLIGHT_CONTENT));
-			items.add(new CommonMsgItemVO(new ClientTextStyleVO("楠岃瘉鐘舵��", "#888888"), contentList));
+			items.add(new CommonMsgItemVO(new ClientTextStyleVO("楠岃瘉鐘舵��", COLOR_TITLE), contentList));
 
 			contentList = new ArrayList<>();
 			contentList.add(new ClientTextStyleVO(msg.getStateDesc(), COLOR_CONTENT));
-			items.add(new CommonMsgItemVO(new ClientTextStyleVO("鐘舵�佽鏄�", "#888888"), contentList));
+			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("澶囨敞", "#888888"), contentList));
+			items.add(new CommonMsgItemVO(new ClientTextStyleVO("澶囨敞", COLOR_TITLE), contentList));
 
 			return new UserMsgVO("http://img.flqapp.com/resource/msg/icon_msg_extract.png", "鎻愮幇璐﹀彿楠岃瘉",
 					msg.getUpdateTime() == null ? msg.getCreateTime() : msg.getUpdateTime(), items);
@@ -231,7 +235,7 @@
 
 			contentList = new ArrayList<>();
 			contentList.add(new ClientTextStyleVO("楼" + MoneyBigDecimalUtil.getWithNoZera(msg.getBalance()) + "",
-					COLOR_HIGHLIGHT_CONTENT));
+					COLOR_CONTENT));
 			items.add(new CommonMsgItemVO(new ClientTextStyleVO("璐﹀彿浣欓", COLOR_TITLE), contentList));
 
 			contentList = new ArrayList<>();
@@ -249,7 +253,7 @@
 						date + msg.getMsgType().getDesc(),
 						msg.getUpdateTime() == null ? msg.getCreateTime() : msg.getUpdateTime(), items);
 			else
-				return new UserMsgVO("http://img.flqapp.com/resource/msg/icon_msg_invite.png.png",
+				return new UserMsgVO("http://img.flqapp.com/resource/msg/icon_msg_invite_money.png",
 						date + msg.getMsgType().getDesc(),
 						msg.getUpdateTime() == null ? msg.getCreateTime() : msg.getUpdateTime(), items);
 
@@ -301,8 +305,9 @@
 					COLOR_CONTENT));
 			items.add(new CommonMsgItemVO(new ClientTextStyleVO("澶囨敞", COLOR_TITLE), contentList));
 
-			return new UserMsgVO("http://img.flqapp.com/resource/msg/icon_msg_share_money.png", msg.getMsgType().getDesc(),
-					msg.getUpdateTime() == null ? msg.getCreateTime() : msg.getUpdateTime(), items);
+			return new UserMsgVO("http://img.flqapp.com/resource/msg/icon_msg_share_money.png",
+					msg.getMsgType().getDesc(), msg.getUpdateTime() == null ? msg.getCreateTime() : msg.getUpdateTime(),
+					items);
 		} else if (msg.getMsgType() == MsgTypeMoneyTypeEnum.inviteWeiQuan) {
 			contentList.add(new ClientTextStyleVO(msg.getOrderId(), COLOR_CONTENT));
 			items.add(new CommonMsgItemVO(new ClientTextStyleVO("閭�璇疯鍗�", COLOR_TITLE), contentList));
@@ -326,8 +331,9 @@
 					COLOR_CONTENT));
 			items.add(new CommonMsgItemVO(new ClientTextStyleVO("澶囨敞", COLOR_TITLE), contentList));
 
-			return new UserMsgVO("http://img.flqapp.com/resource/msg/icon_msg_invite.png", msg.getMsgType().getDesc(),
-					msg.getUpdateTime() == null ? msg.getCreateTime() : msg.getUpdateTime(), items);
+			return new UserMsgVO("http://img.flqapp.com/resource/msg/icon_msg_invite_money.png",
+					msg.getMsgType().getDesc(), msg.getUpdateTime() == null ? msg.getCreateTime() : msg.getUpdateTime(),
+					items);
 		}
 
 		return null;
@@ -386,9 +392,11 @@
 	 * @return
 	 */
 	public static UserMsgVO create(MsgInviteDetail msg) {
+		if (msg.getInviteUser() == null || msg.getInviteUser().getWorker() == null)
+			return null;
 		List<CommonMsgItemVO> items = new ArrayList<>();
 		List<ClientTextStyleVO> contentList = new ArrayList<>();
-
+		LogHelper.test("閭�璇锋秷鎭�:" + new Gson().toJson(msg));
 		contentList.add(new ClientTextStyleVO(msg.getInviteUser().getWorker().getNickName() + "", COLOR_CONTENT,
 				msg.getInviteUser().getWorker().getPortrait()));
 		items.add(new CommonMsgItemVO(new ClientTextStyleVO("琚個璇蜂汉", COLOR_TITLE), contentList));

--
Gitblit v1.8.0