From 012232edc4dac15517c69c2af3934f901e818b7c Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期四, 26 十二月 2019 15:57:53 +0800
Subject: [PATCH] 帮助中心 + 新人红包统计
---
fanli/src/main/java/com/yeshi/fanli/controller/client/v1/UserInfoController.java | 23 +++++++++--------------
1 files changed, 9 insertions(+), 14 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 3122882..d205071 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,7 +2127,7 @@
}
data.put("moduleState", mySettings);
- int tailor = 0;
+ boolean tailor = false;
int welfareCenterNews = 0;
String invitCode = null;
UserInfoExtra userInfoExtra = userInfoExtraService.getUserInfoExtra(uid);
@@ -2137,10 +2137,9 @@
}
// vip閭�璇风爜浼樺厛
if (!StringUtil.isNullOrEmpty(userInfoExtra.getInviteCodeVip())) {
- tailor = 1;
invitCode = userInfoExtra.getInviteCodeVip();
} else if (!StringUtil.isNullOrEmpty(userInfoExtra.getInviteCode())) {
- tailor = 2;
+ tailor = true;
invitCode = userInfoExtra.getInviteCode();
}
@@ -2163,8 +2162,12 @@
userInfo.setWeiXin(userInfoExtra.getWeiXin());
}
- data.put("erCode", userInfoExtra.getErCode());
+ // 浜岀淮鐮�
+ userInfo.setErCode(userInfoExtra.getErCode());
}
+ // 鏄剧ず閭�璇风爜鐗瑰埗鍏ュ彛
+ data.put("tailor", tailor);
+
// 1.6.5 涔嬪悗杩斿洖 寰俊鍙锋彁绀�
if (VersionUtil.greaterThan_1_6_5(acceptData.getPlatform(), acceptData.getVersion()))
userInfo.setWeiXinTip("娣诲姞寰俊鍙峰悗锛屼綘鐨勯個璇蜂汉鍜岀洿鎺ョ矇涓濆彲浠ラ�氳繃寰俊涓庝綘寤虹珛鑱旂郴銆�");
@@ -2197,6 +2200,7 @@
data.put("redPackLock", verifyForbid);
}
+
if (!StringUtil.isNullOrEmpty(invitCode)) {
// 2.0.6 杩斿洖閭�璇蜂汉
if (VersionUtil.greaterThan_2_0_6(acceptData.getPlatform(), acceptData.getVersion())) {
@@ -2206,15 +2210,6 @@
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);
- }
}
}
@@ -2331,7 +2326,7 @@
*/
@RequestMapping(value = "saveInfo")
public void saveInfo(AcceptData acceptData, String nickName, String weiXin, Integer sex, Long uid,
- String inviteCode, MultipartFile qrCodeFile, PrintWriter out) {
+ String inviteCode, MultipartFile qrCodeFile, HttpServletRequest request, PrintWriter out) {
try {
if (uid == null) {
out.print(JsonUtil.loadFalseResult("鐢ㄦ埛鏈櫥褰�"));
--
Gitblit v1.8.0