From cba6ca3ea6c700ac4a102d6e896e3c5bb2dcc83d Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期二, 19 五月 2020 14:51:56 +0800
Subject: [PATCH] 数据预览
---
fanli/src/main/java/com/yeshi/fanli/controller/client/v1/UserInfoController.java | 64 ++++++++++++++++++++++++--------
1 files changed, 48 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 ba8d17e..1f1929c 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,10 @@
@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 +2228,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());
@@ -2247,7 +2276,7 @@
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 {
@@ -2255,17 +2284,18 @@
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