From 04e85c19e6cafd1cd65ade89b76a4e9ee5211c08 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期一, 27 四月 2020 16:59:51 +0800
Subject: [PATCH] 佣金显示比例方法修改
---
fanli/src/main/java/com/yeshi/fanli/controller/client/v1/ConfigController.java | 31 +++++++++++++++----------------
1 files changed, 15 insertions(+), 16 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 6411059..b86d3d7 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
@@ -102,11 +102,10 @@
@Resource
private UserInfoService userInfoService;
-
-
+
@Resource
private UserVIPInfoService userVIPInfoService;
-
+
@Resource
private UserVIPPreInfoService userVIPPreInfoService;
@@ -115,10 +114,9 @@
@Resource
private ThreeSaleSerivce threeSaleSerivce;
-
+
@Resource
private UserVipConfigService userVipConfigService;
-
/**
* s 棣栭〉閰嶇疆淇℃伅
@@ -371,23 +369,24 @@
data.put("tearcherLink", tearcherLink);
}
}
-
-
+
if (VersionUtil.greaterThan_2_1(acceptData.getPlatform(), acceptData.getVersion())) {
- // TODO 楠岃瘉鏄惁鏄甯�
-
+ UserVIPPreInfo info = userVIPPreInfoService.getLatestProcessInfo(uid);
JSONObject inner = new JSONObject();
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)) {
+ if (info != null && info.getProcess() >= UserVIPPreInfo.PROCESS_3) {
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", "鍗囩骇浼氬憳");
+ if (info.getProcess() == UserVIPPreInfo.PROCESS_4)
+ inner.put("btnName", "鏉挎牀蹇渷");
+ else
+ inner.put("btnName", "鍗囩骇瀵煎笀");
} else {
UserVIPPreInfo userVIPPreInfo = userVIPPreInfoService.getLatestProcessInfo(uid);
if (userVIPPreInfo != null) {
@@ -400,7 +399,10 @@
}
}
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) {
UserLevelUpgradedNotify notify = userLevelUpgradedNotifyService.getNeedNotifyByUid(uid);
@@ -426,9 +428,6 @@
e.printStackTrace();
}
}
-
-
-
// 鑾峰彇鍗囩骇鏃堕棿
private Date getUpgradedTime(Long uid, UserLevelEnum level) {
--
Gitblit v1.8.0