From 52a5a39966f303be57876d817561597b8c0dc6c7 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期六, 11 四月 2020 18:17:30 +0800
Subject: [PATCH] 团队收益相关规则修改
---
fanli/src/main/java/com/yeshi/fanli/service/impl/money/InviteOrderSubsidyDebtServiceImpl.java | 30 ++++++++++++++++--------------
1 files changed, 16 insertions(+), 14 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/money/InviteOrderSubsidyDebtServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/money/InviteOrderSubsidyDebtServiceImpl.java
index 2fa0e54..5f08405 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/money/InviteOrderSubsidyDebtServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/money/InviteOrderSubsidyDebtServiceImpl.java
@@ -25,7 +25,7 @@
@Resource
private InviteOrderSubsidyDebtRepayHistoryMapper inviteOrderSubsidyDebtRepayHistoryMapper;
- @Transactional(rollbackFor=Exception.class)
+ @Transactional(rollbackFor = Exception.class)
@Override
public void addDebt(InviteOrderSubsidyDebt debt) throws InviteOrderSubsidyDebtException {
if (debt == null || debt.getOriginMoney() == null || debt.getOriginMoney() == null || debt.getUid() == null) {
@@ -37,7 +37,7 @@
inviteOrderSubsidyDebtMapper.insertSelective(debt);
}
- @Transactional(rollbackFor=Exception.class)
+ @Transactional(rollbackFor = Exception.class)
@Override
public void repayDebt(Long debtId, BigDecimal money) throws InviteOrderSubsidyDebtException {
InviteOrderSubsidyDebt debt = inviteOrderSubsidyDebtMapper.selectByPrimaryKeyForUpdate(debtId);
@@ -62,15 +62,16 @@
inviteOrderSubsidyDebtRepayHistoryMapper.insertSelective(record);
}
- @Transactional(rollbackFor=Exception.class)
+ @Transactional(rollbackFor = Exception.class)
@Override
- public BigDecimal repayDebtByUid(Long uid, BigDecimal money) throws InviteOrderSubsidyDebtException {
+ public BigDecimal repayDebtByUid(Long uid, Date maxEstimatePayTime, BigDecimal money)
+ throws InviteOrderSubsidyDebtException {
// 杩橀挶
- long count = countNeedRepayDebt(uid);
+ long count = countNeedRepayDebt(uid, maxEstimatePayTime);
int page = (int) (count % 200 == 0 ? count / 200 : count / 200 + 1);
List<InviteOrderSubsidyDebt> totalList = new ArrayList<>();
for (int i = 0; i < page; i++) {
- List<InviteOrderSubsidyDebt> tempList = listNeedRepayDebt(uid, i + 1, 200);
+ List<InviteOrderSubsidyDebt> tempList = listNeedRepayDebt(uid, maxEstimatePayTime, i + 1, 200);
if (tempList != null && tempList.size() > 0) {
totalList.addAll(tempList);
}
@@ -95,23 +96,24 @@
}
}
- return leftMoney;//杩斿洖鍓╀綑鐨勮祫閲�
+ return leftMoney;// 杩斿洖鍓╀綑鐨勮祫閲�
}
@Override
- public List<InviteOrderSubsidyDebt> listNeedRepayDebt(Long uid, int page, int count) {
- return inviteOrderSubsidyDebtMapper.listByLeftMoneyAndUid(new BigDecimal("0.01"), null, uid, (page - 1) * count,
- count);
+ public List<InviteOrderSubsidyDebt> listNeedRepayDebt(Long uid, Date maxEstimatePayTime, int page, int count) {
+ return inviteOrderSubsidyDebtMapper.listByLeftMoneyAndUidAndMaxEstimatePayTime(new BigDecimal("0.01"), null,
+ uid, maxEstimatePayTime, (page - 1) * count, count);
}
@Override
- public long countNeedRepayDebt(Long uid) {
- return inviteOrderSubsidyDebtMapper.countByLeftMoneyAndUid(new BigDecimal("0.01"), null, uid);
+ public long countNeedRepayDebt(Long uid, Date maxEstimatePayTime) {
+ return inviteOrderSubsidyDebtMapper.countByLeftMoneyAndUidAndMaxEstimatePayTime(new BigDecimal("0.01"), null,
+ uid, maxEstimatePayTime);
}
@Override
- public BigDecimal getTotalDebtMoney(Long uid) {
- BigDecimal money = inviteOrderSubsidyDebtMapper.sumLeftMoneyByUid(uid);
+ public BigDecimal getTotalDebtMoney(Long uid, Date maxEstimatePayTime) {
+ BigDecimal money = inviteOrderSubsidyDebtMapper.sumLeftMoneyByUid(uid, maxEstimatePayTime);
if (money == null)
money = new BigDecimal(0);
return money;
--
Gitblit v1.8.0