From 626d711cb15896055c13fe344eb7fcc824589715 Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期四, 19 十二月 2019 15:38:42 +0800
Subject: [PATCH] 帮助中心

---
 fanli/src/main/java/com/yeshi/fanli/controller/client/v2/HotSellControllerV2.java |    8 +++++---
 1 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/HotSellControllerV2.java b/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/HotSellControllerV2.java
index 6926331..d833de6 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/HotSellControllerV2.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/HotSellControllerV2.java
@@ -12,16 +12,17 @@
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.yeshi.utils.JsonUtil;
 
+import com.yeshi.fanli.dto.ConfigParamsDTO;
 import com.yeshi.fanli.dto.dataoke.DaTaoKeGoodsResult;
 import com.yeshi.fanli.entity.accept.AcceptData;
 import com.yeshi.fanli.entity.taobao.TaoBaoGoodsBrief;
-import com.yeshi.fanli.entity.taobao.TaoBaoGoodsBriefExtra;
 import com.yeshi.fanli.entity.taobao.dataoke.DaTaoKeDetailV2;
 import com.yeshi.fanli.log.LogHelper;
 import com.yeshi.fanli.service.inter.common.JumpDetailV2Service;
 import com.yeshi.fanli.service.inter.goods.TaoBaoGoodsBriefService;
-import com.yeshi.fanli.service.inter.hongbao.HongBaoManageService;
+import com.yeshi.fanli.service.inter.order.config.HongBaoManageService;
 import com.yeshi.fanli.service.inter.taobao.dataoke.DaTaoKeGoodsService;
+import com.yeshi.fanli.util.Constant;
 import com.yeshi.fanli.util.dataoke.DaTaoKeApiUtil;
 import com.yeshi.fanli.util.factory.goods.GoodsDetailVOFactory;
 import com.yeshi.fanli.util.taobao.TaoBaoUtil;
@@ -97,10 +98,11 @@
 			if (detailList != null) {
 				BigDecimal fanLiRate = hongBaoManageService.getFanLiRate();
 			    BigDecimal shareRate = hongBaoManageService.getShareRate();
+			    ConfigParamsDTO paramsDTO = new ConfigParamsDTO(fanLiRate, shareRate, Constant.MAX_REWARD_RATE,	hongBaoManageService.getVIPFanLiRate());
 
 				for (DaTaoKeDetailV2 detail : detailList) {
 					TaoBaoGoodsBrief taoBaoGoodsBrief = TaoBaoUtil.convert(detail);
-					GoodsDetailVO detailVO = GoodsDetailVOFactory.convertTaoBao(taoBaoGoodsBrief, null, fanLiRate, shareRate);
+					GoodsDetailVO detailVO = GoodsDetailVOFactory.convertTaoBao(taoBaoGoodsBrief, paramsDTO);
 					if (cid == 2)
 						detailVO.setSalesType(2);
 					else if (cid == 3)

--
Gitblit v1.8.0