From ce50f6e9cf6eed8b250669e3c8acb9804df215da Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期四, 06 三月 2025 21:12:12 +0800
Subject: [PATCH] 权限
---
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/FlowListenerService.java | 15 +++++++++------
1 files changed, 9 insertions(+), 6 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 5c0b238..4ac1ed2 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
@@ -489,9 +489,10 @@
} else {
tBill.setPayableFeesMoney(contract.getChangeRent().multiply(new BigDecimal(contract.getPayType().equals("1") ? 1 : contract.getPayType().equals("2") ? 3 : 12)));
tBill.setOutstandingMoney(tBill.getPayableFeesMoney());
-
}
-
+ }else {
+ tBill.setPayableFeesMoney(contract.getChangeRent().multiply(new BigDecimal(contract.getPayType().equals("1") ? 1 : contract.getPayType().equals("2") ? 3 : 12)));
+ tBill.setOutstandingMoney(tBill.getPayableFeesMoney());
}
tBill.setContractNumber(contract.getContractNumber());
tBill.setPayFeesStatus("1");
@@ -634,11 +635,13 @@
tBill.setOutstandingMoney(tBill.getPayableFeesMoney());
}
}
+ }else{
+ long finalDays = ChronoUnit.DAYS.between(beforeBill.getEndTime(), contract.getEndTime());
+ tBill.setPayableFeesMoney(contract.getChangeRent().divide(new BigDecimal("30"),2,BigDecimal.ROUND_DOWN).multiply(new BigDecimal(finalDays)));
+ tBill.setOutstandingMoney(tBill.getPayableFeesMoney());
+ tBill.setContractNumber(contract.getContractNumber());
}
- long finalDays = ChronoUnit.DAYS.between(beforeBill.getEndTime(), contract.getEndTime());
- tBill.setPayableFeesMoney(contract.getChangeRent().divide(new BigDecimal("30"),2,BigDecimal.ROUND_DOWN).multiply(new BigDecimal(finalDays)));
- tBill.setOutstandingMoney(tBill.getPayableFeesMoney());
- tBill.setContractNumber(contract.getContractNumber());
+
if (beforeBill.getEndTime().plusMonths(contract.getPayType().equals("1") ? 1 : contract.getPayType().equals("2") ? 3 : 12).getDayOfMonth() <= 15) {
tBill.setPayableFeesTime(contract.getEndTime().withHour(0).withMinute(0).withSecond(0).toLocalDate());
} else {
--
Gitblit v1.7.1