From efba42a325e1cf71c1d0f7a6ac46a0141c23443a Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 12 三月 2019 16:25:11 +0800
Subject: [PATCH] 增加序列化
---
fanli/src/main/java/com/yeshi/fanli/controller/client/UserInfoController.java | 28 ++++++++++++++++++++++++----
1 files changed, 24 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 0f6d60c..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;
@@ -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;
@@ -248,6 +249,12 @@
// }
// });
if (find != null) {
+ if (find.getState() != UserInfo.STATE_NORMAL) {
+ out.print(JsonUtil.loadFalseResult(Constant.CODE_FORBIDDEN_USER,
+ Constant.FORBIDDEN_USER_REASON_DESC));
+ return;
+ }
+
// 閭�璇峰叧绯荤敓鏁�
threeSaleSerivce.effective(find);
// 閲嶆柊璁＄畻鐢ㄦ埛绛夌骇
@@ -586,19 +593,26 @@
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() {
-
+
try {
// 鑾峰彇閭�璇风爜锛氳嫢鏃犻個璇风爜涓斿瓨鍦ㄦ湁鏁堢殑闃熷憳鍏崇郴 鍒欒嚜鍔ㄧ敓鎴愰個璇风爜
userInfoExtraService.getUserInviteCode(uuser.getId());
} catch (UserInfoExtraException e) {
e.printStackTrace();
}
-
-
+
LogHelper.userInfo(GsonUtil.toJsonExpose(uuser));
uuser.setLastLoginIp(remotIP);
uuser.setLastLoginTime(java.lang.System.currentTimeMillis());
@@ -1292,6 +1306,12 @@
HttpServletRequest request, int type, PrintWriter out) {
UserInfo user = userInfoService.getUserById(uid);
if (user == null) {
+ user = userInfoService.getUserByIdWithMybatis(uid);
+ if (user != null && user.getState() != UserInfo.STATE_NORMAL) {
+ out.print(JsonUtil.loadFalseResult(Constant.CODE_FORBIDDEN_USER, Constant.FORBIDDEN_USER_REASON_DESC));
+ return;
+ }
+
out.print(JsonUtil.loadFalseResult("鐢ㄦ埛涓嶅瓨鍦�"));
return;
}
--
Gitblit v1.8.0