From 6eaa3fec441392e59c411b1aed33fd643e15280c Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期五, 28 二月 2025 17:40:12 +0800
Subject: [PATCH] Merge branch 'master' of https://gitee.com/xiaochen991015/xizang
---
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TContractServiceImpl.java | 45 +++++++++++++++++----------------------------
1 files changed, 17 insertions(+), 28 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..ad9548e 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
@@ -206,11 +206,8 @@
rentBill.setContractId(contract.getId());
rentBill.setContractNumber(contract.getContractNumber());
rentBill.setPayableFeesTime(firstPayTime.toLocalDate());
- if (firstPayTime.toLocalDate().equals(LocalDate.now())){
- rentBill.setPayFeesStatus("1");
- }else {
- rentBill.setPayFeesStatus("2");
- }
+ rentBill.setPayFeesStatus("1");
+
rentBill.setBillType("1");
rentBill.setStartTime(contract.getStartPayTime());
TContractRentType tContractRentType = contractRentTypes.stream().filter(e -> e.getContractId().equals(contract.getId())).findFirst().orElse(null);
@@ -266,10 +263,12 @@
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());
+ long allDays = ChronoUnit.DAYS.between(contract.getStartPayTime(), rentBill.getEndTime());
rentBill.setPayableFeesMoney(contract.getMonthRent().divide(new BigDecimal(30), 2, BigDecimal.ROUND_DOWN).multiply(new BigDecimal(allDays)));
rentBill.setOutstandingMoney(rentBill.getPayableFeesMoney());
@@ -283,13 +282,10 @@
depositBill.setStartTime(contract.getStartPayTime());
depositBill.setEndTime(contract.getEndTime());
depositBill.setPayableFeesTime(firstPayTime.toLocalDate());
- if (firstPayTime.toLocalDate().equals(LocalDate.now())){
- depositBill.setPayFeesStatus("1");
- }else {
- depositBill.setPayFeesStatus("2");
+ depositBill.setPayFeesStatus("1");
- }
+
depositBill.setBillType("2");
this.updateById(contract);
billService.save(rentBill);
@@ -302,7 +298,6 @@
while(beforeBill.getEndTime().plusMonths(contract.getPayType().equals("1")? 1:contract.getPayType().equals("2")? 3:12).isBefore(contract.getEndTime())){
- beforeBill.setEndTime(beforeBill.getEndTime().plusMonths(contract.getPayType().equals("1")? 1:contract.getPayType().equals("2")? 3:12));
TBill tBill = new TBill();
tBill.setContractId(contract.getId());
tBill.setContractNumber(contract.getContractNumber());
@@ -457,10 +452,8 @@
}
}else{
- long allDays = ChronoUnit.DAYS.between(beforeBill.getEndTime(), (contract.getPayType().equals("1")?
- beforeBill.getEndTime().plusMonths(1):contract.getPayType().equals("2")?
- beforeBill.getEndTime().plusMonths(3):beforeBill.getEndTime().plusMonths(12)).with(TemporalAdjusters.lastDayOfMonth()));
- tBill.setPayableFeesMoney(contract.getMonthRent().divide(new BigDecimal(30), 2, BigDecimal.ROUND_DOWN).multiply(new BigDecimal(allDays)));
+
+ tBill.setPayableFeesMoney(contract.getMonthRent());
tBill.setOutstandingMoney(tBill.getPayableFeesMoney());
}
@@ -472,13 +465,14 @@
beforeBill.getEndTime().plusMonths(1).withDayOfMonth(15).toLocalDate():contract.getPayType().equals("2")?
beforeBill.getEndTime().plusMonths(3).withDayOfMonth(15).toLocalDate():beforeBill.getEndTime().withDayOfMonth(15).plusMonths(12).toLocalDate()));
}
- tBill.setPayFeesStatus("2");
+ tBill.setPayFeesStatus("1");
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).with(TemporalAdjusters.lastDayOfMonth()));
+ billMapper.insert(tBill);
}
- billMapper.insert(tBill);
- }
+ beforeBill.setEndTime(beforeBill.getEndTime().plusMonths(contract.getPayType().equals("1")? 1:contract.getPayType().equals("2")? 3:12));
+ }
}
} catch (Exception e) {
@@ -488,11 +482,6 @@
.last("limit 1").one();
// 生成最后一笔账单
if (!(beforeBill.getEndTime().toLocalDate().equals(contract.getEndTime().toLocalDate()))
- &&
- (contract.getPayType().equals("1")?
- beforeBill.getEndTime().plusMonths(1):contract.getPayType().equals("2")?
- beforeBill.getEndTime().plusMonths(3):beforeBill.getEndTime().plusMonths(12))
- .with(TemporalAdjusters.lastDayOfMonth()).isAfter(contract.getEndTime())
&& beforeBill.getEndTime().isBefore(contract.getEndTime())
){
TBill tBill = new TBill();
@@ -646,7 +635,7 @@
}
}else{
- long allDays = ChronoUnit.DAYS.between(beforeBill.getEndTime(), contract.getEndTime());
+ long allDays = ChronoUnit.DAYS.between(beforeBill.getEndTime().plusDays(1), contract.getEndTime());
tBill.setPayableFeesMoney(contract.getMonthRent().divide(new BigDecimal(30), 2, BigDecimal.ROUND_DOWN).multiply(new BigDecimal(allDays)));
tBill.setOutstandingMoney(tBill.getPayableFeesMoney());
@@ -662,7 +651,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