From 9b55262bb45c81c997ab04e55e8de13e14b8ca7d Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期二, 29 十月 2019 15:11:37 +0800
Subject: [PATCH] 商品最高返

---
 fanli/src/main/java/com/yeshi/fanli/controller/apph5/AppH5ShareController.java |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/apph5/AppH5ShareController.java b/fanli/src/main/java/com/yeshi/fanli/controller/apph5/AppH5ShareController.java
index ada1e6c..d125aea 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/apph5/AppH5ShareController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/apph5/AppH5ShareController.java
@@ -13,6 +13,7 @@
 
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
+import com.yeshi.fanli.dto.ConfigParamsDTO;
 import com.yeshi.fanli.dto.jd.JDFilter;
 import com.yeshi.fanli.dto.jd.JDSearchResult;
 import com.yeshi.fanli.dto.pdd.PDDGoodsDetail;
@@ -168,7 +169,7 @@
 						.excludeFieldsWithoutExposeAnnotation().setDateFormat("yyyy-MM-dd").create();
 				BigDecimal fanLiRate = hongBaoManageService.getFanLiRate();
 				BigDecimal shareRate = hongBaoManageService.getShareRate();
-				
+				ConfigParamsDTO configParamsDTO = new ConfigParamsDTO(fanLiRate, shareRate, Constant.MAX_REWARD_RATE);
 				for (UserShareGoodsGroup goodsGroup : list) {
 					CommonGoods commonGoods = goodsGroup.getCommonGoods();
 					if (commonGoods == null) {
@@ -216,8 +217,7 @@
 						}
 						commonGoods.setState(state);
 					}
-					
-					GoodsDetailVO detailVO = GoodsDetailVOFactory.convertCommonGoods(commonGoods, null, fanLiRate, shareRate);
+					GoodsDetailVO detailVO = GoodsDetailVOFactory.convertCommonGoods(commonGoods, configParamsDTO);
 					if (!detailVO.isHasCoupon()) {
 						detailVO.setState(1);; // 宸叉姠鍏�
 					}

--
Gitblit v1.8.0