From a18f721522817b1b1a8139ba96fc890bfbab291b Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期三, 22 四月 2020 09:46:18 +0800
Subject: [PATCH] 补贴调整
---
fanli/src/main/java/com/yeshi/fanli/controller/client/v2/UserOrderControllerV2.java | 55 +------------------------------------------------------
1 files changed, 1 insertions(+), 54 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 745188c..783f355 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
@@ -27,7 +27,6 @@
import com.yeshi.fanli.entity.order.CommonOrderGoods;
import com.yeshi.fanli.entity.order.ESOrder;
import com.yeshi.fanli.entity.order.HongBaoOrder;
-import com.yeshi.fanli.entity.order.InviteOrderSubsidy;
import com.yeshi.fanli.entity.system.ConfigKeyEnum;
import com.yeshi.fanli.entity.system.SystemCoupon.CouponTypeEnum;
import com.yeshi.fanli.entity.taobao.TaoBaoWeiQuanOrder;
@@ -40,7 +39,6 @@
import com.yeshi.fanli.service.inter.order.CommonOrderService;
import com.yeshi.fanli.service.inter.order.ESOrderService;
import com.yeshi.fanli.service.inter.order.HongBaoOrderService;
-import com.yeshi.fanli.service.inter.order.InviteOrderSubsidyService;
import com.yeshi.fanli.service.inter.order.OrderHongBaoMapService;
import com.yeshi.fanli.service.inter.order.OrderHongBaoMoneyComputeService;
import com.yeshi.fanli.service.inter.order.tb.TaoBaoWeiQuanOrderService;
@@ -98,9 +96,6 @@
@Resource
private UserVIPInfoService userVIPInfoService;
-
- @Resource
- private InviteOrderSubsidyService inviteOrderSubsidyServiceV2;
@Resource
private HongBaoOrderService hongBaoOrderService;
@@ -465,20 +460,17 @@
teamMoney = hongBaoV2CountService.getRewardMoneyToCount(uid, dateType, 3, null);
} else {
BigDecimal bonus = null;
- BigDecimal subsidy = null;
BigDecimal dividend = null; // TODO 鍒嗙孩缁熻
if (dateType == 4) { // 宸插埌璐�
dividend = new BigDecimal(0);
bonus = hongBaoV2CountService.geBonusByuid(uid, dateType, 3, 2);
- subsidy = inviteOrderSubsidyServiceV2.sumMoneyByUidAndDateAndState(uid,dateType,null,3);
} else { // 鏈け鏁�
bonus = hongBaoV2CountService.geBonusByuid(uid, dateType, 3, 4);
- subsidy = inviteOrderSubsidyServiceV2.sumValidMoneyByUidAndDate(uid,dateType,null);
}
dividend = new BigDecimal(0);
// 鎬诲洟闃熷鍔�
- teamMoney = bonus.add(subsidy).add(dividend);
+ teamMoney = bonus.add(dividend);
}
data.put("inviteMoney", teamMoney.setScale(2, BigDecimal.ROUND_DOWN).toString());
out.print(JsonUtil.loadTrueResult(data));
@@ -582,12 +574,6 @@
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<>();
@@ -637,45 +623,6 @@
} else if (type == 3) {
upperTotalMoney = upperTotalMoney.add(hongBao);
}
- }
-
-
- // 鍥㈤槦琛ヨ创
- if (type == 3) {
- BigDecimal teamSubsidy = null;
- BigDecimal lowerSubsidy = null;
- InviteOrderSubsidy inviteOrderSubsidy = inviteOrderSubsidyServiceV2.getByOrderNoAndType(uid, orderNo, sourceType);
- if (inviteOrderSubsidy != null) {
- teamSubsidy = inviteOrderSubsidy.getMoney();
- // 璁＄畻鍘熸瘮渚�
- BigDecimal originRate = orderHongBaoMoneyComputeService.getTeamSubsidyRate(downTime,buyerUserLevel, userLevel, direct);
-
- // 璁＄畻杈句汉琛ヨ创
- if (userLevel != UserLevelEnum.daRen) {
- BigDecimal daRenRate = orderHongBaoMoneyComputeService.getTeamSubsidyRate(downTime, buyerUserLevel,
- UserLevelEnum.daRen, direct);
- lowerSubsidy = MoneyBigDecimalUtil.div(teamSubsidy.multiply(daRenRate), originRate);
- }
-
- // 璁＄畻瓒呯骇浼氬憳琛ヨ创
- 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));
- }
-
- } else {
- teamSubsidy = BigDecimal.valueOf(0.00);
- lowerSubsidy = BigDecimal.valueOf(0.00);
- }
-
- if (userLevel != UserLevelEnum.daRen) {
- orderRebateVO.setOriginSubsidy("楼" + lowerSubsidy.setScale(2, BigDecimal.ROUND_DOWN));
- }
- orderRebateVO.setSubsidyDesc("鍥㈤槦琛ヨ创");
- orderRebateVO.setSubsidy("楼" + teamSubsidy.setScale(2, BigDecimal.ROUND_DOWN) +"");
-
- hongBao = hongBao.add(teamSubsidy);
}
orderRebateVO.setFanLiDesc(predictDesc + typeName);
--
Gitblit v1.8.0