From 0c97e8cf0e044e63668be6d0c7cf7402a16c86b1 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期五, 07 三月 2025 11:53:11 +0800
Subject: [PATCH] Merge branch 'master' of https://gitee.com/xiaochen991015/xizang
---
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/FlowListenerService.java | 64 +++++++++++++++----------------
1 files changed, 31 insertions(+), 33 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 73a6b1f..7643d30 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
@@ -290,7 +290,7 @@
rentBill.setEndTime(rentBill.getStartTime().plusMonths(contract.getPayType().equals("1") ? 1 : contract.getPayType().equals("2") ? 3 : 12).with(TemporalAdjusters.lastDayOfMonth()));
}
} else {
- rentBill.setEndTime(contract.getEndTime());
+ rentBill.setEndTime(rentBill.getStartTime().with(TemporalAdjusters.lastDayOfMonth()));
}
if (tContractRentType != null && rentBill.getEndTime().isAfter(tContractRentType.getChangeTime())) {
long moneyDays = 0;
@@ -365,12 +365,15 @@
billService.save(depositBill);
// 生成后续账单
try {
- TBill beforeBill = billService.lambdaQuery().eq(TBill::getContractId, contract.getId()).eq(TBill::getBillType, 1).orderByDesc(TBill::getCreateTime)
+ TBill beforeBill = billService.lambdaQuery().eq(TBill::getContractId, contract.getId()).eq(TBill::getBillType, 1).orderByDesc(TBill::getStartTime)
.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())) {
+ System.err.println("生成后续账单");
TBill tBill = new TBill();
tBill.setContractId(contract.getId());
+ tBill.setStartTime(beforeBill.getEndTime().plusDays(1));
+ tBill.setEndTime(beforeBill.getEndTime().plusMonths(contract.getPayType().equals("1") ? 1 : contract.getPayType().equals("2") ? 3 : 12).with(TemporalAdjusters.lastDayOfMonth()));
tBill.setContractNumber(contract.getContractNumber());
if (beforeBill.getEndTime().plusMonths(contract.getPayType().equals("1") ? 1 : contract.getPayType().equals("2") ? 3 : 12).getDayOfMonth() <= 15) {
tBill.setPayableFeesTime(contract.getEndTime().toLocalDate());
@@ -381,6 +384,7 @@
}
tBill.setContractId(contract.getId());
if (contract.getIsIncreasing()) {
+ System.err.println("执行递增递减");
if (tContractRentType != null) {
// 如果变过 并且时间在递增递减时间段内
if (contract.getChangeTime() != null) {
@@ -489,16 +493,18 @@
} else {
tBill.setPayableFeesMoney(contract.getChangeRent().multiply(new BigDecimal(contract.getPayType().equals("1") ? 1 : contract.getPayType().equals("2") ? 3 : 12)));
tBill.setOutstandingMoney(tBill.getPayableFeesMoney());
-
}
- tBill.setContractNumber(contract.getContractNumber());
- 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).with(TemporalAdjusters.lastDayOfMonth()));
- billService.save(tBill);
- beforeBill.setEndTime(beforeBill.getEndTime().plusMonths(contract.getPayType().equals("1") ? 1 : contract.getPayType().equals("2") ? 3 : 12).with(TemporalAdjusters.lastDayOfMonth()));
+ }else {
+ System.err.println("不执行递增递减");
+ tBill.setPayableFeesMoney(contract.getChangeRent().multiply(new BigDecimal(contract.getPayType().equals("1") ? 1 : contract.getPayType().equals("2") ? 3 : 12)));
+ tBill.setOutstandingMoney(tBill.getPayableFeesMoney());
}
+ tBill.setContractNumber(contract.getContractNumber());
+ tBill.setPayFeesStatus("1");
+ tBill.setBillType("1");
+
+ billService.save(tBill);
+ beforeBill.setEndTime(beforeBill.getEndTime().plusMonths(contract.getPayType().equals("1") ? 1 : contract.getPayType().equals("2") ? 3 : 12).with(TemporalAdjusters.lastDayOfMonth()));
}
}
} catch (Exception e) {
@@ -632,35 +638,35 @@
tBill.setPayableFeesMoney(contract.getChangeRent().divide(new BigDecimal("30"),2,BigDecimal.ROUND_DOWN).multiply(new BigDecimal(finalDays)));
tBill.setOutstandingMoney(tBill.getPayableFeesMoney());
}
-
-
}
- }
- tBill.setContractNumber(contract.getContractNumber());
- if (beforeBill.getEndTime().plusMonths(contract.getPayType().equals("1") ? 1 : contract.getPayType().equals("2") ? 3 : 12).getDayOfMonth() <= 15) {
- tBill.setPayableFeesTime(contract.getEndTime().withHour(0).withMinute(0).withSecond(0).toLocalDate());
- } else {
- tBill.setPayableFeesTime((contract.getPayType().equals("1") ?
- beforeBill.getEndTime().plusMonths(1).withDayOfMonth(15).toLocalDate() : contract.getPayType().equals("2") ?
- beforeBill.getEndTime().plusMonths(3).withDayOfMonth(15).toLocalDate() : beforeBill.getEndTime().withDayOfMonth(15).plusMonths(12).withHour(0).withMinute(0).withSecond(0).toLocalDate()));
+ }else{
+ long finalDays = ChronoUnit.DAYS.between(beforeBill.getEndTime(), contract.getEndTime());
+ tBill.setPayableFeesMoney(contract.getChangeRent().divide(new BigDecimal("30"),2,BigDecimal.ROUND_DOWN).multiply(new BigDecimal(finalDays)));
+ tBill.setOutstandingMoney(tBill.getPayableFeesMoney());
+ tBill.setContractNumber(contract.getContractNumber());
}
-
+ if (tBill.getEndTime().getDayOfMonth()>=15){
+ tBill.setPayableFeesTime(tBill.getStartTime().withDayOfMonth(15).toLocalDate());
+ }else if (tBill.getStartTime().getYear()==tBill.getEndTime().getYear()&& tBill.getStartTime().getMonthValue()==tBill.getEndTime().getMonthValue()){
+ // 如果同年同月 且日小于15 缴费时间取合同
+ tBill.setPayableFeesTime(tBill.getStartTime().toLocalDate());
+ }else{
+ tBill.setPayableFeesTime(tBill.getStartTime().withDayOfMonth(15).toLocalDate());
+ }
billService.save(tBill);
}
break;
}
case CATEGORY3: {
// 合同提前终止审批
- int submitStatus = status == 0 ? 4 : (status == 1 ? 6 : 5);
+ int submitStatus = status == 0 ? 4 : (status == 1 ? 7 : 5);
contractService.updateContractAuditStatus(processParameter.getString("projectId"), submitStatus);
// 生成验收记录
TContract contract = contractService.getById(processParameter.getString("projectId"));
- contract.setStatus("7");
TCheckAcceptRecord tCheckAcceptRecord = new TCheckAcceptRecord();
tCheckAcceptRecord.setContractId(contract.getId());
tCheckAcceptRecord.setHouseId(contract.getHouseId());
tCheckAcceptRecord.setLeaseReason("后台终止合同");
- tCheckAcceptRecord.setStatus(false);
tCheckAcceptRecord.setAcceptanceTime(LocalDateTime.now());
LocalDate now = LocalDate.now();
String replace = (now + "").replace("-", "");
@@ -668,16 +674,8 @@
.likeRight(TCheckAcceptRecord::getAcceptanceTime, LocalDate.now())).size();
tCheckAcceptRecord.setCode(replace.substring(2) + String.format("%03d", size + 1));
-
checkAcceptRecordMapper.insert(tCheckAcceptRecord);
- // 将所有未缴费账单设置未已失效
- List<TBill> tBills = billService.list(new LambdaQueryWrapper<TBill>()
- .ne(TBill::getPayFeesStatus, 3)
- .eq(TBill::getContractId, contract.getId()));
- for (TBill tBill : tBills) {
- tBill.setPayFeesStatus("5");
- }
- billService.updateBatchById(tBills);
+
break;
}
default:
--
Gitblit v1.7.1