From f862a844ea7e212f8cc0622b858308e2b91dca2e Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期六, 04 七月 2020 16:35:50 +0800
Subject: [PATCH] 后台管理相关Controller注入系统
---
fanli/src/main/java/com/yeshi/fanli/controller/client/v2/RecommendControllerV2.java | 50 +++++++++++++++++++++-----------------------------
1 files changed, 21 insertions(+), 29 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/RecommendControllerV2.java b/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/RecommendControllerV2.java
index ec41ff2..22ed584 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/RecommendControllerV2.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/RecommendControllerV2.java
@@ -150,11 +150,11 @@
int deviceSex = deviceSexService.getDeviceSex(acceptData.getDevice());
// 1銆佷笓棰樻ā鍧�
- JSONObject root = specialService.listCacheSpecialToIndex(acceptData, deviceSex);
+ JSONObject root = specialService.listCacheSpecialToIndex(acceptData, deviceSex,acceptData.getSystem());
// 2銆侀《閮ㄨ疆鎾浘
List<BannerVO> oldtopPicList = swiperPictureService.getByBannerCardAndVersion("index_top",
- acceptData.getPlatform(), Integer.parseInt(acceptData.getVersion()));
+ acceptData.getPlatform(), Integer.parseInt(acceptData.getVersion()),acceptData.getSystem());
List<BannerVO> topPicList = new ArrayList<>();
if (oldtopPicList != null && oldtopPicList.size() > 0)
@@ -165,11 +165,11 @@
// 3銆侀個璇锋湁濂�
List<BannerVO> invitePicList = null;
if ("ios".equalsIgnoreCase(acceptData.getPlatform())
- && configService.iosOnLining(Integer.parseInt(acceptData.getVersion()))) {
+ && configService.iosOnLining(Integer.parseInt(acceptData.getVersion()),acceptData.getSystem())) {
// 濡傛灉IOS褰撳墠鐗堟湰澶勪簬瀹℃牳鐘舵�佸氨涓嶈繑鍥�
} else {
invitePicList = swiperPictureService.getByBannerCardAndVersion("index_invite", acceptData.getPlatform(),
- Integer.parseInt(acceptData.getVersion()));
+ Integer.parseInt(acceptData.getVersion()),acceptData.getSystem());
}
if (invitePicList == null) {
@@ -180,7 +180,7 @@
// 4銆両OS鐨勫簳閮ㄧ綉椤甸摼鎺�
String platform = acceptData.getPlatform();
if ("ios".equalsIgnoreCase(platform)) {
- root.put("htmlLink", configService.get(ConfigKeyEnum.indexHtmlLinkIos.getKey()));
+ root.put("htmlLink", configService.getValue(ConfigKeyEnum.indexHtmlLinkIos.getKey(),acceptData.getSystem()));
}
root.put("spikeGoods", getSpikeGoodsContent(acceptData));
@@ -292,7 +292,7 @@
GoodsDetailVO detailVO = GoodsDetailVOFactory.convertTaoBao(taoBaoGoodsBrief, configParamsDTO);
JSONObject params = new JSONObject();
- params.put("url", configService.get(ConfigKeyEnum.spikeGoodsLink.getKey()) + "?id=" + taoBaoGoodsBrief.getAuctionId());
+ params.put("url", configService.getValue(ConfigKeyEnum.spikeGoodsLink.getKey(),acceptData.getSystem()) + "?id=" + taoBaoGoodsBrief.getAuctionId());
JSONObject goods = new JSONObject();
goods.put("goods", gson.toJson(detailVO));
@@ -327,7 +327,7 @@
}
root.put("imgList", imgArray);
JSONObject params = new JSONObject();
- params.put("url", configService.get(ConfigKeyEnum.spikeGoodsLink.getKey()));
+ params.put("url", configService.getValue(ConfigKeyEnum.spikeGoodsLink.getKey(),acceptData.getSystem()));
root.put("params", params);
root.put("jumpDetail", jumpDetail);
root.put("name", "闄愭椂绉掓潃");
@@ -337,7 +337,7 @@
root.put("endTime", endTime > 0 ? endTime : 0);
root.put("listgoods", array);
JSONObject params = new JSONObject();
- params.put("url", configService.get(ConfigKeyEnum.spikeGoodsLink.getKey()));
+ params.put("url", configService.getValue(ConfigKeyEnum.spikeGoodsLink.getKey(),acceptData.getSystem()));
root.put("params", params);
root.put("jumpDetail", jumpDetail);
}
@@ -353,9 +353,6 @@
* 闄愭椂绉掓潃鍒楄〃
*
* @param acceptData
- * @param page
- * @param auctionId
- * @param time
* @param out
*/
@RequestMapping("getSpikTime")
@@ -386,8 +383,6 @@
*
* @param acceptData
* @param page
- * @param auctionId
- * @param time
* @param out
*/
@RequestMapping("getSpikeGoodsList")
@@ -460,7 +455,7 @@
*/
private JSONObject getSearchDiscoveryInfo(AcceptData acceptData) {
JSONArray array = new JSONArray();
- String keys = configService.getSearchDiscoveryKeys();
+ String keys = configService.getSearchDiscoveryKeys(acceptData.getSystem());
if (!StringUtil.isNullOrEmpty(keys)) {
JSONArray arrayKeys = JSONArray.fromObject(keys);
for (int i = 0; i < arrayKeys.size(); i++) {
@@ -476,7 +471,7 @@
}
JSONObject params = new JSONObject();
- params.put("url", configService.get(ConfigKeyEnum.searchDiscoveryH5Link.getKey()));
+ params.put("url", configService.getValue(ConfigKeyEnum.searchDiscoveryH5Link.getKey(),acceptData.getSystem()));
JSONObject root = new JSONObject();
root.put("picture", "http://img.flqapp.com/resource/home_search_found.png");
@@ -532,12 +527,10 @@
/**
* 鏍规嵁璁惧淇℃伅鑾峰彇鐚滀綘鍠滄鐨勫唴瀹�
- *
* @param acceptData
- * @param imei
- * -Android鐨処MEI淇℃伅
- * @param idfa
- * -IOS鐨刬dfa骞垮憡鏍囪瘑淇℃伅
+ * @param page
+ * @param request
+ * @param out
*/
public void taoBaoGuessUserLikeByDevice(AcceptData acceptData, int page, HttpServletRequest request,
PrintWriter out) {
@@ -584,7 +577,7 @@
GoodsDetailVO detailVO = GoodsDetailVOFactory.convertTaoBao(goods.getGoods(), paramsBuy);
String hongBao = TaoBaoUtil.getGoodsHongBaoInfo(goods.getGoods(),
- TaoBaoConstant.OWN_BUY_WITHOUT_FANLI_RATE);
+ TaoBaoConstant.OWN_BUY_WITHOUT_FANLI_RATE,false);
ReduceHongBao reduceHongBao = new ReduceHongBao();
reduceHongBao.setLeft(goods.getLeftHongBaoCount());
@@ -694,7 +687,7 @@
* @param out
*/
private void getIndexJDGoods(AcceptData acceptData, int page, PrintWriter out) {
- JDSearchResult result = jdGoodsService.getIndexJDGoods(page);
+ JDSearchResult result = jdGoodsService.getIndexJDGoods(page,acceptData.getSystem());
long count = 0;
JSONObject data = new JSONObject();
JSONArray array = new JSONArray();
@@ -768,7 +761,7 @@
int count = 0;
List<SearchKeyTOPVO> list = new ArrayList<SearchKeyTOPVO>();
- String keys = configService.getSearchDiscoveryKeys();
+ String keys = configService.getSearchDiscoveryKeys(acceptData.getSystem());
if (!StringUtil.isNullOrEmpty(keys)) {
JSONArray arrayKeys = JSONArray.fromObject(keys);
if (arrayKeys != null && arrayKeys.size() > 0) {
@@ -829,7 +822,7 @@
int platformCode = Constant.getPlatformCode(acceptData.getPlatform());
List<Special> list = specialService.listByPlaceKey("special_channel_activity", platformCode,
- Integer.parseInt(acceptData.getVersion()));
+ Integer.parseInt(acceptData.getVersion()),acceptData.getSystem());
long time = System.currentTimeMillis();
// 鍒犻櫎灏氭湭鍚敤鐨勮繃鏈熺殑
@@ -865,14 +858,13 @@
*
* @param acceptData
* @param uid
- * @param callback
* @param out
*/
@RequestMapping(value = "getGuide")
public void getGuide(AcceptData acceptData, Long uid, PrintWriter out) {
String tips = null;
if (uid == null || uid <= 0) {
- tips = configService.get(ConfigKeyEnum.tipGuideNewUser.getKey());
+ tips = configService.getValue(ConfigKeyEnum.tipGuideNewUser.getKey(),acceptData.getSystem());
} else {
long rebateOrder = hongBaoV2CountService.countRebateOrder(uid);
long shareOrInviteOrder = hongBaoV2CountService.countShareOrInviteOrder(uid);
@@ -880,13 +872,13 @@
// 鐔熷鐗�
} else if (rebateOrder <= 0 && shareOrInviteOrder <= 0) {
// 鏂颁汉鐗�
- tips = configService.get(ConfigKeyEnum.tipGuideNewUser.getKey());
+ tips = configService.getValue(ConfigKeyEnum.tipGuideNewUser.getKey(),acceptData.getSystem());
} else if (rebateOrder > 0 && shareOrInviteOrder <= 0) {
// 鐪侀挶鐗�
- tips = configService.get(ConfigKeyEnum.tipGuideSaveMoney.getKey());
+ tips = configService.getValue(ConfigKeyEnum.tipGuideSaveMoney.getKey(),acceptData.getSystem());
} else {
// 璧氶挶鐗�
- tips = configService.get(ConfigKeyEnum.tipGuideShareInvite.getKey());
+ tips = configService.getValue(ConfigKeyEnum.tipGuideShareInvite.getKey(),acceptData.getSystem());
}
}
--
Gitblit v1.8.0