From 4c68642aad8889ff599af52d33453c483f13092a Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期一, 24 六月 2019 11:33:57 +0800
Subject: [PATCH] Merge branch 'master-new' into div
---
fanli/src/main/java/com/yeshi/fanli/controller/client/v1/UserInfoController.java | 30 +++++++++++++++++++-----------
1 files changed, 19 insertions(+), 11 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/UserInfoController.java b/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/UserInfoController.java
index f076565..41fa115 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/UserInfoController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/UserInfoController.java
@@ -1,11 +1,6 @@
package com.yeshi.fanli.controller.client.v1;
-import java.awt.image.BufferedImage;
-import java.io.File;
-import java.io.FileOutputStream;
import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
import java.io.PrintWriter;
import java.io.UnsupportedEncodingException;
import java.lang.reflect.InvocationTargetException;
@@ -21,7 +16,6 @@
import java.util.UUID;
import javax.annotation.Resource;
-import javax.imageio.ImageIO;
import javax.servlet.http.HttpServletRequest;
import org.apache.commons.beanutils.PropertyUtils;
@@ -106,7 +100,6 @@
import com.yeshi.fanli.service.inter.user.UserShareGoodsRecordService;
import com.yeshi.fanli.util.AESUtil;
import com.yeshi.fanli.util.Constant;
-import com.yeshi.fanli.util.FileUtil;
import com.yeshi.fanli.util.GsonUtil;
import com.yeshi.fanli.util.HongBaoUtil;
import com.yeshi.fanli.util.RedisManager;
@@ -126,8 +119,6 @@
import com.yeshi.fanli.vo.user.UserInfoExtraVO;
import com.yeshi.fanli.vo.user.UserSettingsVO;
-import net.coobird.thumbnailator.Thumbnails;
-import net.coobird.thumbnailator.Thumbnails.Builder;
import net.sf.json.JSONArray;
import net.sf.json.JSONObject;
@@ -587,7 +578,9 @@
if (mySettings.getNoInvitationBonus() == null) {
mySettings.setNoInvitationBonus(0);
}
-
+ if (mySettings.getOpenSpreadHongBao() == null) {
+ mySettings.setOpenSpreadHongBao(0);
+ }
data.put("moduleState", mySettings);
int welfareCenterNews = 0;
@@ -624,7 +617,7 @@
uuser.setLastLoginIp(remotIP);
uuser.setLastLoginTime(java.lang.System.currentTimeMillis());
userInfoService.updateLoginInfo(uuser);
- // 鏇存柊鐢ㄦ埛闄勫姞淇℃伅锛岃�佺敤鎴蜂笉瀛樺湪鐨勯渶瑕佹坊鍔�
+ // 鐢ㄦ埛绛夌骇鏇存柊
try {
userInfoExtraService.updateUserRankByUid(uuser.getId());
} catch (UserInfoExtraException e) {
@@ -1346,6 +1339,18 @@
// count>0 鏈夋秷鎭�
int count = accountMessageService.getCanOpenCount(uid);
out.print(JsonUtil.loadTrueResult(count));
+
+ ThreadUtil.run(new Runnable() {
+ @Override
+ public void run() {
+ // 鐢ㄦ埛绛夌骇鏇存柊
+ try {
+ userInfoExtraService.updateUserRankByUid(uid);
+ } catch (Exception e) {
+ LogHelper.errorDetailInfo(e);
+ }
+ }
+ });
}
@RequestMapping("collectionGoods")
@@ -2085,6 +2090,9 @@
if (mySettings.getNoInvitationBonus() == null) {
mySettings.setNoInvitationBonus(0);
}
+ if (mySettings.getOpenSpreadHongBao() == null) {
+ mySettings.setOpenSpreadHongBao(0);
+ }
data.put("moduleState", mySettings);
int welfareCenterNews = 0;
--
Gitblit v1.8.0