From 83bb6e0580b646c5d89da1cdb4085787c8136822 Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期四, 23 四月 2020 14:29:48 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/service/manger/order/TeamDividentsSourceManager.java | 14 ++++++++++++--
1 files changed, 12 insertions(+), 2 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/service/manger/order/TeamDividentsSourceManager.java b/fanli/src/main/java/com/yeshi/fanli/service/manger/order/TeamDividentsSourceManager.java
index 19ea228..56693e6 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/manger/order/TeamDividentsSourceManager.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/manger/order/TeamDividentsSourceManager.java
@@ -1,6 +1,7 @@
package com.yeshi.fanli.service.manger.order;
import java.math.BigDecimal;
+import java.util.Date;
import java.util.List;
import javax.annotation.Resource;
@@ -63,6 +64,8 @@
if (commonOrderList.get(0).getThirdCreateTime().getTime() < Constant.NEW_ORDER_FANLI_RULE_TIME)
return;
+ Date placeOrderTime = commonOrderList.get(0).getThirdCreateTime();
+
UserLevelEnum level = UserLevelUtil.getByOrderRank(commonOrderList.get(0).getUrank());
if (level == null)
level = UserLevelEnum.daRen;
@@ -85,7 +88,8 @@
return;
// 璁＄畻鍥㈤槦鍒嗙孩姣斾緥
- List<UserTeamRate> rateList = orderHongBaoMoneyComputeService.getTeamDividentsRates(level, bossList);
+ List<UserTeamRate> rateList = orderHongBaoMoneyComputeService.getTeamDividentsRates(level, bossList,
+ placeOrderTime);
if (rateList != null)
for (UserTeamRate rate : rateList) {
BigDecimal money = MoneyBigDecimalUtil.div(rate.getRate().multiply(order.getMoney()),
@@ -100,7 +104,7 @@
}
}
// 璁＄畻浜岀骇澶栧垎绾㈡瘮渚�
- rateList = orderHongBaoMoneyComputeService.getTeamRewardMoreThan2LevelRates(level, bossList);
+ rateList = orderHongBaoMoneyComputeService.getTeamRewardMoreThan2LevelRates(level, bossList, placeOrderTime);
if (rateList != null)
for (UserTeamRate rate : rateList) {
BigDecimal money = MoneyBigDecimalUtil.div(rate.getRate().multiply(order.getMoney()),
@@ -133,6 +137,12 @@
}
}
+ @Transactional(rollbackFor = Exception.class)
+ public void invalidBySourceUid(Long sourceUid, String beiZhu) {
+ // teamDividentsSourceOrderService.invalidOrderByUid(sourceUid, beiZhu);
+ teamDividentsSourceOrderUserMapService.invalidOrderBySourceUid(sourceUid, beiZhu);
+ }
+
/**
* 璁㈠崟缁撶畻
* @Title: orderSettle
--
Gitblit v1.8.0