From 005e6b4740292ab02b262356e4b34bcad3527ab0 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期五, 28 二月 2025 17:02:56 +0800
Subject: [PATCH] 权限
---
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TContractServiceImpl.java | 8 +++++---
1 files changed, 5 insertions(+), 3 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..b427e64 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);
}
@@ -662,7 +664,7 @@
tBill.setPayFeesStatus("1");
tBill.setBillType("1");
tBill.setStartTime(beforeBill.getEndTime().plusDays(1));
- tBill.setEndTime(beforeBill.getEndTime().plusMonths(contract.getPayType().equals("1")? 1:contract.getPayType().equals("2")? 3:12));
+ tBill.setEndTime(contract.getEndTime());
billService.save(tBill);
}
--
Gitblit v1.7.1