From 2a48f2bd979d56ce4114ba9d56efaf49bab705d7 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期日, 31 五月 2020 11:13:07 +0800
Subject: [PATCH] 淘宝分享佣金比例修改

---
 fanli/src/main/java/com/yeshi/fanli/util/factory/goods/GoodsDetailVOFactory.java |   16 ++++++++--------
 1 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/util/factory/goods/GoodsDetailVOFactory.java b/fanli/src/main/java/com/yeshi/fanli/util/factory/goods/GoodsDetailVOFactory.java
index 02f587f..352d7e8 100644
--- a/fanli/src/main/java/com/yeshi/fanli/util/factory/goods/GoodsDetailVOFactory.java
+++ b/fanli/src/main/java/com/yeshi/fanli/util/factory/goods/GoodsDetailVOFactory.java
@@ -298,16 +298,16 @@
 				moneyInfoVO.setMaxMoney("楼" + taoBaoHongBaoInfo.getHongbao()
 						.add(MoneyBigDecimalUtil.mul(taoBaoHongBaoInfo.getHongbao(), params.getMaxRewardRate())));
 			else
-				moneyInfoVO.setMaxMoney("楼" + TaoBaoUtil.getGoodsHongBaoMoney(goods, params.getVipFanLiRate()));
+				moneyInfoVO.setMaxMoney("楼" + TaoBaoUtil.getGoodsHongBaoMoney(goods, params.getVipFanLiRate(),false));
 		} else {
-			BigDecimal commission = TaoBaoUtil.getGoodsHongBaoMoney(goods, params.getFanLiRate());
+			BigDecimal commission = TaoBaoUtil.getGoodsHongBaoMoney(goods, params.getFanLiRate(),false);
 			moneyInfoVO.setFanliMoney("楼" + commission);
 			if (params.getMaxRewardRate() != null)
 				moneyInfoVO.setMaxMoney(
 						"楼" + commission.add(MoneyBigDecimalUtil.mul(commission, params.getMaxRewardRate())));
 			else
-				moneyInfoVO.setMaxMoney("楼" + TaoBaoUtil.getGoodsHongBaoMoney(goods, params.getVipFanLiRate()));
-			moneyInfoVO.setShareMoney(TaoBaoUtil.getGoodsHongBaoInfo(goods, params.getShareRate()));
+				moneyInfoVO.setMaxMoney("楼" + TaoBaoUtil.getGoodsHongBaoMoney(goods, params.getVipFanLiRate(),false));
+			moneyInfoVO.setShareMoney(TaoBaoUtil.getGoodsHongBaoInfo(goods, params.getShareRate(),true));
 		}
 		goodsInfo.setMoneyInfo(moneyInfoVO);
 
@@ -431,10 +431,10 @@
 		MoneyInfoVO moneyInfoVO = new MoneyInfoVO();
 		moneyInfoVO.setMoneyType(1); // 榛樿鏄剧ず锛氳繑 楼6.6
 
-		BigDecimal commission = TaoBaoUtil.getGoodsHongBaoMoney(goods, params.getFanLiRate());
+		BigDecimal commission = TaoBaoUtil.getGoodsHongBaoMoney(goods, params.getFanLiRate(),false);
 		BigDecimal baseCommisstion = null;
 		if (params.getBaseFanliRate() != null)
-			baseCommisstion = TaoBaoUtil.getGoodsHongBaoMoney(goods, params.getBaseFanliRate());
+			baseCommisstion = TaoBaoUtil.getGoodsHongBaoMoney(goods, params.getBaseFanliRate(),false);
 		moneyInfoVO.setFanliMoney("楼" + commission);
 		if (params.getMaxRewardRate() != null)
 			moneyInfoVO
@@ -445,7 +445,7 @@
 			BigDecimal rate = MoneyBigDecimalUtil.div(commission.multiply(new BigDecimal(100)), price);
 			moneyInfoVO.setRateInfo("杩斿埄姣� " + rate + "%");
 
-			BigDecimal maxCommission = TaoBaoUtil.getGoodsHongBaoMoney(goods, params.getVipFanLiRate());
+			BigDecimal maxCommission = TaoBaoUtil.getGoodsHongBaoMoney(goods, params.getVipFanLiRate(),false);
 			BigDecimal maxRate = MoneyBigDecimalUtil.div(maxCommission.multiply(new BigDecimal(100)), price);
 			moneyInfoVO.setMaxRateInfo("杩斿埄姣� " + maxRate + "%");
 			moneyInfoVO.setMaxMoney("楼" + maxCommission);
@@ -459,7 +459,7 @@
 			}
 		}
 
-		moneyInfoVO.setShareMoney(TaoBaoUtil.getGoodsHongBaoInfo(goods, params.getShareRate()));
+		moneyInfoVO.setShareMoney(TaoBaoUtil.getGoodsHongBaoInfo(goods, params.getShareRate(),true));
 
 		goodsInfo.setMoneyInfo(moneyInfoVO);
 

--
Gitblit v1.8.0