From f99d8098b0aee17c09be5dfee8b4f72a6f4071b1 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期日, 26 四月 2020 11:57:39 +0800
Subject: [PATCH] 同步老用户等级数据
---
fanli/src/main/java/com/yeshi/fanli/controller/client/v1/ConfigController.java | 9 ++++++---
1 files changed, 6 insertions(+), 3 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 89dc3cc..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
@@ -377,14 +377,14 @@
// TODO 楠岃瘉鏄惁鏄甯�
JSONObject inner = new JSONObject();
- inner.put("link", userVipConfigService.getByKey("vip_link"));
+ 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", userVipConfigService.getByKey("vip_link"));
+ 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", "鍗囩骇浼氬憳");
@@ -400,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) {
@@ -438,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