From 3f7c35dcb3bd703fcb952bb1a7d3ba5088d87b54 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 30 十月 2019 15:13:00 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/service/impl/brand/BrandClassShopServiceImpl.java | 8 +++++---
1 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/brand/BrandClassShopServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/brand/BrandClassShopServiceImpl.java
index 6d991c4..b3f7f36 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/brand/BrandClassShopServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/brand/BrandClassShopServiceImpl.java
@@ -16,6 +16,7 @@
import org.yeshi.utils.JsonUtil;
import com.yeshi.fanli.dao.mybatis.brand.BrandClassShopMapper;
+import com.yeshi.fanli.dto.ConfigParamsDTO;
import com.yeshi.fanli.entity.brand.BrandClass;
import com.yeshi.fanli.entity.brand.BrandClassShop;
import com.yeshi.fanli.entity.goods.CommonGoods;
@@ -432,6 +433,7 @@
BigDecimal fanLiRate = hongBaoManageService.getFanLiRate();
BigDecimal shareRate = hongBaoManageService.getShareRate();
+ ConfigParamsDTO paramsDTO = new ConfigParamsDTO(fanLiRate, shareRate, Constant.MAX_REWARD_RATE);
// 娣樺疂鍟嗗搧淇℃伅杩囨护
Map<Long, TaoBaoGoodsBrief> goodsMap = getFilterTaoBaoGoods(listInfo);
@@ -467,7 +469,7 @@
taoBaoGoodsUpdateService.addUpdateQueueAsync(listGoodsBrief);
for (TaoBaoGoodsBrief taoBaoGoodsBrief : listGoodsBrief) {
GoodsDetailVO goodsDetailVO = GoodsDetailVOFactory
- .convertTaoBao(goodsMap.get(taoBaoGoodsBrief.getAuctionId()), null, fanLiRate, shareRate);
+ .convertTaoBao(goodsMap.get(taoBaoGoodsBrief.getAuctionId()),paramsDTO);
listGoods.add(goodsDetailVO);
}
taoBaoShopVO.setListGoodsVO(listGoods);
@@ -538,7 +540,7 @@
BigDecimal fanLiRate = hongBaoManageService.getFanLiRate();
BigDecimal shareRate = hongBaoManageService.getShareRate();
-
+ ConfigParamsDTO paramsDTO = new ConfigParamsDTO(fanLiRate, shareRate, Constant.MAX_REWARD_RATE);
// 娣樺疂鍟嗗搧淇℃伅杩囨护
Map<Long, TaoBaoGoodsBrief> goodsMap = getFilterTaoBaoGoods(listInfo);
@@ -559,7 +561,7 @@
taoBaoGoodsUpdateService.addUpdateQueueAsync(listGoodsBrief);
for (TaoBaoGoodsBrief taoBaoGoodsBrief : listGoodsBrief) {
GoodsDetailVO goodsDetailVO = GoodsDetailVOFactory
- .convertTaoBao(goodsMap.get(taoBaoGoodsBrief.getAuctionId()), null, fanLiRate, shareRate);
+ .convertTaoBao(goodsMap.get(taoBaoGoodsBrief.getAuctionId()), paramsDTO);
listGoods.add(goodsDetailVO);
}
taoBaoShopVO.setListGoodsVO(listGoods);
--
Gitblit v1.8.0