From 0d91bad397c1a1b41bc77d9cd9f7555ed78f7f1a Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期四, 19 三月 2020 16:57:48 +0800
Subject: [PATCH] 团队奖励相关机制建立

---
 fanli/src/main/java/com/yeshi/fanli/service/impl/order/OrderHongBaoMoneyComputeServiceImpl.java |   14 +++++---------
 1 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/order/OrderHongBaoMoneyComputeServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/order/OrderHongBaoMoneyComputeServiceImpl.java
index 4273391..3b2750c 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/order/OrderHongBaoMoneyComputeServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/order/OrderHongBaoMoneyComputeServiceImpl.java
@@ -110,24 +110,20 @@
 				baseRate.add(officialSubsidyRate).multiply(new BigDecimal(100)));
 	}
 
-	public BigDecimal computeFirstTeamReward(BigDecimal firstTeamSubsidy, Date placeOrderTime,
-			BigDecimal secondTeamSubsidy, UserLevelEnum userLevel) {
+	@Override
+	public BigDecimal computeFirstTeamReward(BigDecimal money, Date placeOrderTime, UserLevelEnum userLevel) {
 
 		if (userLevel != UserLevelEnum.superVIP)
 			return null;
 
 		BigDecimal firstRate = getTeamRewardRate(placeOrderTime, userLevel, true);
-		BigDecimal secondRate = getTeamRewardRate(placeOrderTime, userLevel, false);
 
-		if (firstRate == null || secondRate == null)
+		if (firstRate == null)
 			return null;
 
-		BigDecimal firstReward = MoneyBigDecimalUtil.div(MoneyBigDecimalUtil.mul(secondRate, firstTeamSubsidy),
-				new BigDecimal(100));
-		BigDecimal secondReward = MoneyBigDecimalUtil.div(MoneyBigDecimalUtil.mul(firstRate, secondTeamSubsidy),
-				new BigDecimal(100));
+		BigDecimal reward = MoneyBigDecimalUtil.div(MoneyBigDecimalUtil.mul(firstRate, money), new BigDecimal(100));
 
-		return firstReward.add(secondReward);
+		return reward;
 	}
 
 	/**

--
Gitblit v1.8.0