From beee6afac3f7d1b7fa30f768df91cd55e6c6d2db Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期一, 24 六月 2019 11:28:18 +0800
Subject: [PATCH] 增加汽车户外，增加拼多多常量
---
fanli/src/main/java/com/yeshi/fanli/controller/client/v1/UserInfoController.java | 36 +++++++++++++++++++++---------------
1 files changed, 21 insertions(+), 15 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 e38cc6b..0de455b 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;
@@ -115,6 +108,7 @@
import com.yeshi.fanli.util.TimeUtil;
import com.yeshi.fanli.util.Utils;
import com.yeshi.fanli.util.account.UserUtil;
+import com.yeshi.fanli.util.annotation.RequestSerializableByKey;
import com.yeshi.fanli.util.email.MailSenderUtil;
import com.yeshi.fanli.util.factory.AccountDetailsFactory;
import com.yeshi.fanli.util.factory.HongBaoFactory;
@@ -125,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;
@@ -623,7 +615,7 @@
uuser.setLastLoginIp(remotIP);
uuser.setLastLoginTime(java.lang.System.currentTimeMillis());
userInfoService.updateLoginInfo(uuser);
- // 鏇存柊鐢ㄦ埛闄勫姞淇℃伅锛岃�佺敤鎴蜂笉瀛樺湪鐨勯渶瑕佹坊鍔�
+ // 鐢ㄦ埛绛夌骇鏇存柊
try {
userInfoExtraService.updateUserRankByUid(uuser.getId());
} catch (UserInfoExtraException e) {
@@ -755,7 +747,8 @@
data.put("error", "0");
data.put("maxError", 1);
String minMoney = configService.get(EXTRACT_MIN_MONEY); // 鍗曠瑪鎻愮幇鐨勬渶灏忛噾棰�
- String maxMoney = configService.get(EXTRACT_MAX_MONEY); // 鍗曠瑪鎻愮幇鐨勬渶澶ч噾棰�
+ String maxMoney = configService.get(EXTRACT_MAX_MONEY); // 鍗曠瑪鎻愮幇鐨勬渶灏忛噾棰�
+ String maxDayMoney = configService.get("extract_money_day"); // 姣忔棩鏈�澶ф彁鐜伴噾棰�
int maxDayCount = Integer.parseInt(configService.get("extract_count_day"));
ExtractRecord extractRecord = extractRecordService.getExtractRecordByUid(uid);
boolean canExtract = true;
@@ -764,15 +757,15 @@
canExtract = false;
errorMsg = String.format("姣忔棩鏈�澶氭彁鐜�%s娆�", maxDayCount + "");
} else if (extractRecord != null
- && extractRecord.getMoney().add(new BigDecimal(minMoney)).compareTo(new BigDecimal(maxMoney)) > 0) {
+ && extractRecord.getMoney().add(new BigDecimal(minMoney)).compareTo(new BigDecimal(maxDayMoney)) > 0) {
canExtract = false;
- errorMsg = String.format("姣忔棩鏈�澶氭彁鐜�%s鍏�", maxMoney);
+ errorMsg = String.format("姣忔棩鏈�澶氭彁鐜�%s鍏�", maxDayMoney);
}
data.put("canExtract", canExtract);
data.put("extractErrorMsg", errorMsg);
- data.put("minMoney", minMoney);
- data.put("maxMoney", maxMoney);
+ data.put("minMoney", minMoney);//鍗曠瑪鏈�浣�
+ data.put("maxMoney", maxMoney);//鍗曠瑪鏈�楂�
data.put("maxDayCount", maxDayCount);
data.put("bindingAccountList", gson.toJson(filterBindingAccount(bindingAccountList)));
@@ -1079,6 +1072,7 @@
* @param type
* @param out
*/
+ @RequestSerializableByKey(key="uid")
@RequestMapping(value = "extractmoneynew", method = RequestMethod.POST)
public void extractMoneyNew(AcceptData acceptData, long uid, BigDecimal money, String vcode,
HttpServletRequest request, int type, PrintWriter out) {
@@ -1343,6 +1337,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")
--
Gitblit v1.8.0