From ec8a1c6f81b5747e9efce86faaba33d10df7f61d Mon Sep 17 00:00:00 2001
From: admin <2780501319@qq.com>
Date: 星期日, 01 三月 2020 16:37:26 +0800
Subject: [PATCH] 动态提示语调整
---
fanli/src/main/java/com/yeshi/fanli/controller/client/v1/UserInfoController.java | 41 +++++++++++++++++++++++++----------------
1 files changed, 25 insertions(+), 16 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 cb7540b..c7a03b0 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;
@@ -108,6 +109,7 @@
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;
@@ -242,14 +244,17 @@
@Resource
private UserVIPInfoService userVIPInfoService;
-
+
@Resource
private UserVipConfigService userVipConfigService;
-
+
@Resource
private RedPackForbidService redPackForbidService;
- private static final String EXTRACT_MIN_MONEY = ConfigKeyEnum.extractMoneyMin.getKey();
+ @Resource
+ private UserInviteService userInviteService;
+
+ private static final String EXTRACT_MIN_MONEY = ConfigKeyEnum.extractMoneyMin.getKey();
private static final String EXTRACT_MAX_MONEY = ConfigKeyEnum.extractMoneyMAX.getKey();
/**
@@ -1139,7 +1144,6 @@
return;
}
-
if (!Constant.IS_TEST) {
// 鍒ゆ柇鎵嬫満楠岃瘉鐮佺殑姝ｇ‘鎬�
String oldCode = redisManager.getSMSVCode(user.getPhone(), SMSHistory.TYPE_LOGIN);
@@ -2150,7 +2154,7 @@
tailor = true;
invitCode = userInfoExtra.getInviteCode();
}
-
+
if (userInfoExtra.getUserRank() != null) {
String picture = userInfoExtra.getUserRank().getPicture();
String icon = userInfoExtra.getUserRank().getIcon();
@@ -2169,13 +2173,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("娣诲姞寰俊鍙峰悗锛屼綘鐨勯個璇蜂汉鍜岀洿鎺ョ矇涓濆彲浠ラ�氳繃寰俊涓庝綘寤虹珛鑱旂郴銆�");
@@ -2183,7 +2187,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);
}
@@ -2204,8 +2208,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 = "";
@@ -2216,8 +2220,15 @@
data.put("bossName", bossName);
}
}
-
-
+
+ if (VersionUtil.greaterThan_2_0_7(acceptData.getPlatform(), acceptData.getVersion())) {
+ JSONObject inviteLevel = new JSONObject();
+ UserInviteLevelEnum level = userInviteService.getUserInviteLevel(uid);
+ inviteLevel.put("level", level.name());
+ inviteLevel.put("link", level.getLink());
+ data.put("inviteLevel", inviteLevel);
+ }
+
out.print(JsonUtil.loadTrueResult(data));
final UserInfo uuser = userInfo;
@@ -2399,14 +2410,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