From e6cb7c27384f22b39ccee584028e23b56c30e9ee Mon Sep 17 00:00:00 2001
From: yujian <yujian>
Date: 星期四, 07 三月 2019 15:01:22 +0800
Subject: [PATCH] 券推送调用

---
 fanli/src/main/java/com/yeshi/fanli/controller/client/UserInfoController.java |   10 ++++++----
 1 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/client/UserInfoController.java b/fanli/src/main/java/com/yeshi/fanli/controller/client/UserInfoController.java
index ac96ba1..d4bf15b 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/client/UserInfoController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/client/UserInfoController.java
@@ -593,12 +593,14 @@
 
 		data.put("moduleState", mySettings);
 		
+		int welfareCenterNews = 0;
 		UserInfoExtra userInfoExtra = userInfoExtraService.getUserInfoExtra(user.getId());
-		if (userInfoExtra == null) {
-			data.put("welfareCenterNews", 0);
-		} else {
-			data.put("welfareCenterNews", userInfoExtra.getCouponNews());
+		if (userInfoExtra != null && userInfoExtra.getCouponNews() != null) {
+			welfareCenterNews = userInfoExtra.getCouponNews();
 		}
+		data.put("welfareCenterNews", welfareCenterNews);
+		
+		
 		
 		out.print(JsonUtil.loadTrueResult(data));
 		

--
Gitblit v1.8.0