From 82ab4b1e6fc4e204b4fd7546749bdb86ceeddade Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期五, 14 二月 2025 15:37:24 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TContractServiceImpl.java | 9 +++++++--
1 files changed, 7 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 659effc..405a874 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
@@ -224,7 +224,8 @@
depositBill.setContractNumber(contract.getContractNumber());
depositBill.setPayableFeesMoney(contract.getDeposit());
depositBill.setOutstandingMoney(depositBill.getPayableFeesMoney());
-
+ depositBill.setStartTime(contract.getStartPayTime());
+ depositBill.setEndTime(contract.getEndTime());
depositBill.setPayableFeesTime(firstPayTime);
if (firstPayTime.toLocalDate().equals(LocalDate.now())){
depositBill.setPayFeesStatus("1");
@@ -241,8 +242,10 @@
try {
TBill beforeBill = billService.lambdaQuery().eq(TBill::getContractId, contract.getId()).eq(TBill::getBillType, 1).orderByDesc(TBill::getCreateTime)
.last("limit 1").one();
+ if (!beforeBill.getEndTime().toLocalDate().equals(contract.getEndTime().toLocalDate())){
+
+
while(beforeBill.getEndTime().plusMonths(contract.getPayType().equals("1")? 1:contract.getPayType().equals("2")? 3:12).isBefore(contract.getEndTime())){
- if (beforeBill.getEndTime().toLocalDate().equals(contract.getEndTime().toLocalDate()))break;
TBill tBill = new TBill();
tBill.setContractId(contract.getId());
@@ -420,6 +423,8 @@
}
billMapper.insert(tBill);
}
+ }
+
} catch (Exception e) {
e.printStackTrace();
}
--
Gitblit v1.7.1