From 554de444b87aab5f93cb1593a8095612cf9479a7 Mon Sep 17 00:00:00 2001 From: yujian <yujian@163.com> Date: 星期二, 09 六月 2020 17:34:30 +0800 Subject: [PATCH] 订单 --- fanli/src/main/java/com/yeshi/fanli/controller/client/v2/RecommendControllerV2.java | 11 ++++++----- 1 files changed, 6 insertions(+), 5 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 48057ef..e3249dc 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 @@ -67,6 +67,7 @@ import com.yeshi.fanli.vo.goods.GoodsDetailVO; import com.yeshi.fanli.vo.goods.OtherInfo; import com.yeshi.fanli.vo.goods.SpikeTimeVO; +import com.yeshi.fanli.vo.homemodule.BannerVO; import com.yeshi.fanli.vo.msg.ClientTextStyleVO; import com.yeshi.fanli.vo.search.SearchKeyTOPVO; import com.yeshi.fanli.vo.search.SearchKeyVO; @@ -152,17 +153,17 @@ JSONObject root = specialService.listCacheSpecialToIndex(acceptData, deviceSex); // 2銆侀《閮ㄨ疆鎾浘 - List<SwiperPicture> oldtopPicList = swiperPictureService.getByBannerCardAndVersion("index_top", + List<BannerVO> oldtopPicList = swiperPictureService.getByBannerCardAndVersion("index_top", acceptData.getPlatform(), Integer.parseInt(acceptData.getVersion())); - List<SwiperPicture> topPicList = new ArrayList<>(); + List<BannerVO> topPicList = new ArrayList<>(); if (oldtopPicList != null && oldtopPicList.size() > 0) topPicList.addAll(oldtopPicList); root.put("topPicList", JsonUtil.getApiCommonGson().toJson(topPicList)); // 3銆侀個璇锋湁濂� - List<SwiperPicture> invitePicList = null; + List<BannerVO> invitePicList = null; if ("ios".equalsIgnoreCase(acceptData.getPlatform()) && configService.iosOnLining(Integer.parseInt(acceptData.getVersion()))) { // 濡傛灉IOS褰撳墠鐗堟湰澶勪簬瀹℃牳鐘舵�佸氨涓嶈繑鍥� @@ -172,7 +173,7 @@ } if (invitePicList == null) { - invitePicList = new ArrayList<SwiperPicture>(); + invitePicList = new ArrayList<BannerVO>(); } root.put("invitePicList", JsonUtil.getApiCommonGson().toJson(invitePicList)); @@ -583,7 +584,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()); -- Gitblit v1.8.0