From d3db196ed2fe8b6c3905ff111d665d9fc2c951a3 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 10 十二月 2019 15:41:58 +0800
Subject: [PATCH] 返利比例与会员比例调整

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

diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/ShareControllerV2.java b/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/ShareControllerV2.java
index 8cf06af..6f6c493 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/ShareControllerV2.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/ShareControllerV2.java
@@ -281,7 +281,7 @@
 
 			if (taoBaoLink != null && taoBaoLink.getGoods() != null && needGoods) {
 				ConfigParamsDTO dto = new ConfigParamsDTO(hongBaoManageService.getFanLiRate(),
-						hongBaoManageService.getShareRate(), new BigDecimal(80));
+						hongBaoManageService.getShareRate(), Constant.MAX_REWARD_RATE,hongBaoManageService.getVIPFanLiRate());
 				GoodsDetailVO goodsInfo = GoodsDetailVOFactory.convertTaoBao(taoBaoLink.getGoods(), dto);
 				shareInfo.setGoodsInfo(goodsInfo);
 			}
@@ -648,7 +648,7 @@
 
 		if (needGoods)
 			shareInfo.setGoodsInfo(GoodsDetailVOFactory.convertJDGoods(jdGoods, new ConfigParamsDTO(
-					hongBaoManageService.getFanLiRate(), hongBaoManageService.getShareRate(), new BigDecimal(80))));
+					hongBaoManageService.getFanLiRate(), hongBaoManageService.getShareRate(), Constant.MAX_REWARD_RATE,hongBaoManageService.getVIPFanLiRate())));
 
 		String shareText = "";
 		boolean hasCoupon = false;
@@ -764,7 +764,7 @@
 		shareInfo.setPictUrl(goods.getGoodsImageUrl());
 		if (needGoods) {
 			shareInfo.setGoodsInfo(GoodsDetailVOFactory.convertPDDGoods(goods, new ConfigParamsDTO(
-					hongBaoManageService.getFanLiRate(), hongBaoManageService.getShareRate(), new BigDecimal(80))));
+					hongBaoManageService.getFanLiRate(), hongBaoManageService.getShareRate(),  Constant.MAX_REWARD_RATE,hongBaoManageService.getVIPFanLiRate())));
 		}
 
 		String template = "";
@@ -1415,7 +1415,7 @@
 
 		BigDecimal fanLiRate = hongBaoManageService.getFanLiRate();
 		BigDecimal shareRate = hongBaoManageService.getShareRate();
-		ConfigParamsDTO paramsDTO = new ConfigParamsDTO(fanLiRate, shareRate, Constant.MAX_REWARD_RATE);
+		ConfigParamsDTO paramsDTO = new ConfigParamsDTO(fanLiRate, shareRate, Constant.MAX_REWARD_RATE,hongBaoManageService.getVIPFanLiRate());
 
 		Gson gson = JsonUtil.getConvertBigDecimalToStringSubZeroBuilder(new GsonBuilder())
 				.excludeFieldsWithoutExposeAnnotation().setDateFormat("yyyy-MM-dd").create();

--
Gitblit v1.8.0