From aac696c7caa9b9610cffec62dfc2b2e0e8f8bf50 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期五, 07 三月 2025 22:15:47 +0800
Subject: [PATCH] 账单

---
 ruoyi-system/src/main/java/com/ruoyi/system/service/impl/FlowListenerService.java |   10 +++++-----
 1 files changed, 5 insertions(+), 5 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 f50b8d0..32bbf53 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
@@ -339,7 +339,7 @@
                             break;
                     }
                     // 不需要涨租金的时间段
-                    long originalDays = Math.abs(ChronoUnit.DAYS.between(contract.getFirstPayTime(), tContractRentType.getChangeTime()))+1;
+                    long originalDays = Math.abs(ChronoUnit.DAYS.between(contract.getFirstPayTime(), tContractRentType.getChangeTime()));
                     originalMoney = originalMoney.add(contract.getMonthRent().divide(new BigDecimal(30), 2, BigDecimal.ROUND_DOWN))
                             .multiply(new BigDecimal(originalDays));
                     rentBill.setPayableFeesMoney(contractRentTypeMoney.add(originalMoney));
@@ -437,7 +437,7 @@
                                                     break;
                                             }
                                             // 不需要涨租金的时间段
-                                            long originalDays = ChronoUnit.DAYS.between(beforeBill.getEndTime(), tContractRentType.getChangeTime());
+                                            long originalDays = ChronoUnit.DAYS.between(tBill.getEndTime(), tContractRentType.getChangeTime());
                                             if (originalDays > 0) {
                                                 originalMoney = originalMoney.add(contract.getChangeRent().divide(new BigDecimal(30), 2, BigDecimal.ROUND_DOWN))
                                                         .multiply(new BigDecimal(originalDays));
@@ -490,7 +490,7 @@
                                                     break;
                                             }
                                             // 不需要涨租金的时间段
-                                            long originalDays = ChronoUnit.DAYS.between(beforeBill.getEndTime(), tContractRentType.getChangeTime());
+                                            long originalDays = ChronoUnit.DAYS.between(tBill.getEndTime(), tContractRentType.getChangeTime());
                                             System.err.println("不需要长租金时长"+originalDays);
                                             if (originalDays > 0) {
                                                 originalMoney = originalMoney.add(contract.getMonthRent().divide(new BigDecimal(30), 2, BigDecimal.ROUND_DOWN))
@@ -581,7 +581,7 @@
                                             break;
                                     }
                                     // 不需要涨租金的时间段
-                                    long originalDays = ChronoUnit.DAYS.between(beforeBill.getEndTime(), changeTime);
+                                    long originalDays = ChronoUnit.DAYS.between(tBill.getEndTime(), changeTime);
                                     if (originalDays > 0) {
                                         originalMoney = originalMoney.add(contract.getMonthRent().divide(new BigDecimal(30), 2, BigDecimal.ROUND_DOWN))
                                                 .multiply(new BigDecimal(originalDays));
@@ -632,7 +632,7 @@
                                             break;
                                     }
                                     // 不需要涨租金的时间段
-                                    long originalDays = ChronoUnit.DAYS.between(beforeBill.getEndTime(), tContractRentType.getChangeTime());
+                                    long originalDays = ChronoUnit.DAYS.between(tBill.getEndTime(), tContractRentType.getChangeTime());
                                     if (originalDays > 0) {
                                         originalMoney = originalMoney.add(contract.getMonthRent().divide(new BigDecimal(30), 2, BigDecimal.ROUND_DOWN))
                                                 .multiply(new BigDecimal(originalDays)).setScale(2,BigDecimal.ROUND_DOWN);

--
Gitblit v1.7.1