From bbb7a538df960f2f47b0af8c3db03622fca08d99 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期五, 22 五月 2020 13:54:31 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/controller/client/v1/UserInfoController.java | 24 ++++++++++++------------
1 files changed, 12 insertions(+), 12 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 1f1929c..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
@@ -274,10 +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();
@@ -2236,18 +2235,18 @@
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;
- }
- }
+ 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);
@@ -2268,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",
@@ -2278,7 +2279,6 @@
JSONObject params = new JSONObject();
params.put("url", userVipConfigService.getValueByKey("vip_manager_link"));
vipAction.put("params", params);
-
} else {
// 鏌ヨ鏄惁鍙互鎻愪氦浼氬憳鐢宠锛屾槸鐨勮瘽杩斿洖璧勬枡濉啓椤甸潰
List<GiveVIPApplyInfo> list = giveVIPApplyInfoService.listByStateAndTargetUid(uid,
--
Gitblit v1.8.0