From d029dafc262bc3c8ddc8ca6b85e4fa6e073d764a Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期三, 01 一月 2020 14:38:47 +0800
Subject: [PATCH] Merge branch 'div' of ssh://193.112.35.168:29418/fanli-server into div
---
fanli/src/main/java/com/yeshi/fanli/controller/client/v1/RecommendController.java | 25 +++++++++++++------------
1 files changed, 13 insertions(+), 12 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/RecommendController.java b/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/RecommendController.java
index 1f7bf77..182f36a 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/RecommendController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/RecommendController.java
@@ -99,7 +99,7 @@
import com.yeshi.fanli.service.inter.taobao.TaoBaoGoodsUpdateService;
import com.yeshi.fanli.service.inter.taobao.TaoBaoShopService;
import com.yeshi.fanli.service.inter.taobao.TaoBaoUnionConfigService;
-import com.yeshi.fanli.service.inter.taobao.dataoke.DaTaoKeGoodsDetailService;
+import com.yeshi.fanli.service.inter.taobao.dataoke.DaTaoKeGoodsDetailV2Service;
import com.yeshi.fanli.service.inter.tlj.ConfigTaoLiJinService;
import com.yeshi.fanli.service.inter.tlj.UserTaoLiJinOriginService;
import com.yeshi.fanli.service.inter.tlj.UserTaoLiJinRecordService;
@@ -241,7 +241,7 @@
private TaoBaoShopService taoBaoShopService;
@Resource
- private DaTaoKeGoodsDetailService daTaoKeGoodsDetailService;
+ private DaTaoKeGoodsDetailV2Service daTaoKeGoodsDetailV2Service;
@Resource
private UserMoneyExtraService userMoneyExtraService;
@@ -1427,7 +1427,7 @@
// filter
try {
- gList = daTaoKeGoodsDetailService.filterTaoBaoGoods(gList);
+ gList = daTaoKeGoodsDetailV2Service.filterTaoBaoGoods(gList);
} catch (Exception e) {
}
@@ -1595,7 +1595,8 @@
if (!StringUtil.isNullOrEmpty(specialCard)) {
try {
- listswiper = swiperPictureService.getByBannerCard(swiperCard);
+ listswiper = swiperPictureService.getByBannerCardAndVersion(swiperCard, acceptData.getPlatform(),
+ Integer.parseInt(acceptData.getVersion()));
if (listswiper == null) {
listswiper = new ArrayList<SwiperPicture>();
@@ -1715,7 +1716,7 @@
JSONObject root = specialService.listCacheSpecialToIndex(acceptData, deviceSex);
// 2銆侀《閮ㄨ疆鎾浘
- List<SwiperPicture> topPicList = getSwiperByCard("index_top");
+ List<SwiperPicture> topPicList = getSwiperByCard("index_top", acceptData);
if (topPicList == null) {
topPicList = new ArrayList<SwiperPicture>();
}
@@ -1727,7 +1728,7 @@
&& configService.iosOnLining(Integer.parseInt(acceptData.getVersion()))) {
// 濡傛灉IOS褰撳墠鐗堟湰澶勪簬瀹℃牳鐘舵�佸氨涓嶈繑鍥�
} else {
- invitePicList = getSwiperByCard("index_invite");
+ invitePicList = getSwiperByCard("index_invite", acceptData);
}
if (invitePicList == null) {
@@ -1768,15 +1769,16 @@
return null;
}
- List<SwiperPicture> invitePicList = getSwiperByCard("index_invite");
+ List<SwiperPicture> invitePicList = getSwiperByCard("index_invite", acceptData);
return invitePicList;
}
- public List<SwiperPicture> getSwiperByCard(String card) {
+ public List<SwiperPicture> getSwiperByCard(String card, AcceptData acceptData) {
List<SwiperPicture> swiperList = null;
try {
- swiperList = swiperPictureService.getByBannerCard(card);
+ swiperList = swiperPictureService.getByBannerCardAndVersion(card, acceptData.getPlatform(),
+ Integer.parseInt(acceptData.getVersion()));
} catch (Exception e) {
try {
LogHelper.errorDetailInfo(e);
@@ -2071,7 +2073,7 @@
// 澶ф窐瀹㈠晢鍝佽繃婊�
try {
- goods = daTaoKeGoodsDetailService.filterTaoBaoGoods(goods);
+ goods = daTaoKeGoodsDetailV2Service.filterTaoBaoGoods(goods);
} catch (Exception e) {
LogHelper.errorDetailInfo(e);
}
@@ -2552,9 +2554,8 @@
*/
@RequestMapping(value = "getSpecialActivities")
public void getSpecialActivities(AcceptData acceptData, Long uid, PrintWriter out, String callback) {
- int platformCode = Constant.getPlatformCode(acceptData.getPlatform());
List<Special> listSpecial = specialService.listByVersion(0, Integer.MAX_VALUE, "special_activities",
- platformCode, Integer.parseInt(acceptData.getVersion()));
+ acceptData.getPlatform(), Integer.parseInt(acceptData.getVersion()));
List<Special> list = new ArrayList<Special>();
if (listSpecial != null) {
--
Gitblit v1.8.0