From be67478cae6bf9308f15949a21e7d0a57a3f0ecb Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期四, 16 七月 2020 15:37:31 +0800
Subject: [PATCH] dubbo集成修改
---
fanli/src/main/java/com/yeshi/fanli/controller/client/v1/ConfigController.java | 131 ++++++++++++++++++++++++-------------------
1 files changed, 72 insertions(+), 59 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..89539f8 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;
@@ -34,11 +34,8 @@
import com.yeshi.fanli.service.inter.homemodule.FloatADService;
import com.yeshi.fanli.service.inter.homemodule.SwiperPictureService;
import com.yeshi.fanli.service.inter.msg.MsgDeviceReadStateService;
-import com.yeshi.fanli.service.inter.taobao.TaoBaoUnionConfigService;
-import com.yeshi.fanli.service.inter.tlj.UserTaoLiJinOriginService;
import com.yeshi.fanli.service.inter.user.TBPidService;
import com.yeshi.fanli.service.inter.user.UserActiveLogService;
-import com.yeshi.fanli.service.inter.user.UserInfoExtraService;
import com.yeshi.fanli.service.inter.user.UserInfoService;
import com.yeshi.fanli.service.inter.user.invite.ThreeSaleSerivce;
import com.yeshi.fanli.service.inter.user.notify.UserActivedRecordService;
@@ -49,8 +46,9 @@
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 org.yeshi.utils.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;
@@ -74,12 +72,6 @@
private TBPidService tbPidService;
@Resource
- private TaoBaoUnionConfigService taoBaoUnionConfigService;
-
- @Resource
- private UserInfoExtraService userInfoExtraService;
-
- @Resource
private FloatADService floatADService;
@Resource
@@ -87,9 +79,6 @@
@Resource
private MsgDeviceReadStateService msgDeviceReadStateService;
-
- @Resource
- private UserTaoLiJinOriginService uerTaoLiJinOriginService;
@Resource
private UserActiveLogService userActiveLogService;
@@ -102,11 +91,10 @@
@Resource
private UserInfoService userInfoService;
-
-
+
@Resource
private UserVIPInfoService userVIPInfoService;
-
+
@Resource
private UserVIPPreInfoService userVIPPreInfoService;
@@ -115,10 +103,9 @@
@Resource
private ThreeSaleSerivce threeSaleSerivce;
-
+
@Resource
private UserVipConfigService userVipConfigService;
-
/**
* s 棣栭〉閰嶇疆淇℃伅
@@ -131,7 +118,7 @@
if (uid != null && uid == 0L)
uid = null;
- AppHomeFloatImg appHomeFloatImg = configService.getAppHomeFloatImg();
+ AppHomeFloatImg appHomeFloatImg = configService.getAppHomeFloatImg(acceptData.getSystem());
if ("ios".equalsIgnoreCase(acceptData.getPlatform()) && !Constant.IS_TEST) {
appHomeFloatImg = null;
}
@@ -141,13 +128,13 @@
data.put("floatImg", appHomeFloatImg);
}
- String notifyImg = configService.getAppHomeFloatNotifyImg();
+ String notifyImg = configService.getAppHomeFloatNotifyImg(acceptData.getSystem());
if (!StringUtil.isNullOrEmpty(notifyImg)) {
data.put("floatNotifyImg", notifyImg);
}
// 鏃犳柊浜哄脊妗� 鍒欐煡璇㈤粯璁�
- FloatAD floatAD = floatADService.getEffectiveFloatAD(FloatAD.POSITION_INDEX, 0);
+ FloatAD floatAD = floatADService.getEffectiveFloatAD(FloatAD.POSITION_INDEX, 0,acceptData.getSystem());
if (floatAD != null && floatAD.getTypeEnum() != FloatADTypeEnum.newUserRedPack) {
JSONObject detail = new JSONObject();
detail.put("img", floatAD.getPicture());
@@ -159,13 +146,13 @@
}
// 棰嗗埜甯姪閾炬帴,1.5.2鍚庣敓鏁�
- String couponHelp = configService.get(ConfigKeyEnum.taobaoCouponHelp.getKey());
+ String couponHelp = configService.getValue(ConfigKeyEnum.taobaoCouponHelp.getKey(),acceptData.getSystem());
data.put("couponHelpUrl", couponHelp);
// 搴曢儴缃戦〉閾炬帴
String platform = acceptData.getPlatform();
if ("android".equalsIgnoreCase(platform)) {
- data.put("htmlLink", configService.get(ConfigKeyEnum.indexHtmlLinkAndroid.getKey()));
+ data.put("htmlLink", configService.getValue(ConfigKeyEnum.indexHtmlLinkAndroid.getKey(),acceptData.getSystem()));
}
// 鍒ゆ柇鏂拌�佺敤鎴�
@@ -179,7 +166,7 @@
data.put("userTimeType", 1);
}
data.put("hotFuctionLink", configService.getByVersion(ConfigKeyEnum.hotFunctionUrl.getKey(), platform,
- Integer.parseInt(acceptData.getVersion())));//
+ Integer.parseInt(acceptData.getVersion()),acceptData.getSystem()));//
out.print(JsonUtil.loadTrueResult(data));
}
@@ -203,7 +190,7 @@
}
// 鏄惁闇�瑕佽喘鐗╁煄杞摼
- boolean convert = "0".equalsIgnoreCase(configService.get(ConfigKeyEnum.showTaobaoCartConvert.getKey())) ? false
+ boolean convert = "0".equalsIgnoreCase(configService.getValue(ConfigKeyEnum.showTaobaoCartConvert.getKey(),acceptData.getSystem())) ? false
: true;
if (!"cart".equalsIgnoreCase(position) && !convert) {
@@ -218,8 +205,8 @@
clientTBPid = tbPidService.getAndroidDefault();
}
- String cartJS = configService.get(ConfigKeyEnum.taobaoCartJS.getKey());
- String cartUrl = configService.get(ConfigKeyEnum.taobaoCartLink.getKey());
+ String cartJS = configService.getValue(ConfigKeyEnum.taobaoCartJS.getKey(),acceptData.getSystem());
+ String cartUrl = configService.getValue(ConfigKeyEnum.taobaoCartLink.getKey(),acceptData.getSystem());
if (!convert)// 涓嶈浆閾�
{
cartUrl = "http://";
@@ -271,8 +258,8 @@
@RequestMapping(value = "getBindAccountConfig", method = RequestMethod.POST)
public void getBindAccountConfig(AcceptData acceptData, PrintWriter out) {
- String alipayHelpUrl = configService.get(ConfigKeyEnum.alipayHelp.getKey());// 鏀粯瀹濆府鍔�
- String alipayBindFailUrl = configService.get(ConfigKeyEnum.alipayBindFailReason.getKey());// 鏀粯瀹濈粦瀹氬け璐ュ師鍥�
+ String alipayHelpUrl = configService.getValue(ConfigKeyEnum.alipayHelp.getKey(),acceptData.getSystem());// 鏀粯瀹濆府鍔�
+ String alipayBindFailUrl = configService.getValue(ConfigKeyEnum.alipayBindFailReason.getKey(),acceptData.getSystem());// 鏀粯瀹濈粦瀹氬け璐ュ師鍥�
JSONObject data = new JSONObject();
data.put("alipayHelp", alipayHelpUrl);
data.put("alipayBindFailReason", alipayBindFailUrl);
@@ -316,35 +303,41 @@
public void getUserConfig(AcceptData acceptData, Long uid, PrintWriter out) {
try {
// 鐢ㄦ埛鍗忚閾炬帴
- String serviceProtocol = configService.get(ConfigKeyEnum.serviceProtocolLink.getKey());
+ String serviceProtocol = configService.getValue(ConfigKeyEnum.serviceProtocolLink.getKey(),acceptData.getSystem());
// 闅愮鏉℃閾炬帴
- String privacyProtocol = configService.get(ConfigKeyEnum.privacyProtocolLink.getKey());
+ String privacyProtocol = configService.getValue(ConfigKeyEnum.privacyProtocolLink.getKey(),acceptData.getSystem());
JSONObject data = new JSONObject();
data.put("serviceProtocolLink", serviceProtocol);
data.put("privacyProtocolLink", privacyProtocol);
// 璐墿杞﹁烦杞柟寮�(鍖呭惈jumpDetail涓巔arams)
JSONObject source = JSONObject
.fromObject(configService.getByVersion(ConfigKeyEnum.taobaoCartJumpDetail.getKey(),
- acceptData.getPlatform(), Integer.parseInt(acceptData.getVersion())));
+ acceptData.getPlatform(), Integer.parseInt(acceptData.getVersion()),acceptData.getSystem()));
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()),acceptData.getSystem())) {
+ data.put("banner", new JSONArray());
+ } else {
+ // 鎴戠殑鐣岄潰banner
+ List<BannerVO> banner = swiperPictureService.getByBannerCardAndVersion("my_interface_banner",
+ acceptData.getPlatform(), Integer.parseInt(acceptData.getVersion()),acceptData.getSystem());
+ if (banner == null)
+ banner = new ArrayList<BannerVO>();
+ data.put("banner", JsonUtil.getApiCommonGson().toJson(banner));
+ }
}
if (VersionUtil.greaterThan_2_0_7(acceptData.getPlatform(), acceptData.getVersion())) {
// 杞摼鐨勭綉椤甸摼鎺�
- String convertLinkUrl = configService.get(ConfigKeyEnum.convertDocWebLink.getKey());
+ String convertLinkUrl = configService.getValue(ConfigKeyEnum.convertDocWebLink.getKey(),acceptData.getSystem());
data.put("convertLinkUrl", convertLinkUrl);
if (uid != null) {
String tearcherLink = configService.getByVersion(ConfigKeyEnum.tearcherLink.getKey(),
- acceptData.getPlatform(), Integer.parseInt(acceptData.getVersion()));
+ acceptData.getPlatform(), Integer.parseInt(acceptData.getVersion()),acceptData.getSystem());
if (userActivedRecordService.canNotifyAddTearcher(uid) && !StringUtil.isNullOrEmpty(tearcherLink)) {
UserInfo userInfo = userInfoService.selectAvailableByPrimaryKey(uid);
if (userInfo != null) {
@@ -354,7 +347,7 @@
JSONObject negativeParams = new JSONObject();
negativeParams.put("url", configService.getByVersion(ConfigKeyEnum.newerGonglue.getKey(),
- acceptData.getPlatform(), Integer.parseInt(acceptData.getVersion())));
+ acceptData.getPlatform(), Integer.parseInt(acceptData.getVersion()),acceptData.getSystem()));
JSONObject positiveParams = new JSONObject();
positiveParams.put("url", tearcherLink);
@@ -371,23 +364,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) {
@@ -399,8 +393,15 @@
}
}
}
- data.put("vip", inner);
- }
+ // IOS姝ｅ湪涓婄嚎
+ if ("ios".equalsIgnoreCase(acceptData.getPlatform())
+ && configService.iosOnLining(Integer.parseInt(acceptData.getVersion()),acceptData.getSystem())) {
+ } else
+ data.put("vip", inner);
+ // 骞冲彴瑙勫垯
+ String platformRuleLink = configService.getValue(ConfigKeyEnum.platformRule.getKey(),acceptData.getSystem());
+ data.put("platformRule", platformRuleLink);
+ }
if (VersionUtil.greaterThan_2_1(acceptData.getPlatform(), acceptData.getVersion()) && uid != null) {
UserLevelUpgradedNotify notify = userLevelUpgradedNotifyService.getNeedNotifyByUid(uid);
@@ -420,15 +421,27 @@
}
}
}
+
+ // 浜戝彂鍗曢摼鎺�
+ if (VersionUtil.greaterThan_2_1_2(acceptData.getPlatform(), acceptData.getVersion())) {
+ boolean cloudOpen = configService.isRobotCloudOpen(ConfigKeyEnum.robotCloudOpen.getKey(),acceptData.getPlatform(), acceptData.getVersion(),acceptData.getSystem());
+ if (!cloudOpen && uid != null) {
+ List<String> testUsers = configService.getTestUsers(acceptData.getSystem());
+ if (testUsers != null && testUsers.contains(uid+"")) {
+ cloudOpen = true;
+ }
+ }
+
+ if (cloudOpen) {
+ data.put("cloudLink", configService.getValue(ConfigKeyEnum.robotCloudLink.getKey(),acceptData.getSystem()));
+ }
+ }
out.print(JsonUtil.loadTrueResult(data));
} catch (Exception e) {
out.print(JsonUtil.loadFalseResult("鑾峰彇澶辫触"));
e.printStackTrace();
}
}
-
-
-
// 鑾峰彇鍗囩骇鏃堕棿
private Date getUpgradedTime(Long uid, UserLevelEnum level) {
@@ -466,10 +479,10 @@
@RequestMapping(value = "getOrderParseConfig", method = RequestMethod.POST)
public void getOrderParseConfig(AcceptData acceptData, PrintWriter out) {
- if ("0".equalsIgnoreCase(configService.get(ConfigKeyEnum.autoFindTaobaoOrder.getKey())))
+ if ("0".equalsIgnoreCase(configService.getValue(ConfigKeyEnum.autoFindTaobaoOrder.getKey(),acceptData.getSystem())))
out.print(JsonUtil.loadFalseResult(1, "鏆備笉鏀寔"));
else {
- String orderJS = configService.get(ConfigKeyEnum.taobaoOrderParseJS.getKey());
+ String orderJS = configService.getValue(ConfigKeyEnum.taobaoOrderParseJS.getKey(),acceptData.getSystem());
JSONObject data = new JSONObject();
try {
data.put("orderJS", DESUtil.encode(orderJS, StringUtil.getBase64String("YeShiFANLI889*+"),
@@ -496,7 +509,7 @@
JSONObject data = new JSONObject();
// 娴嬭瘯
data.put("showTaoBaoOrder",
- "0".equalsIgnoreCase(configService.get(ConfigKeyEnum.showTaobaoOrder.getKey()).trim()) ? false : true);
+ "0".equalsIgnoreCase(configService.getValue(ConfigKeyEnum.showTaobaoOrder.getKey(),acceptData.getSystem()).trim()) ? false : true);
data.put("taoBaoOrderUrl", "https://main.m.taobao.com/olist/index.html");
out.print(JsonUtil.loadTrueResult(data));
}
@@ -504,7 +517,7 @@
@RequestMapping(value = "getKeFuConfig", method = RequestMethod.POST)
public void getKeFuConfig(AcceptData acceptData, PrintWriter out) {
JSONObject data = new JSONObject();
- data.put("meiqia", "1".equalsIgnoreCase(configService.get(ConfigKeyEnum.kefuMeiqia.getKey())) ? true : false);// 鏄惁璺宠浆缇庢唇锛屼笉璺宠浆缇庢唇灏辩敤鍘熸潵鐨�
+ data.put("meiqia", "1".equalsIgnoreCase(configService.getValue(ConfigKeyEnum.kefuMeiqia.getKey(),acceptData.getSystem())) ? true : false);// 鏄惁璺宠浆缇庢唇锛屼笉璺宠浆缇庢唇灏辩敤鍘熸潵鐨�
out.print(JsonUtil.loadTrueResult(data));
// 璁剧疆娑堟伅宸茶
ThreadUtil.run(new Runnable() {
@@ -525,7 +538,7 @@
@RequestMapping(value = "getInviteCodeInputHelp", method = RequestMethod.POST)
public void getInviteCodeInputHelp(AcceptData acceptData, PrintWriter out) {
JSONObject data = new JSONObject();
- data.put("helpUrl", configService.get(ConfigKeyEnum.inviteCodeInputHelp.getKey()));
+ data.put("helpUrl", configService.getValue(ConfigKeyEnum.inviteCodeInputHelp.getKey(),acceptData.getSystem()));
out.print(JsonUtil.loadTrueResult(data));
}
--
Gitblit v1.8.0