From d168099a592f1cc43d1425f75c4675af2e718fc0 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期三, 19 三月 2025 16:28:12 +0800
Subject: [PATCH] 账单
---
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/FlowListenerService.java | 8 +++++---
1 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/FlowListenerService.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/FlowListenerService.java
index b2e6c81..2451baf 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/FlowListenerService.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/FlowListenerService.java
@@ -956,7 +956,7 @@
LocalDateTime originalTime = tBill.getStartTime().with(TemporalAdjusters.lastDayOfMonth()).plusDays(1);
while(true){
if (originalTime.isBefore(tBill.getEndTime())){
- if (originalTime.plusMonths(1).isBefore(tContractRentType.getChangeTime())){
+ if (originalTime.plusMonths(1).isBefore(tBill.getEndTime())){
originalMoney = originalMoney.add(contract.getChangeRent());
originalTime = originalTime.plusMonths(1);
}else {
@@ -966,8 +966,10 @@
break;
}
}
- long tempOriginal = ChronoUnit.DAYS.between(originalTime,tBill.getEndTime());
- originalMoney = originalMoney.add(contract.getChangeRent().divide(new BigDecimal(30), 2, BigDecimal.ROUND_DOWN).multiply(new BigDecimal(tempOriginal)));
+ if (originalTime.isBefore(tBill.getEndTime())){
+ long tempOriginal = ChronoUnit.DAYS.between(originalTime,tBill.getEndTime());
+ originalMoney = originalMoney.add(contract.getChangeRent().divide(new BigDecimal(30), 2, BigDecimal.ROUND_DOWN).multiply(new BigDecimal(tempOriginal)));
+ }
tBill.setPayableFeesMoney(originalMoney);
tBill.setOutstandingMoney(tBill.getPayableFeesMoney());
}
--
Gitblit v1.7.1