From 3362777c96b63b38125cabe7ffcf93f125f6de94 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期二, 18 二月 2025 11:26:09 +0800
Subject: [PATCH] Merge branch 'master' of https://gitee.com/xiaochen991015/xizang
---
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TContractServiceImpl.java | 11 ++++++++---
1 files changed, 8 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 659effc..5f77e82 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
@@ -139,7 +139,7 @@
if (contract==null)return R.fail("合同不存在");
if (contract.getStatus().equals("4"))return R.fail("该合同已签订");
contract.setSignature(dto.getSignature());
- contract.setStatus("2");
+ contract.setStatus("4");
contractMapper.updateById(contract);
contract.setFirstPayTime(contract.getStartTime().plusDays(10));
List<TBill> bills = new ArrayList<>();
@@ -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