From 21dbc7f4fb714dbad1a514153a506bf0d0f73633 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期五, 28 二月 2025 17:00:48 +0800
Subject: [PATCH] 权限

---
 ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TContractServiceImpl.java |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TContractServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TContractServiceImpl.java
index 18c37d3..36d48b8 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TContractServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TContractServiceImpl.java
@@ -266,7 +266,9 @@
                 rentBill.setEndTime(contract.getEndTime());
 
             }else{
-                rentBill.setEndTime(contract.getFirstPayTime().plusMonths(contract.getPayType().equals("1")? 1:contract.getPayType().equals("2")? 3:12));
+                LocalDateTime firstPayTime1 = contract.getFirstPayTime();
+                // 将firstPayTime1的日设置为当月最后一天
+                rentBill.setEndTime(firstPayTime1.with(TemporalAdjusters.lastDayOfMonth()));
             }
             // 不走递增递减
             long allDays = ChronoUnit.DAYS.between(contract.getFirstPayTime(), rentBill.getEndTime());
@@ -475,7 +477,7 @@
                         tBill.setPayFeesStatus("2");
                         tBill.setBillType("1");
                         tBill.setStartTime(beforeBill.getEndTime().plusDays(1));
-                        tBill.setEndTime(contract.getEndTime());
+                        tBill.setEndTime(beforeBill.getEndTime().plusMonths(contract.getPayType().equals("1")? 1:contract.getPayType().equals("2")? 3:12));
                     }
                     billMapper.insert(tBill);
                 }

--
Gitblit v1.7.1