From 0a3b073eb7e6a1c77b73e1d44fe53f040e560ab3 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 27 二月 2019 15:44:21 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
fanli/src/main/java/com/yeshi/fanli/controller/client/UserInfoController.java | 11 ++++++++++-
1 files changed, 10 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..ac96ba1 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,16 @@
}
data.put("moduleState", mySettings);
-
+
+ UserInfoExtra userInfoExtra = userInfoExtraService.getUserInfoExtra(user.getId());
+ if (userInfoExtra == null) {
+ data.put("welfareCenterNews", 0);
+ } else {
+ data.put("welfareCenterNews", userInfoExtra.getCouponNews());
+ }
+
out.print(JsonUtil.loadTrueResult(data));
+
final UserInfo uuser = user;
ThreadUtil.run(new Runnable() {
public void run() {
--
Gitblit v1.8.0