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 | 20 ++++++++++++++------
1 files changed, 14 insertions(+), 6 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 5a037d7..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
@@ -108,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;
@@ -577,7 +578,9 @@
if (mySettings.getNoInvitationBonus() == null) {
mySettings.setNoInvitationBonus(0);
}
-
+ if (mySettings.getOpenSpreadHongBao() == null) {
+ mySettings.setOpenSpreadHongBao(0);
+ }
data.put("moduleState", mySettings);
int welfareCenterNews = 0;
@@ -746,7 +749,8 @@
data.put("error", "0");
data.put("maxError", 1);
String minMoney = configService.get(EXTRACT_MIN_MONEY); // 鍗曠瑪鎻愮幇鐨勬渶灏忛噾棰�
- String maxMoney = configService.get("extract_money_day"); // 姣忔棩鏈�澶ф彁鐜伴噾棰�
+ 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;
@@ -755,15 +759,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)));
@@ -1070,6 +1074,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) {
@@ -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