From 4714dbbf7ead9e24f18a295890bdf5e75da991da Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 12 三月 2019 11:42:50 +0800
Subject: [PATCH] 取消 更新普通订单

---
 fanli/src/main/java/com/yeshi/fanli/controller/client/UserInfoController.java |   13 ++++++++++++-
 1 files changed, 12 insertions(+), 1 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 7b55fae..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
@@ -53,6 +53,7 @@
 import com.yeshi.fanli.entity.bus.user.ThreeSaleExtraInfo;
 import com.yeshi.fanli.entity.bus.user.UserActiveLog;
 import com.yeshi.fanli.entity.bus.user.UserInfo;
+import com.yeshi.fanli.entity.bus.user.UserInfoExtra;
 import com.yeshi.fanli.entity.bus.user.WeiXinUser;
 import com.yeshi.fanli.entity.common.AdminUser;
 import com.yeshi.fanli.entity.common.Config;
@@ -591,8 +592,18 @@
 		}
 
 		data.put("moduleState", mySettings);
-
+		
+		int welfareCenterNews = 0;
+		UserInfoExtra userInfoExtra = userInfoExtraService.getUserInfoExtra(user.getId());
+		if (userInfoExtra != null && userInfoExtra.getCouponNews() != null) {
+			welfareCenterNews = userInfoExtra.getCouponNews();
+		}
+		data.put("welfareCenterNews", welfareCenterNews);
+		
+		
+		
 		out.print(JsonUtil.loadTrueResult(data));
+		
 		final UserInfo uuser = user;
 		ThreadUtil.run(new Runnable() {
 			public void run() {

--
Gitblit v1.8.0