From 251a533b9c12e7d423b31473721a59580cab5b58 Mon Sep 17 00:00:00 2001 From: admin <weikou2014> Date: 星期六, 25 七月 2020 13:07:13 +0800 Subject: [PATCH] 将商品服务剥离出主项目 --- fanli/src/main/java/com/yeshi/fanli/controller/client/v1/CommonContentController.java | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/CommonContentController.java b/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/CommonContentController.java index 619bd3c..e07b46b 100644 --- a/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/CommonContentController.java +++ b/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/CommonContentController.java @@ -19,8 +19,8 @@ import com.yeshi.fanli.dto.common.CommonContentTypeEnum; import com.yeshi.fanli.entity.accept.AcceptData; import com.yeshi.fanli.entity.bus.homemodule.SwiperPicture; -import com.yeshi.fanli.entity.taobao.TaoBaoGoodsBrief; -import com.yeshi.fanli.entity.taobao.TaoBaoGoodsBriefExtra; +import com.yeshi.goods.facade.entity.taobao.TaoBaoGoodsBrief; +import com.yeshi.goods.facade.entity.taobao.TaoBaoGoodsBriefExtra; import com.yeshi.fanli.service.inter.goods.CommonTemplateContentService; import com.yeshi.fanli.service.inter.homemodule.SwiperPictureService; import com.yeshi.fanli.service.inter.order.config.HongBaoManageService; @@ -92,7 +92,7 @@ } CommonContentResult result = commonTemplateContentService.getContentList(CommonContentTypeEnum.valueOf(key), - cid, page, 10); + cid, page, 10,acceptData.getSystem()); // 淇濈暀鏆傛椂涓嶅紑鍚紝寰呭悗缁紑鍚� List<SwiperPicture> bannerList = new ArrayList<>(); @@ -103,7 +103,7 @@ JSONArray array = new JSONArray(); Gson gson = JsonUtil.getConvertBigDecimalToStringSubZeroBuilder(new GsonBuilder()).create(); - BigDecimal pro = hongBaoManageService.getFanLiRate(); + BigDecimal pro = hongBaoManageService.getFanLiRate(acceptData.getSystem()); if (CommonContentTypeEnum.valueOf(key) == CommonContentTypeEnum.mianDan)// 鍏嶅崟鍟嗗搧 pro = new BigDecimal(100); List<TaoBaoGoodsBrief> goodsList = result.getGoodsList(); -- Gitblit v1.8.0