From 98b1a0affd69bbe63223c21fdd2c404e8bedfccb Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 20 五月 2020 17:25:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into 2.1.2
---
fanli/src/main/java/com/yeshi/fanli/controller/client/v1/ConfigController.java | 35 ++++++++++++++++++++++++-----------
1 files changed, 24 insertions(+), 11 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 61415a0..6427764 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
@@ -7,6 +7,7 @@
import javax.annotation.Resource;
+import org.json.JSONArray;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
@@ -51,6 +52,7 @@
import com.yeshi.fanli.util.ThreadUtil;
import com.yeshi.fanli.util.TimeUtil;
import com.yeshi.fanli.util.VersionUtil;
+import com.yeshi.fanli.vo.homemodule.BannerVO;
import com.yeshi.fanli.vo.user.UserDialogBtnVO;
import com.yeshi.fanli.vo.user.UserDialogVO;
import com.yeshi.fanli.vo.user.VIPUpgradedNotifyVO;
@@ -327,12 +329,18 @@
data.put("taoBaoCart", source);
if (VersionUtil.greaterThan_2_0_2(acceptData.getPlatform(), acceptData.getVersion())) {
- // 鎴戠殑鐣岄潰banner
- List<SwiperPicture> banner = swiperPictureService.getByBannerCardAndVersion("my_interface_banner",
- acceptData.getPlatform(), Integer.parseInt(acceptData.getVersion()));
- if (banner == null)
- banner = new ArrayList<SwiperPicture>();
- data.put("banner", JsonUtil.getApiCommonGson().toJson(banner));
+ // IOS姝ｅ湪涓婄嚎鐗堟湰
+ if ("ios".equalsIgnoreCase(acceptData.getPlatform())
+ && configService.iosOnLining(Integer.parseInt(acceptData.getVersion()))) {
+ data.put("banner", new JSONArray());
+ } else {
+ // 鎴戠殑鐣岄潰banner
+ List<BannerVO> banner = swiperPictureService.getByBannerCardAndVersion("my_interface_banner",
+ acceptData.getPlatform(), Integer.parseInt(acceptData.getVersion()));
+ if (banner == null)
+ banner = new ArrayList<BannerVO>();
+ data.put("banner", JsonUtil.getApiCommonGson().toJson(banner));
+ }
}
if (VersionUtil.greaterThan_2_0_7(acceptData.getPlatform(), acceptData.getVersion())) {
@@ -371,9 +379,7 @@
}
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");
@@ -381,11 +387,14 @@
inner.put("btnName", "鍗囩骇浼氬憳");
if (uid != null) {
- if (info!=null&&info.getProcess()==UserVIPPreInfo.PROCESS_3) {
+ 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) {
@@ -397,7 +406,11 @@
}
}
}
- data.put("vip", inner);
+ // IOS姝ｅ湪涓婄嚎
+ if ("ios".equalsIgnoreCase(acceptData.getPlatform())
+ && configService.iosOnLining(Integer.parseInt(acceptData.getVersion()))) {
+ } else
+ data.put("vip", inner);
// 骞冲彴瑙勫垯
String platformRuleLink = configService.get(ConfigKeyEnum.platformRule.getKey());
data.put("platformRule", platformRuleLink);
--
Gitblit v1.8.0