From 98b1a0affd69bbe63223c21fdd2c404e8bedfccb Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 20 五月 2020 17:25:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into 2.1.2
---
fanli/src/main/java/com/yeshi/fanli/controller/client/v1/UserInfoController.java | 68 +++++++++++++++++++++++++---------
1 files changed, 50 insertions(+), 18 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 ba8d17e..8535fd5 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
@@ -50,6 +50,7 @@
import com.yeshi.fanli.entity.bus.user.Extract;
import com.yeshi.fanli.entity.bus.user.ExtractRecord;
import com.yeshi.fanli.entity.bus.user.LostOrder;
+import com.yeshi.fanli.entity.bus.user.PreviewInfo.PreviewEnum;
import com.yeshi.fanli.entity.bus.user.SMSHistory;
import com.yeshi.fanli.entity.bus.user.ThreeSale;
import com.yeshi.fanli.entity.bus.user.ThreeSaleExtraInfo;
@@ -100,6 +101,7 @@
import com.yeshi.fanli.service.inter.user.AccountMessageService;
import com.yeshi.fanli.service.inter.user.BindRemindService;
import com.yeshi.fanli.service.inter.user.MaskKeyService;
+import com.yeshi.fanli.service.inter.user.PreviewInfoService;
import com.yeshi.fanli.service.inter.user.ShamUserService;
import com.yeshi.fanli.service.inter.user.SpreadUserImgService;
import com.yeshi.fanli.service.inter.user.UserAccountService;
@@ -139,6 +141,7 @@
import com.yeshi.fanli.util.taobao.TaoBaoUtil;
import com.yeshi.fanli.util.taobao.TaoKeApiUtil;
import com.yeshi.fanli.util.wx.WXLoginUtil;
+import com.yeshi.fanli.vo.user.MineInfoVO;
import com.yeshi.fanli.vo.user.UserInfoExtraVO;
import com.yeshi.fanli.vo.user.UserSettingsVO;
@@ -271,6 +274,9 @@
@Resource
private GiveVIPApplyInfoService giveVIPApplyInfoService;
+
+ @Resource
+ private PreviewInfoService previewInfoService;
private static final String EXTRACT_MIN_MONEY = ConfigKeyEnum.extractMoneyMin.getKey();
private static final String EXTRACT_MAX_MONEY = ConfigKeyEnum.extractMoneyMAX.getKey();
@@ -2221,10 +2227,32 @@
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);
+ // VIP棰勮淇℃伅
+ if (VersionUtil.greaterThan_2_1_1(acceptData.getPlatform(), acceptData.getVersion())) {
+ String redisContent = previewInfoService.getRedisContent(uid, PreviewEnum.mineInfo);
+ if (!StringUtil.isNullOrEmpty(redisContent)) {
+ MineInfoVO vo = new Gson().fromJson(redisContent, MineInfoVO.class);
+ if (vo != null) {
+ if (!StringUtil.isNullOrEmpty(vo.getBalance()))
+ userInfo.setMyHongBao(new BigDecimal(vo.getBalance()));
+
+ if (!StringUtil.isNullOrEmpty(vo.getLevel()))
+ for (UserInviteLevelEnum levelEnum : UserInviteLevelEnum.values()) {
+ if (levelEnum.name().equals(vo.getLevel())) {
+ level = levelEnum;
+ break;
+ }
+ }
+ }
+ }
+ }
+
+ if (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());
@@ -2239,7 +2267,9 @@
UserLevelEnum level = userLevelManager.getUserLevel(uid);
JSONObject vipAction = null;
- if (level == UserLevelEnum.superVIP || level == UserLevelEnum.tearcher) {
+ String managerLink = userVipConfigService.getValueByKey("vip_manager_link");
+ if ((level == UserLevelEnum.superVIP || level == UserLevelEnum.tearcher)
+ && !StringUtil.isNullOrEmpty(managerLink)) {
vipAction = new JSONObject();
vipAction.put("name", "瓒呬細绠＄悊");
vipAction.put("jumpDetail",
@@ -2247,25 +2277,25 @@
acceptData.getPlatform().equalsIgnoreCase("android") ? 1 : 2,
Integer.parseInt(acceptData.getVersion())));
JSONObject params = new JSONObject();
- params.put("url", "");
+ params.put("url", userVipConfigService.getValueByKey("vip_manager_link"));
vipAction.put("params", params);
-
} else {
// 鏌ヨ鏄惁鍙互鎻愪氦浼氬憳鐢宠锛屾槸鐨勮瘽杩斿洖璧勬枡濉啓椤甸潰
List<GiveVIPApplyInfo> list = giveVIPApplyInfoService.listByStateAndTargetUid(uid,
GiveVIPApplyInfo.STATE_NO_INFO, 1, 20);
if (list != null && list.size() > 0) {
-
- vipAction = new JSONObject();
- vipAction.put("name", "鐢宠浼氬憳");
- vipAction.put("jumpDetail",
- jumpDetailV2Service.getByTypeCache("web",
- acceptData.getPlatform().equalsIgnoreCase("android") ? 1 : 2,
- Integer.parseInt(acceptData.getVersion())));
- JSONObject params = new JSONObject();
- params.put("url", "");
- vipAction.put("params", params);
-
+ String link = userVipConfigService.getValueByKey("apply_vip_upload_info_link");
+ if (!StringUtil.isNullOrEmpty(link)) {
+ vipAction = new JSONObject();
+ vipAction.put("name", "鐢宠浼氬憳");
+ vipAction.put("jumpDetail",
+ jumpDetailV2Service.getByTypeCache("web",
+ acceptData.getPlatform().equalsIgnoreCase("android") ? 1 : 2,
+ Integer.parseInt(acceptData.getVersion())));
+ JSONObject params = new JSONObject();
+ params.put("url", link.replace("[ID]", list.get(0).getId()));
+ vipAction.put("params", params);
+ }
}
}
@@ -2273,6 +2303,8 @@
data.put("vipAction", vipAction);
}
+
+ data.put("user", JsonUtil.getConvertBigDecimalToStringBuilder(gsonBuilder).create().toJson(userInfo));
out.print(JsonUtil.loadTrueResult(data));
--
Gitblit v1.8.0