From 1faf3ab0ba6c17eee48e68e8d0077ea61f45d75d Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 12 五月 2020 20:19:36 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/controller/client/v1/UserInfoController.java | 184 ++++++++++++++++++++++-----------------------
1 files changed, 91 insertions(+), 93 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 e327dbe..3be498e 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
@@ -40,6 +40,7 @@
import com.yeshi.fanli.dto.HongBaoDTO;
import com.yeshi.fanli.dto.money.AccountDetails;
import com.yeshi.fanli.dto.order.OrderItem;
+import com.yeshi.fanli.dto.user.UserInviteLevelEnum;
import com.yeshi.fanli.dto.wx.WXAccountInfoDTO;
import com.yeshi.fanli.entity.AppVersionInfo;
import com.yeshi.fanli.entity.accept.AcceptData;
@@ -64,6 +65,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;
@@ -107,7 +109,9 @@
import com.yeshi.fanli.service.inter.user.UserShareGoodsRecordService;
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.invite.UserInviteService;
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;
@@ -240,13 +244,18 @@
@Resource
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";
+ @Resource
+ private UserInviteService userInviteService;
+
+ private static final String EXTRACT_MIN_MONEY = ConfigKeyEnum.extractMoneyMin.getKey();
+ private static final String EXTRACT_MAX_MONEY = ConfigKeyEnum.extractMoneyMAX.getKey();
/**
* 鑾峰彇鐢ㄦ埛淇℃伅
@@ -593,7 +602,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;
@@ -790,8 +799,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 = "";
@@ -852,8 +861,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 = "";
@@ -1135,11 +1144,13 @@
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(),
@@ -1210,7 +1221,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];
@@ -1668,19 +1679,17 @@
JSONObject resultData = new JSONObject();
if (type == 1) {
- resultData = threeSaleSerivce.getMyFirstTeam((page - 1) * pageSize, pageSize, uid, null);
+ resultData = threeSaleSerivce.getMyFirstTeam((page - 1) * pageSize, pageSize, uid);
} else if (type == 2) {
- resultData = threeSaleSerivce.getMySecondTeam((page - 1) * pageSize, pageSize, uid, null);
+ resultData = threeSaleSerivce.getMySecondTeam((page - 1) * pageSize, pageSize, uid);
}
// 瀹夊崜绯荤粺杩斿洖鎵�鏈夋暟鎹�
String platform = acceptData.getPlatform();
if ("android".equalsIgnoreCase(platform)) {
- long firstTeam = threeSaleSerivce.countFirstTeam(uid, 1);
- long firstTeamTotal = threeSaleSerivce.countFirstTeam(uid, null);
+ long firstTeam = threeSaleSerivce.countFirstTeam(uid);
- long secondTeam = threeSaleSerivce.countSecondTeam(uid, 1);
- long secondTeamTotal = threeSaleSerivce.countSecondTeam(uid, null);
+ long secondTeam = threeSaleSerivce.countSecondTeam(uid);
JSONObject bossData = null;
ThreeSale threeSale = threeSaleSerivce.getMyBoss(uid);
@@ -1698,7 +1707,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 = "";
}
@@ -1709,15 +1718,15 @@
hasCode = true; // 宸叉湁閭�璇风爜
} else {
// 閭�璇锋縺娲婚摼鎺�
- resultData.put("activationlink", configService.get("invite_activation_url"));
+ resultData.put("activationlink", configService.get(ConfigKeyEnum.inviteActivationUrl.getKey()));
}
resultData.put("hasCode", hasCode);
resultData.put("helpLink", helpLink);
resultData.put("firstTeam", firstTeam);
- resultData.put("firstTeamTotal", firstTeamTotal);
+ resultData.put("firstTeamTotal", firstTeam);
resultData.put("secondTeam", secondTeam);
- resultData.put("secondTeamTotal", secondTeamTotal);
+ resultData.put("secondTeamTotal", secondTeam);
resultData.put("boss", bossData);
}
out.print(JsonUtil.loadTrueResult(resultData));
@@ -1743,17 +1752,17 @@
JSONObject resultData = new JSONObject();
if (type == 1) {
- resultData = threeSaleSerivce.getMyFirstTeam((page - 1) * pageSize, pageSize, uid, 1);
+ resultData = threeSaleSerivce.getMyFirstTeam((page - 1) * pageSize, pageSize, uid);
} else if (type == 2) {
- resultData = threeSaleSerivce.getMySecondTeam((page - 1) * pageSize, pageSize, uid, 1);
+ resultData = threeSaleSerivce.getMySecondTeam((page - 1) * pageSize, pageSize, uid);
}
// 瀹夊崜绯荤粺杩斿洖鎵�鏈夋暟鎹�
String platform = acceptData.getPlatform();
if ("android".equalsIgnoreCase(platform)) {
- long firstTeam = threeSaleSerivce.countFirstTeam(uid, 1);
+ long firstTeam = threeSaleSerivce.countFirstTeam(uid);
- long secondTeam = threeSaleSerivce.countSecondTeam(uid, 1);
+ long secondTeam = threeSaleSerivce.countSecondTeam(uid);
JSONObject bossData = null;
ThreeSale threeSale = threeSaleSerivce.getMyBoss(uid);
@@ -1771,7 +1780,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 = "";
}
@@ -1782,7 +1791,7 @@
hasCode = true; // 宸叉湁閭�璇风爜
} else {
// 閭�璇锋縺娲婚摼鎺�
- resultData.put("activationlink", configService.get("invite_activation_url"));
+ resultData.put("activationlink", configService.get(ConfigKeyEnum.inviteActivationUrl.getKey()));
}
resultData.put("hasCode", hasCode);
@@ -1808,11 +1817,9 @@
@RequestMapping(value = "countMyTeam", method = RequestMethod.POST)
public void countMyTeam(AcceptData acceptData, long uid, PrintWriter out) {
try {
- long firstTeam = threeSaleSerivce.countFirstTeam(uid, 1);
- long firstTeamTotal = threeSaleSerivce.countFirstTeam(uid, null);
+ long firstTeam = threeSaleSerivce.countFirstTeam(uid);
- long secondTeam = threeSaleSerivce.countSecondTeam(uid, 1);
- long secondTeamTotal = threeSaleSerivce.countSecondTeam(uid, null);
+ long secondTeam = threeSaleSerivce.countSecondTeam(uid);
JSONObject bossData = new JSONObject();
ThreeSale threeSale = threeSaleSerivce.getMyBoss(uid);
if (threeSale != null) {
@@ -1830,15 +1837,15 @@
JSONObject resultData = new JSONObject();
- String helpLink = configService.get("team_help_url");
+ String helpLink = configService.get(ConfigKeyEnum.teamHelpUrl.getKey());
if (helpLink == null) {
helpLink = "";
}
resultData.put("helpLink", helpLink);
resultData.put("firstTeam", firstTeam);
- resultData.put("firstTeamTotal", firstTeamTotal);
+ resultData.put("firstTeamTotal", firstTeam);
resultData.put("secondTeam", secondTeam);
- resultData.put("secondTeamTotal", secondTeamTotal);
+ resultData.put("secondTeamTotal", secondTeam);
resultData.put("boss", bossData);
boolean hasCode = false;
@@ -1847,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);
@@ -1871,21 +1878,28 @@
*/
@RequestMapping(value = "setextrainfo", method = RequestMethod.POST)
public void setExtraInfo(AcceptData acceptData, long uid, long inviteId, String memoName, PrintWriter out) {
- List<ThreeSale> listThreeSale = threeSaleSerivce.listbyIdAndBossId(inviteId, uid, null);
- if (listThreeSale == null || listThreeSale.size() == 0) {
+ ThreeSale threeSale = threeSaleSerivce.selectByPrimaryKey(inviteId);
+ if (threeSale == null) {
out.print(JsonUtil.loadFalseResult("璇ヨ褰曚笉瀛樺湪"));
return;
}
- UserInfo worker = listThreeSale.get(0).getWorker();
+ UserInfo worker = threeSale.getWorker();
if (worker == null) {
out.print(JsonUtil.loadFalseResult("璇ヨ褰曚笉瀛樺湪"));
return;
}
-
+
ThreeSaleExtraInfo extraInfo = threeSaleExtraInfoSerivce.getbyBossIdAndWorkerId(uid, worker.getId());
if (extraInfo == null) {
extraInfo = new ThreeSaleExtraInfo();
+ Long bossUid = threeSale.getBoss().getId();
+ if (uid == bossUid) {
+ extraInfo.setType(1); // 鐩存帴
+ } else {
+ extraInfo.setType(2); // 闂存帴
+ }
+
extraInfo.setWorker(worker);
extraInfo.setNickname(memoName);
extraInfo.setCreateTime(new Date());
@@ -1902,41 +1916,6 @@
out.print(JsonUtil.loadTrueResult("淇濆瓨鎴愬姛"));
}
- /**
- * 鍒犻櫎闃熷憳鍏崇郴
- *
- * @param acceptData
- * @param uid
- * @param inviteId
- * 閭�璇穒d
- * @param out
- */
- @RequestMapping(value = "removethreesale", method = RequestMethod.POST)
- public void removethreesale(AcceptData acceptData, long uid, long inviteId, PrintWriter out) {
- try {
- List<ThreeSale> listThreeSale = threeSaleSerivce.listbyIdAndBossId(inviteId, uid, 1);
- if (listThreeSale == null || listThreeSale.size() == 0) {
- out.print(JsonUtil.loadFalseResult("鎿嶄綔鏁版嵁鏃犳晥"));
- return;
- }
-
- UserInfo worker = listThreeSale.get(0).getWorker();
- if (worker == null) {
- out.print(JsonUtil.loadFalseResult("鎿嶄綔鏁版嵁鏃犳晥"));
- return;
- }
-
- // 鍒犻櫎鍏崇郴
- threeSaleSerivce.deleteByPrimaryKey(inviteId);
- // 鍒犻櫎澶囨敞
- threeSaleExtraInfoSerivce.deleteByBossIdAndWorkerId(uid, worker.getId());
-
- out.print(JsonUtil.loadTrueResult("鍒犻櫎鎴愬姛"));
- } catch (Exception e) {
- out.print(JsonUtil.loadFalseResult("鍒犻櫎澶辫触"));
- e.printStackTrace();
- }
- }
/**
* 璁剧疆鐣岄潰寮�鍏崇姸鎬�
@@ -2034,11 +2013,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();
@@ -2118,6 +2097,10 @@
if (mySettings.getNoInvitationBonus() == null) {
mySettings.setNoInvitationBonus(0);
}
+
+ if (mySettings.getNoDisplayPhoneNum() == null) {
+ mySettings.setNoDisplayPhoneNum(0);
+ }
if (mySettings.getOpenSpreadHongBao() == null) {
if (userTaoLiJinDetailService.countDetail(uid) > 0) {
@@ -2143,7 +2126,7 @@
tailor = true;
invitCode = userInfoExtra.getInviteCode();
}
-
+
if (userInfoExtra.getUserRank() != null) {
String picture = userInfoExtra.getUserRank().getPicture();
String icon = userInfoExtra.getUserRank().getIcon();
@@ -2162,13 +2145,13 @@
if (!StringUtil.isNullOrEmpty(userInfoExtra.getWeiXin()))
userInfo.setWeiXin(userInfoExtra.getWeiXin());
}
-
+
// 浜岀淮鐮�
userInfo.setErCode(userInfoExtra.getErCode());
}
// 鏄剧ず閭�璇风爜鐗瑰埗鍏ュ彛
data.put("tailor", tailor);
-
+
// 1.6.5 涔嬪悗杩斿洖 寰俊鍙锋彁绀�
if (VersionUtil.greaterThan_1_6_5(acceptData.getPlatform(), acceptData.getVersion()))
userInfo.setWeiXinTip("娣诲姞寰俊鍙峰悗锛屼綘鐨勯個璇蜂汉鍜岀洿鎺ョ矇涓濆彲浠ラ�氳繃寰俊涓庝綘寤虹珛鑱旂郴銆�");
@@ -2176,7 +2159,7 @@
// 鏌ヨ鏄惁涓篤IP
if (VersionUtil.greaterThan_2_0_5(acceptData.getPlatform(), acceptData.getVersion())) {
userInfo.setVip(userVIPInfoService.isVIP(uid));
-
+
boolean verifyForbid = redPackForbidService.verifyForbid(uid);
data.put("redPackLock", verifyForbid);
}
@@ -2188,7 +2171,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())) {
@@ -2197,8 +2180,8 @@
bindPhone = bindRemindService.bindRemind(uid, BindRemind.TYPE_PHONE);
data.put("bindPhone", bindPhone);
}
-
- if (!StringUtil.isNullOrEmpty(invitCode)) {
+
+ if (!StringUtil.isNullOrEmpty(invitCode)) {
// 2.0.6 杩斿洖閭�璇蜂汉
if (VersionUtil.greaterThan_2_0_6(acceptData.getPlatform(), acceptData.getVersion())) {
String bossName = "";
@@ -2209,8 +2192,24 @@
data.put("bossName", bossName);
}
}
+
+ if (VersionUtil.greaterThan_2_0_7(acceptData.getPlatform(), acceptData.getVersion())) {
+ UserInviteLevelEnum level = null;
+ if (VersionUtil.greaterThan_2_1(acceptData.getPlatform(), acceptData.getVersion())) {
+ level = userInviteService.getUserInviteLevelNew(uid);
+ } else {
+ level = userInviteService.getUserInviteLevel(uid);
+ }
+ JSONObject inviteLevel = new JSONObject();
+ inviteLevel.put("level", level.name());
+ inviteLevel.put("link", level.getLink());
+ data.put("inviteLevel", inviteLevel);
+ }
-
+ if (VersionUtil.greaterThan_2_1_1(acceptData.getPlatform(), acceptData.getVersion())) {
+ data.put("fansCountLink", configService.get(ConfigKeyEnum.teamStatisticsLink.getKey()));
+ }
+
out.print(JsonUtil.loadTrueResult(data));
final UserInfo uuser = userInfo;
@@ -2232,7 +2231,7 @@
out.print(JsonUtil.loadFalseResult(e.getCode(), e.getMsg()));
} catch (Exception e) {
out.print(JsonUtil.loadFalseResult("鑾峰彇澶辫触"));
- e.printStackTrace();
+ LogHelper.errorDetailInfo(e);
}
}
@@ -2377,6 +2376,7 @@
}
}
+ //淇敼閭�璇风爜
if (!StringUtil.isNullOrEmpty(inviteCode)) {// 閭�璇风爜涓嶄负绌�
inviteCode = inviteCode.trim();
if (inviteCode.length() >= 4 && inviteCode.length() <= 12) {
@@ -2392,14 +2392,12 @@
return;
}
}
-
+
// 浜岀淮鐮�
if (qrCodeFile != null) {
userInfoExtraService.uploadERCode(qrCodeFile, uid);
}
-
-
-
+
out.print(JsonUtil.loadTrueResult("淇濆瓨鎴愬姛"));
} catch (UserInfoException e) {
out.print(JsonUtil.loadFalseResult(e.getMsg()));
--
Gitblit v1.8.0