From 3d92fcd729376c584a07d5f23b8e06f81fbcbcde Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 15 四月 2020 16:12:00 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/controller/client/v2/UserOrderControllerV2.java | 47 +++++++++++++++++++++++++----------------------
1 files changed, 25 insertions(+), 22 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/UserOrderControllerV2.java b/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/UserOrderControllerV2.java
index 215087f..da8b15f 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/UserOrderControllerV2.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/UserOrderControllerV2.java
@@ -581,6 +581,15 @@
userLevel = UserLevelEnum.daRen;
UserLevelEnum upperLevel = UserLevelEnum.superVIP;
+ CommonOrder commonOrder1 = hoList.get(0).getCommonOrder();
+ Date downTime = commonOrder1.getThirdCreateTime();
+ Integer urank = commonOrder1.getUrank();
+ UserLevelEnum buyerUserLevel = UserLevelUtil.getByOrderRank(urank);
+ boolean direct = false;
+ if (hongBaoV2.getType() == HongBaoV2.TYPE_YIJI || hongBaoV2.getType() == HongBaoV2.TYPE_SHARE_YIJI) {
+ direct = true;
+ }
+
BigDecimal upperTotalMoney = new BigDecimal(0);
List<GoodsRebateVO> voList = new ArrayList<>();
for (HongBaoOrder hongBaoOrder : hoList) {
@@ -604,20 +613,20 @@
payment = new BigDecimal(0);
goodsVO.setActualPay("楼" + payment.setScale(2, BigDecimal.ROUND_DOWN));
+ BigDecimal fanli = hongBaoOrder.getHongBaoV2().getMoney();
+ // 鍩虹浣ｉ噾
BigDecimal commission = orderHongBaoMoneyComputeService.computeBaseFanliMoney(commonOrder);
- if (type == 3) { // 濂栭噾
- goodsVO.setBonus("楼" + hongBaoOrder.getHongBaoV2().getMoney() +"");
- } else { // 浣ｉ噾
- goodsVO.setCommision("楼" +commission);
- }
-
- // 骞冲彴琛ヨ创
- BigDecimal vipFanli = hongBaoOrder.getHongBaoV2().getMoney();
- goodsVO.setSubsidy("楼" + vipFanli.subtract(commission).setScale(2, BigDecimal.ROUND_DOWN));
+ goodsVO.setCommision("楼" +commission.setScale(2, BigDecimal.ROUND_DOWN));
+ // 骞冲彴琛ヨ创 = 杩斿埄 - 鍩虹浣ｉ噾
+ goodsVO.setSubsidy("楼" + fanli.subtract(commission).setScale(2, BigDecimal.ROUND_DOWN));
// 杈句汉琛ヨ创
if (userLevel != UserLevelEnum.daRen) {
BigDecimal darenFanli = orderHongBaoMoneyComputeService.computeFanliMoney(commonOrder, UserLevelEnum.daRen);
goodsVO.setOriginSubsidy("楼" + darenFanli.subtract(commission).setScale(2, BigDecimal.ROUND_DOWN) + "");
+ }
+
+ if (type == 3) { // 濂栭噾
+ goodsVO.setBonus("楼" + fanli.setScale(2, BigDecimal.ROUND_DOWN) +"");
}
voList.add(goodsVO);
@@ -626,11 +635,11 @@
upperTotalMoney = upperTotalMoney.add(orderHongBaoMoneyComputeService.computeFanliMoney(commonOrder, upperLevel));
} else if (type == 2) {
upperTotalMoney = upperTotalMoney.add(orderHongBaoMoneyComputeService.computeShareMoney(commonOrder, upperLevel));
+ } else if (type == 3) {
+ upperTotalMoney = upperTotalMoney.add(hongBao);
}
}
- CommonOrder commonOrder = hoList.get(0).getCommonOrder();
- Date downTime = commonOrder.getThirdCreateTime();
// 鍥㈤槦琛ヨ创
if (type == 3) {
@@ -639,13 +648,7 @@
InviteOrderSubsidy inviteOrderSubsidy = inviteOrderSubsidyServiceV2.getByOrderNoAndType(uid, orderNo, sourceType);
if (inviteOrderSubsidy != null) {
teamSubsidy = inviteOrderSubsidy.getMoney();
- Integer urank = commonOrder.getUrank();
- UserLevelEnum buyerUserLevel = UserLevelUtil.getByOrderRank(urank);
- boolean direct = false;
- if (hongBaoV2.getType() == HongBaoV2.TYPE_YIJI || hongBaoV2.getType() == HongBaoV2.TYPE_SHARE_YIJI) {
- direct = true;
- }
-
+ // 璁＄畻鍘熸瘮渚�
BigDecimal originRate = orderHongBaoMoneyComputeService.getTeamSubsidyRate(downTime,buyerUserLevel, userLevel, direct);
// 璁＄畻杈句汉琛ヨ创
@@ -655,12 +658,13 @@
lowerSubsidy = MoneyBigDecimalUtil.div(teamSubsidy.multiply(daRenRate), originRate);
}
- if (userLevel != UserLevelEnum.superVIP && userLevel != UserLevelEnum.superVIP) {
+ // 璁＄畻瓒呯骇浼氬憳琛ヨ创
+ if (userLevel != UserLevelEnum.superVIP && userLevel != UserLevelEnum.tearcher) {
BigDecimal vipRate = orderHongBaoMoneyComputeService.getTeamSubsidyRate(downTime, buyerUserLevel,
UserLevelEnum.superVIP, direct);
upperTotalMoney = upperTotalMoney.add(MoneyBigDecimalUtil.div(teamSubsidy.multiply(vipRate), originRate));
- System.out.println(upperTotalMoney);
}
+
} else {
teamSubsidy = BigDecimal.valueOf(0.00);
lowerSubsidy = BigDecimal.valueOf(0.00);
@@ -687,9 +691,8 @@
orderRebateVO.setUserLevel(userLevel.name());
}
- // 涓婄骇杩斿埄
+ // 瓒呯骇浼氬憳杩斿埄
if (upperLevel != null) {
- upperTotalMoney = upperTotalMoney.add(hongBao);
orderRebateVO.setUpperFanLi("楼" + upperTotalMoney);
orderRebateVO.setJumpLink(upperLevel.getDetailLink());
}
--
Gitblit v1.8.0