From c3a5e164cbabbfc5f66e1356cb0de657ce3f58b9 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期五, 20 三月 2020 13:56:02 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/service/impl/order/OrderHongBaoMoneyComputeServiceImpl.java | 18 +++++++-----------
1 files changed, 7 insertions(+), 11 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..54d0b53 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
@@ -93,7 +93,7 @@
if (rate == null)
return null;
BigDecimal baseRate = hongBaoManageService.getBaseFanliRate(placeOrderTime.getTime());
- BigDecimal officialSubsidyRate = getOfficialSubsidyRate(placeOrderTime, userLevel, false);
+ BigDecimal officialSubsidyRate = getOfficialSubsidyRate(placeOrderTime, buyerUserLevel, false);
return MoneyBigDecimalUtil.div(fanLiMoney.multiply(baseRate).multiply(rate),
baseRate.add(officialSubsidyRate).multiply(new BigDecimal(100)));
}
@@ -105,29 +105,25 @@
if (rate == null)
return null;
BigDecimal baseRate = hongBaoManageService.getBaseFanliRate(placeOrderTime.getTime());
- BigDecimal officialSubsidyRate = getOfficialSubsidyRate(placeOrderTime, userLevel, false);
+ BigDecimal officialSubsidyRate = getOfficialSubsidyRate(placeOrderTime, buyerUserLevel, false);
return MoneyBigDecimalUtil.div(fanLiMoney.multiply(baseRate).multiply(rate),
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