From 4a901a88c00c4c48d5b6f4fef55de2a2fd82749a Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期日, 26 四月 2020 14:43:24 +0800
Subject: [PATCH] 用户授权激活限制
---
fanli/src/main/java/com/yeshi/fanli/controller/client/v1/ConfigController.java | 15 +++++++++++----
1 files changed, 11 insertions(+), 4 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/ConfigController.java b/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/ConfigController.java
index 9d77afd..f61e145 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/ConfigController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/ConfigController.java
@@ -45,6 +45,7 @@
import com.yeshi.fanli.service.inter.user.vip.UserLevelUpgradedNotifyService;
import com.yeshi.fanli.service.inter.user.vip.UserVIPInfoService;
import com.yeshi.fanli.service.inter.user.vip.UserVIPPreInfoService;
+import com.yeshi.fanli.service.inter.user.vip.UserVipConfigService;
import com.yeshi.fanli.util.Constant;
import com.yeshi.fanli.util.StringUtil;
import com.yeshi.fanli.util.ThreadUtil;
@@ -114,6 +115,10 @@
@Resource
private ThreeSaleSerivce threeSaleSerivce;
+
+ @Resource
+ private UserVipConfigService userVipConfigService;
+
/**
* s 棣栭〉閰嶇疆淇℃伅
@@ -372,15 +377,14 @@
// TODO 楠岃瘉鏄惁鏄甯�
JSONObject inner = new JSONObject();
- inner.put("link", "https://www.baidu.com/");
+ inner.put("link", userVipConfigService.getValueByKey("vip_link"));
inner.put("ion", "http://img.flqapp.com/resource/vip/icon_vip.png");
inner.put("title", "鍏嶈垂鍗囩骇 浜細鍛樻潈鐩�");
inner.put("btnName", "鍗囩骇浼氬憳");
if (uid != null) {
// 鏄惁瀵煎笀 TODO
-
if (userVIPInfoService.isVIP(uid)) {
- inner.put("link", "https://www.baidu.com/");
+ inner.put("link", userVipConfigService.getValueByKey("vip_link"));
inner.put("ion", "http://img.flqapp.com/resource/vip/icon_tearcher.png");
inner.put("title", "鎷夸簲闄╀笌娲ヨ创 浜甯堟潈鐩�");
inner.put("btnName", "鍗囩骇浼氬憳");
@@ -396,6 +400,9 @@
}
}
data.put("vip", inner);
+ //骞冲彴瑙勫垯
+ String platformRuleLink = configService.get(ConfigKeyEnum.platformRule.getKey());
+ data.put("platformRule", platformRuleLink);
}
if (VersionUtil.greaterThan_2_1(acceptData.getPlatform(), acceptData.getVersion()) && uid != null) {
@@ -434,7 +441,7 @@
if (vipInfo != null && vipInfo.getState() == UserVIPInfo.STATE_SUCCESS)
time = vipInfo.getSuccessTime();
- } else if (level == UserLevelEnum.highVIP || level == UserLevelEnum.normalVIP) {
+ } else if (level == UserLevelEnum.highVIP) {
UserVIPPreInfo info = userVIPPreInfoService.selectByUidAndProcess(uid, level.getLevel());
if (info != null)
time = info.getCreateTime();
--
Gitblit v1.8.0