From 52bc8ff0de3c7538d1401423c1cba9615c0c2082 Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期四, 18 六月 2020 17:22:24 +0800
Subject: [PATCH] 发圈商品来源修改 + 云发单规则调整
---
fanli/src/main/java/com/yeshi/fanli/controller/client/v1/ConfigController.java | 81 +++++++++++++++++++++++++++-------------
1 files changed, 55 insertions(+), 26 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..d3d245a 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;
@@ -16,7 +17,6 @@
import com.yeshi.fanli.entity.accept.AcceptData;
import com.yeshi.fanli.entity.bus.homemodule.FloatAD;
import com.yeshi.fanli.entity.bus.homemodule.FloatAD.FloatADTypeEnum;
-import com.yeshi.fanli.entity.bus.homemodule.SwiperPicture;
import com.yeshi.fanli.entity.bus.msg.MsgDeviceReadState;
import com.yeshi.fanli.entity.bus.user.ThreeSale;
import com.yeshi.fanli.entity.bus.user.UserActiveLog;
@@ -45,11 +45,13 @@
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;
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;
@@ -101,11 +103,10 @@
@Resource
private UserInfoService userInfoService;
-
-
+
@Resource
private UserVIPInfoService userVIPInfoService;
-
+
@Resource
private UserVIPPreInfoService userVIPPreInfoService;
@@ -114,6 +115,9 @@
@Resource
private ThreeSaleSerivce threeSaleSerivce;
+
+ @Resource
+ private UserVipConfigService userVipConfigService;
/**
* s 棣栭〉閰嶇疆淇℃伅
@@ -324,12 +328,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())) {
@@ -366,24 +376,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", "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/");
+ 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) {
@@ -395,8 +405,15 @@
}
}
}
- 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);
+ }
if (VersionUtil.greaterThan_2_1(acceptData.getPlatform(), acceptData.getVersion()) && uid != null) {
UserLevelUpgradedNotify notify = userLevelUpgradedNotifyService.getNeedNotifyByUid(uid);
@@ -416,15 +433,27 @@
}
}
}
+
+ // 浜戝彂鍗曢摼鎺�
+ if (VersionUtil.greaterThan_2_1_2(acceptData.getPlatform(), acceptData.getVersion())) {
+ boolean cloudOpen = configService.isRobotCloudOpen(ConfigKeyEnum.robotCloudOpen.getKey());
+ if (!cloudOpen && uid != null) {
+ List<String> testUsers = configService.getTestUsers();
+ if (testUsers != null && testUsers.contains(uid+"")) {
+ cloudOpen = true;
+ }
+ }
+
+ if (cloudOpen) {
+ data.put("cloudLink", configService.get(ConfigKeyEnum.robotCloudLink.getKey()));
+ }
+ }
out.print(JsonUtil.loadTrueResult(data));
} catch (Exception e) {
out.print(JsonUtil.loadFalseResult("鑾峰彇澶辫触"));
e.printStackTrace();
}
}
-
-
-
// 鑾峰彇鍗囩骇鏃堕棿
private Date getUpgradedTime(Long uid, UserLevelEnum level) {
@@ -434,7 +463,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