From ddf5db7d31af51fcf697eac0cee7dd46ff73bcc1 Mon Sep 17 00:00:00 2001
From: admin <2780501319@qq.com>
Date: 星期二, 18 二月 2020 12:50:49 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/controller/client/v1/UserInfoController.java | 66 +++++++++++++++++----------------
1 files changed, 34 insertions(+), 32 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 c9e966a..cb7540b 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
@@ -64,6 +64,7 @@
import com.yeshi.fanli.entity.money.UserMoneyDetail;
import com.yeshi.fanli.entity.order.HongBaoOrder;
import com.yeshi.fanli.entity.system.BusinessSystem;
+import com.yeshi.fanli.entity.system.ConfigKeyEnum;
import com.yeshi.fanli.entity.taobao.TaoBaoGoodsBrief;
import com.yeshi.fanli.entity.taobao.TaoBaoGoodsBriefExtra;
import com.yeshi.fanli.exception.goods.CollectionGoodsException;
@@ -108,8 +109,10 @@
import com.yeshi.fanli.service.inter.user.invite.ThreeSaleExtraInfoSerivce;
import com.yeshi.fanli.service.inter.user.invite.ThreeSaleSerivce;
import com.yeshi.fanli.service.inter.user.vip.UserVIPInfoService;
+import com.yeshi.fanli.service.inter.user.vip.UserVipConfigService;
import com.yeshi.fanli.util.AESUtil;
import com.yeshi.fanli.util.Constant;
+import com.yeshi.fanli.util.FilePathEnum;
import com.yeshi.fanli.util.GsonUtil;
import com.yeshi.fanli.util.HongBaoUtil;
import com.yeshi.fanli.util.RedisManager;
@@ -241,11 +244,13 @@
private UserVIPInfoService userVIPInfoService;
@Resource
+ private UserVipConfigService userVipConfigService;
+
+ @Resource
private RedPackForbidService redPackForbidService;
- private static final String PASSWORD_MAX_ERROR = "password_max_error";
- private static final String EXTRACT_MIN_MONEY = "extract_min_money";
- private static final String EXTRACT_MAX_MONEY = "extract_max_money";
+ private static final String EXTRACT_MIN_MONEY = ConfigKeyEnum.extractMoneyMin.getKey();
+ private static final String EXTRACT_MAX_MONEY = ConfigKeyEnum.extractMoneyMAX.getKey();
/**
* 鑾峰彇鐢ㄦ埛淇℃伅
@@ -359,7 +364,7 @@
form.setPortrait(weiXinUser.getHeadimgurl());
String wxHeadImg = COSManager.getInstance()
.uploadFile(HttpUtil.getAsInputStream(weiXinUser.getHeadimgurl()),
- Constant.WXHEADURL + UUID.randomUUID().toString())
+ FilePathEnum.userPortrait.getPath() + UUID.randomUUID().toString())
.getUrl();
form.setWxPic(wxHeadImg);
form.setNickName(weiXinUser.getNickname());
@@ -430,7 +435,7 @@
form.setWxName(xinUser.getNickname());
String wxHeadImg = COSManager.getInstance()
.uploadFile(HttpUtil.getAsInputStream(xinUser.getHeadimgurl()),
- Constant.WXHEADURL + UUID.randomUUID().toString())
+ FilePathEnum.userPortrait + UUID.randomUUID().toString())
.getUrl();
form.setWxPic(wxHeadImg);
} else if (formLoginType == Constant.TAOBAO) {
@@ -592,7 +597,7 @@
data.put("inviteList", String.format("http://%s/%s/client/share/friends_new_online.html",
Constant.systemCommonConfig.getProjectHost(), Constant.systemCommonConfig.getProjectName()));
else
- data.put("inviteList", configService.get("team_list"));
+ data.put("inviteList", configService.get(ConfigKeyEnum.teamList.getKey()));
// 鐣岄潰鐘舵��
UserSettingsVO mySettings = null;
@@ -697,7 +702,7 @@
find.setWxUnionId(weiXinUser.getUnionid());
String wxHeadImg = COSManager.getInstance()
.uploadFile(HttpUtil.getAsInputStream(weiXinUser.getHeadimgurl()),
- Constant.WXHEADURL + UUID.randomUUID().toString())
+ FilePathEnum.userPortrait.getPath() + UUID.randomUUID().toString())
.getUrl();
find.setWxPic(wxHeadImg);
} else { // 缁戝畾娣樺疂
@@ -789,8 +794,8 @@
data.put("maxError", 1);
String minMoney = configService.get(EXTRACT_MIN_MONEY); // 鍗曠瑪鎻愮幇鐨勬渶灏忛噾棰�
String maxMoney = configService.get(EXTRACT_MAX_MONEY); // 鍗曠瑪鎻愮幇鐨勬渶灏忛噾棰�
- String maxDayMoney = configService.get("extract_money_day"); // 姣忔棩鏈�澶ф彁鐜伴噾棰�
- int maxDayCount = Integer.parseInt(configService.get("extract_count_day"));
+ String maxDayMoney = configService.get(ConfigKeyEnum.extractMoneyDay.getKey()); // 姣忔棩鏈�澶ф彁鐜伴噾棰�
+ int maxDayCount = Integer.parseInt(configService.get(ConfigKeyEnum.extractDayCount.getKey()));
ExtractRecord extractRecord = extractRecordService.getExtractRecordByUid(uid);
boolean canExtract = true;
String errorMsg = "";
@@ -851,8 +856,8 @@
}
String minMoney = configService.get(EXTRACT_MIN_MONEY); // 鍗曠瑪鎻愮幇鐨勬渶灏忛噾棰�
- String maxDayMoney = configService.get("extract_money_day"); // 姣忔棩鏈�澶ф彁鐜伴噾棰�
- int maxDayCount = Integer.parseInt(configService.get("extract_count_day"));
+ String maxDayMoney = configService.get(ConfigKeyEnum.extractMoneyDay.getKey()); // 姣忔棩鏈�澶ф彁鐜伴噾棰�
+ int maxDayCount = Integer.parseInt(configService.get(ConfigKeyEnum.extractDayCount.getKey()));
ExtractRecord extractRecord = extractRecordService.getExtractRecordByUid(uid);
boolean canExtract = true;
String errorMsg = "";
@@ -1134,11 +1139,14 @@
return;
}
- // 鍒ゆ柇鎵嬫満楠岃瘉鐮佺殑姝ｇ‘鎬�
- String oldCode = redisManager.getSMSVCode(user.getPhone(), SMSHistory.TYPE_LOGIN);
- if (StringUtil.isNullOrEmpty(oldCode) || !oldCode.equalsIgnoreCase(vcode)) {
- out.print(JsonUtil.loadFalseResult(90001, "楠岃瘉鐮侀敊璇�"));
- return;
+
+ if (!Constant.IS_TEST) {
+ // 鍒ゆ柇鎵嬫満楠岃瘉鐮佺殑姝ｇ‘鎬�
+ String oldCode = redisManager.getSMSVCode(user.getPhone(), SMSHistory.TYPE_LOGIN);
+ if (StringUtil.isNullOrEmpty(oldCode) || !oldCode.equalsIgnoreCase(vcode)) {
+ out.print(JsonUtil.loadFalseResult(90001, "楠岃瘉鐮侀敊璇�"));
+ return;
+ }
}
BusinessSystem system = businessSystemService.getBusinessSystemCache(acceptData.getPlatform(),
@@ -1209,7 +1217,7 @@
}
long[] targetUids = new long[] { 3L, 4L };
- Config config = configService.getConfig("extract_code_email_from");
+ Config config = configService.getConfig(ConfigKeyEnum.extractCodeEmailFrom.getKey());
String[] sts = config.getValue().split(",");
String account = sts[0];
String pwd = sts[1];
@@ -1697,7 +1705,7 @@
bossData.put("inviteTime", "閭�璇锋椂闂�: " + sdf.format(inviteTime));
}
- String helpLink = configService.get("team_help_url");
+ String helpLink = configService.get(ConfigKeyEnum.teamHelpUrl.getKey());
if (helpLink == null) {
helpLink = "";
}
@@ -1708,7 +1716,7 @@
hasCode = true; // 宸叉湁閭�璇风爜
} else {
// 閭�璇锋縺娲婚摼鎺�
- resultData.put("activationlink", configService.get("invite_activation_url"));
+ resultData.put("activationlink", configService.get(ConfigKeyEnum.inviteActivationUrl.getKey()));
}
resultData.put("hasCode", hasCode);
@@ -1770,7 +1778,7 @@
bossData.put("inviteTime", "閭�璇锋椂闂�: " + sdf.format(inviteTime));
}
- String helpLink = configService.get("team_help_url");
+ String helpLink = configService.get(ConfigKeyEnum.teamHelpUrl.getKey());
if (helpLink == null) {
helpLink = "";
}
@@ -1781,7 +1789,7 @@
hasCode = true; // 宸叉湁閭�璇风爜
} else {
// 閭�璇锋縺娲婚摼鎺�
- resultData.put("activationlink", configService.get("invite_activation_url"));
+ resultData.put("activationlink", configService.get(ConfigKeyEnum.inviteActivationUrl.getKey()));
}
resultData.put("hasCode", hasCode);
@@ -1829,7 +1837,7 @@
JSONObject resultData = new JSONObject();
- String helpLink = configService.get("team_help_url");
+ String helpLink = configService.get(ConfigKeyEnum.teamHelpUrl.getKey());
if (helpLink == null) {
helpLink = "";
}
@@ -1846,7 +1854,7 @@
hasCode = true; // 宸叉湁閭�璇风爜
} else {
// 閭�璇锋縺娲婚摼鎺�
- resultData.put("activationlink", configService.get("invite_activation_url"));
+ resultData.put("activationlink", configService.get(ConfigKeyEnum.inviteActivationUrl.getKey()));
}
resultData.put("hasCode", hasCode);
@@ -2033,11 +2041,11 @@
if (inviteCode == null || inviteCode.trim().length() == 0) {
// 鏃犻個璇风爜
inviteData.put("content", "閭�璇锋縺娲�");
- inviteData.put("link", configService.get("invite_activation_url"));
+ inviteData.put("link", configService.get(ConfigKeyEnum.inviteActivationUrl.getKey()));
} else {
// 宸叉湁閭�璇风爜
inviteData.put("content", "閭�璇风爜");
- inviteData.put("link", configService.get("invite_activation_success_url"));
+ inviteData.put("link", configService.get(ConfigKeyEnum.inviteActivationSuccessUrl.getKey()));
}
JSONObject data = new JSONObject();
@@ -2187,7 +2195,7 @@
else
data.put("invitCodeUpdated", false);
data.put("welfareCenterNews", welfareCenterNews);// 绂忓埄涓績娑堟伅
- data.put("vipLink", configService.get("vip_link"));// 瓒呯骇浼氬憳鍗囩骇閾炬帴
+ data.put("vipLink", userVipConfigService.getValueByKey("vip_link"));// 瓒呯骇浼氬憳鍗囩骇閾炬帴
// 2.0.1涔嬪悗缁戝畾鎵嬫満鍙�
if (VersionUtil.greaterThan_2_0_1(acceptData.getPlatform(), acceptData.getVersion())) {
@@ -2379,12 +2387,6 @@
if (!StringUtil.isNullOrEmpty(inviteCode)) {// 閭�璇风爜涓嶄负绌�
inviteCode = inviteCode.trim();
if (inviteCode.length() >= 4 && inviteCode.length() <= 12) {
-
- if (!userVIPInfoService.isVIP(uid)) {
- out.print(JsonUtil.loadFalseResult(20, "鍙湁瓒呯骇浼氬憳鎵嶈兘淇敼"));
- return;
- }
-
try {
userInfoExtraService.updateInviteCodeVip(inviteCode, uid);
out.print(JsonUtil.loadTrueResult("淇濆瓨鎴愬姛"));
--
Gitblit v1.8.0