From 85696b23af4055e2e7f53b309e0cc071fe8573b4 Mon Sep 17 00:00:00 2001
From: yujian <yujian>
Date: 星期三, 13 三月 2019 12:14:05 +0800
Subject: [PATCH] 奖金榜调整
---
fanli/src/main/java/com/yeshi/fanli/controller/client/UserInfoController.java | 16 ++++++++--------
1 files changed, 8 insertions(+), 8 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..b7d3596 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
@@ -35,9 +35,9 @@
import com.google.gson.JsonSerializationContext;
import com.google.gson.JsonSerializer;
import com.yeshi.fanli.dto.HongBaoDTO;
+import com.yeshi.fanli.dto.money.AccountDetails;
import com.yeshi.fanli.entity.AppVersionInfo;
import com.yeshi.fanli.entity.accept.AcceptData;
-import com.yeshi.fanli.entity.bus.user.AccountDetails;
import com.yeshi.fanli.entity.bus.user.AccountMessage;
import com.yeshi.fanli.entity.bus.user.BindingAccount;
import com.yeshi.fanli.entity.bus.user.Extract;
@@ -592,16 +592,16 @@
}
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));
-
+
final UserInfo uuser = user;
ThreadUtil.run(new Runnable() {
public void run() {
--
Gitblit v1.8.0