From a3ead770c30b310b9b1b7e3786d5d847da540e55 Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期三, 25 十二月 2019 12:21:20 +0800
Subject: [PATCH] 2.0.6
---
fanli/src/main/java/com/yeshi/fanli/controller/client/v1/UserInfoController.java | 37 ++++++++++++++++++++++++++++++++++++-
1 files changed, 36 insertions(+), 1 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 7d13a92..59b5b4e 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
@@ -2127,6 +2127,7 @@
}
data.put("moduleState", mySettings);
+ int tailor = 0;
int welfareCenterNews = 0;
String invitCode = null;
UserInfoExtra userInfoExtra = userInfoExtraService.getUserInfoExtra(uid);
@@ -2136,8 +2137,10 @@
}
// vip閭�璇风爜浼樺厛
if (!StringUtil.isNullOrEmpty(userInfoExtra.getInviteCodeVip())) {
+ tailor = 1;
invitCode = userInfoExtra.getInviteCodeVip();
} else if (!StringUtil.isNullOrEmpty(userInfoExtra.getInviteCode())) {
+ tailor = 2;
invitCode = userInfoExtra.getInviteCode();
}
@@ -2159,6 +2162,8 @@
if (!StringUtil.isNullOrEmpty(userInfoExtra.getWeiXin()))
userInfo.setWeiXin(userInfoExtra.getWeiXin());
}
+
+ data.put("erCode", userInfoExtra.getErCode());
}
// 1.6.5 涔嬪悗杩斿洖 寰俊鍙锋彁绀�
if (VersionUtil.greaterThan_1_6_5(acceptData.getPlatform(), acceptData.getVersion()))
@@ -2192,6 +2197,28 @@
data.put("redPackLock", verifyForbid);
}
+ if (!StringUtil.isNullOrEmpty(invitCode)) {
+ // 2.0.6 杩斿洖閭�璇蜂汉
+ if (VersionUtil.greaterThan_2_0_6(acceptData.getPlatform(), acceptData.getVersion())) {
+ String bossName = "";
+ ThreeSale threeSale = threeSaleSerivce.getMyBoss(uid);
+ if (threeSale != null && threeSale.getBoss() != null) {
+ bossName = threeSale.getBoss().getNickName();
+ }
+ data.put("bossName", bossName);
+
+ if(tailor == 2) {
+ long firstTeam = threeSaleSerivce.countFirstTeam(uid, 1);
+ if (firstTeam >= 2) {
+ data.put("tailor", true);
+ }
+ } else {
+ data.put("tailor", false);
+ }
+ }
+ }
+
+
out.print(JsonUtil.loadTrueResult(data));
final UserInfo uuser = userInfo;
@@ -2304,7 +2331,7 @@
*/
@RequestMapping(value = "saveInfo")
public void saveInfo(AcceptData acceptData, String nickName, String weiXin, Integer sex, Long uid,
- String inviteCode, PrintWriter out) {
+ String inviteCode, MultipartFile qrCodeFile, PrintWriter out) {
try {
if (uid == null) {
out.print(JsonUtil.loadFalseResult("鐢ㄦ埛鏈櫥褰�"));
@@ -2379,6 +2406,14 @@
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