From 8b37d2f16d4aa7c7ce19829b74307ae0072b127f Mon Sep 17 00:00:00 2001
From: yujian <yujian>
Date: 星期一, 25 二月 2019 10:44:55 +0800
Subject: [PATCH] 1.5.1  奖励券、免单券

---
 fanli/src/main/java/com/yeshi/fanli/util/factory/msg/UserMsgVOFactory.java |    6 +++++-
 1 files changed, 5 insertions(+), 1 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 b7c0f84..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;
@@ -390,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