From 68ca7bdcebed980fcab33d9bff3d720f30371eb6 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期五, 07 三月 2025 22:04:10 +0800
Subject: [PATCH] 账单
---
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/FlowListenerService.java | 192 ++++++++++++++++++++++++++---------------------
1 files changed, 106 insertions(+), 86 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 900b49c..f50b8d0 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
@@ -85,6 +85,15 @@
private final TBillService billService;
private final TCheckAcceptRecordMapper checkAcceptRecordMapper;
+ public static void main(String[] args) {
+// LocalDate localDate1 = LocalDate.now().withYear(2025).withMonth(4).withDayOfMonth(1);
+// LocalDate localDate2 = LocalDate.now().withYear(2025).withMonth(4).withDayOfMonth(16);
+ LocalDateTime localDate1 = LocalDateTime.now().withYear(2025).withMonth(4).withDayOfMonth(16);
+ LocalDateTime localDate2 = LocalDateTime.now().withYear(2025).withMonth(10).withDayOfMonth(24);
+
+ long between = ChronoUnit.DAYS.between(localDate1, localDate2)+1;
+ System.err.println(between);
+ }
@Override
public boolean notify(EventType eventType, Supplier<FlwTask> supplier, NodeModel nodeModel, FlowCreator flowCreator) {
FlwTask flwTask = supplier.get();
@@ -294,7 +303,7 @@
}
if (tContractRentType != null && rentBill.getEndTime().isAfter(tContractRentType.getChangeTime())) {
long moneyDays = 0;
- moneyDays = ChronoUnit.DAYS.between(tContractRentType.getChangeTime(), rentBill.getEndTime());
+ moneyDays = ChronoUnit.DAYS.between(tContractRentType.getChangeTime(), rentBill.getEndTime())+1;
// 计算租金变动的天数
contract.setChangeTime(tContractRentType.getChangeTime());
// 递增递减的租金
@@ -306,12 +315,12 @@
case 1:
switch (tContractRentType.getIncreasingDecreasing()) {
case 1:
- contractRentTypeMoney = contractRentTypeMoney.add(contract.getChangeRent().multiply(new BigDecimal(100).add(tContractRentType.getNumericalValue())).divide(new BigDecimal(100), 2, BigDecimal.ROUND_DOWN).divide(new BigDecimal(30), 2, BigDecimal.ROUND_DOWN).multiply(new BigDecimal(moneyDays)));
+ contractRentTypeMoney = contractRentTypeMoney.add(contract.getChangeRent().multiply(new BigDecimal(100).add(tContractRentType.getNumericalValue())).divide(new BigDecimal(100), 2, BigDecimal.ROUND_DOWN).divide(new BigDecimal(30), 2, BigDecimal.ROUND_DOWN).multiply(new BigDecimal(moneyDays)).setScale(2, BigDecimal.ROUND_DOWN));
// 变动后的每月租金
contract.setChangeRent(contract.getChangeRent().multiply(new BigDecimal(100).add(tContractRentType.getNumericalValue())).divide(new BigDecimal(100), 2, BigDecimal.ROUND_DOWN));
break;
case 2:
- contractRentTypeMoney = contractRentTypeMoney.add(contract.getChangeRent().multiply((new BigDecimal(100).subtract(tContractRentType.getNumericalValue()))).divide(new BigDecimal(100), 2, BigDecimal.ROUND_DOWN).divide(new BigDecimal(30), 2, BigDecimal.ROUND_DOWN).multiply(new BigDecimal(moneyDays)));
+ contractRentTypeMoney = contractRentTypeMoney.add(contract.getChangeRent().multiply((new BigDecimal(100).subtract(tContractRentType.getNumericalValue()))).divide(new BigDecimal(100), 2, BigDecimal.ROUND_DOWN).divide(new BigDecimal(30), 2, BigDecimal.ROUND_DOWN).multiply(new BigDecimal(moneyDays)).setScale(2, BigDecimal.ROUND_DOWN));
contract.setChangeRent(contract.getChangeRent().multiply((new BigDecimal(100).subtract(tContractRentType.getNumericalValue()))).divide(new BigDecimal(100), 2, BigDecimal.ROUND_DOWN));
break;
}
@@ -319,25 +328,25 @@
case 2:
switch (tContractRentType.getIncreasingDecreasing()) {
case 1:
- contractRentTypeMoney = contractRentTypeMoney.add(contract.getChangeRent().add(tContractRentType.getNumericalValue())).divide(new BigDecimal(30), 2, BigDecimal.ROUND_DOWN).multiply(new BigDecimal(moneyDays));
+ contractRentTypeMoney = contractRentTypeMoney.add(contract.getChangeRent().add(tContractRentType.getNumericalValue())).divide(new BigDecimal(30), 2, BigDecimal.ROUND_DOWN).multiply(new BigDecimal(moneyDays)).setScale(2, BigDecimal.ROUND_DOWN);
contract.setChangeRent(contract.getChangeRent().add(tContractRentType.getNumericalValue()));
break;
case 2:
- contractRentTypeMoney = contractRentTypeMoney.add(contract.getChangeRent().subtract(tContractRentType.getNumericalValue())).divide(new BigDecimal(30), 2, BigDecimal.ROUND_DOWN).multiply(new BigDecimal(moneyDays));
+ contractRentTypeMoney = contractRentTypeMoney.add(contract.getChangeRent().subtract(tContractRentType.getNumericalValue())).divide(new BigDecimal(30), 2, BigDecimal.ROUND_DOWN).multiply(new BigDecimal(moneyDays)).setScale(2, BigDecimal.ROUND_DOWN);
contract.setChangeRent(contract.getChangeRent().subtract(tContractRentType.getNumericalValue()));
break;
}
break;
}
// 不需要涨租金的时间段
- long originalDays = Math.abs(ChronoUnit.DAYS.between(contract.getFirstPayTime(), tContractRentType.getChangeTime()));
+ long originalDays = Math.abs(ChronoUnit.DAYS.between(contract.getFirstPayTime(), tContractRentType.getChangeTime()))+1;
originalMoney = originalMoney.add(contract.getMonthRent().divide(new BigDecimal(30), 2, BigDecimal.ROUND_DOWN))
.multiply(new BigDecimal(originalDays));
rentBill.setPayableFeesMoney(contractRentTypeMoney.add(originalMoney));
rentBill.setOutstandingMoney(rentBill.getPayableFeesMoney());
} else {
// 不走递增递减
- long allDays = ChronoUnit.DAYS.between(contract.getStartPayTime(), rentBill.getEndTime());
+ long allDays = ChronoUnit.DAYS.between(contract.getStartPayTime(), rentBill.getEndTime())+1;
int dayOfMonth = rentBill.getStartTime().getDayOfMonth();
if (dayOfMonth == 1) {
rentBill.setPayableFeesMoney(contract.getMonthRent().multiply(new BigDecimal(contract.getPayType().equals("1") ? 1 : contract.getPayType().equals("2") ? 3 : 12)));
@@ -369,8 +378,11 @@
.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 +393,7 @@
}
tBill.setContractId(contract.getId());
if (contract.getIsIncreasing()) {
+ System.err.println("执行递增递减");
if (tContractRentType != null) {
// 如果变过 并且时间在递增递减时间段内
if (contract.getChangeTime() != null) {
@@ -390,7 +403,7 @@
if (changeTime.isBefore(tBill.getEndTime()) && changeTime.isAfter(tBill.getStartTime())) {
contract.setChangeTime(changeTime);
// 租金递增递减的时长 天
- long moneyDays = Math.abs(ChronoUnit.DAYS.between(tContractRentType.getChangeTime(), beforeBill.getEndTime()));
+ long moneyDays = Math.abs(ChronoUnit.DAYS.between(tContractRentType.getChangeTime(), tBill.getEndTime()))+1;
// 递增递减的租金
BigDecimal contractRentTypeMoney = new BigDecimal("0");
// 不递增递减的租金
@@ -400,12 +413,12 @@
case 1:
switch (tContractRentType.getIncreasingDecreasing()) {
case 1:
- contractRentTypeMoney = contractRentTypeMoney.add(contract.getChangeRent().multiply(new BigDecimal(100).add(tContractRentType.getNumericalValue())).divide(new BigDecimal(100), 2, BigDecimal.ROUND_DOWN).divide(new BigDecimal(30), 2, BigDecimal.ROUND_DOWN).multiply(new BigDecimal(moneyDays)));
+ contractRentTypeMoney = contractRentTypeMoney.add(contract.getChangeRent().multiply(new BigDecimal(100).add(tContractRentType.getNumericalValue())).divide(new BigDecimal(100), 2, BigDecimal.ROUND_DOWN).divide(new BigDecimal(30), 2, BigDecimal.ROUND_DOWN).multiply(new BigDecimal(moneyDays)).setScale(2, BigDecimal.ROUND_DOWN));
// 变动后的每月租金
contract.setChangeRent(contract.getChangeRent().multiply(new BigDecimal(100).add(tContractRentType.getNumericalValue())).divide(new BigDecimal(100), 2, BigDecimal.ROUND_DOWN));
break;
case 2:
- contractRentTypeMoney = contractRentTypeMoney.add(contract.getChangeRent().multiply((new BigDecimal(100).subtract(tContractRentType.getNumericalValue()))).divide(new BigDecimal(100), 2, BigDecimal.ROUND_DOWN).divide(new BigDecimal(30), 2, BigDecimal.ROUND_DOWN).multiply(new BigDecimal(moneyDays)));
+ contractRentTypeMoney = contractRentTypeMoney.add(contract.getChangeRent().multiply((new BigDecimal(100).subtract(tContractRentType.getNumericalValue()))).divide(new BigDecimal(100), 2, BigDecimal.ROUND_DOWN).divide(new BigDecimal(30), 2, BigDecimal.ROUND_DOWN).multiply(new BigDecimal(moneyDays)).setScale(2, BigDecimal.ROUND_DOWN));
contract.setChangeRent(contract.getChangeRent().multiply((new BigDecimal(100).subtract(tContractRentType.getNumericalValue()))).divide(new BigDecimal(100), 2, BigDecimal.ROUND_DOWN));
break;
}
@@ -413,11 +426,11 @@
case 2:
switch (tContractRentType.getIncreasingDecreasing()) {
case 1:
- contractRentTypeMoney = contractRentTypeMoney.add(contract.getChangeRent().add(tContractRentType.getNumericalValue())).divide(new BigDecimal(30), 2, BigDecimal.ROUND_DOWN).multiply(new BigDecimal(moneyDays));
+ contractRentTypeMoney = contractRentTypeMoney.add(contract.getChangeRent().add(tContractRentType.getNumericalValue())).divide(new BigDecimal(30), 2, BigDecimal.ROUND_DOWN).multiply(new BigDecimal(moneyDays)).setScale(2, BigDecimal.ROUND_DOWN);
contract.setChangeRent(contract.getChangeRent().add(tContractRentType.getNumericalValue()));
break;
case 2:
- contractRentTypeMoney = contractRentTypeMoney.add(contract.getChangeRent().subtract(tContractRentType.getNumericalValue())).divide(new BigDecimal(30), 2, BigDecimal.ROUND_DOWN).multiply(new BigDecimal(moneyDays));
+ contractRentTypeMoney = contractRentTypeMoney.add(contract.getChangeRent().subtract(tContractRentType.getNumericalValue())).divide(new BigDecimal(30), 2, BigDecimal.ROUND_DOWN).multiply(new BigDecimal(moneyDays)).setScale(2, BigDecimal.ROUND_DOWN);
contract.setChangeRent(contract.getChangeRent().subtract(tContractRentType.getNumericalValue()));
break;
}
@@ -439,10 +452,12 @@
}
}else{
if (tContractRentType.getChangeTime().isBefore(tBill.getEndTime()) && tContractRentType.getChangeTime().isAfter(tBill.getStartTime())) {
+ System.err.println("首次递增递减");
contract.setChangeTime(tContractRentType.getChangeTime());
// 租金递增递减的时长 天
- long moneyDays = Math.abs(ChronoUnit.DAYS.between(tContractRentType.getChangeTime(), beforeBill.getEndTime()));
+ long moneyDays = Math.abs(ChronoUnit.DAYS.between(tContractRentType.getChangeTime(), tBill.getEndTime()))+1;
// 递增递减的租金
+
BigDecimal contractRentTypeMoney = new BigDecimal("0");
// 不递增递减的租金
BigDecimal originalMoney = new BigDecimal("0");
@@ -451,12 +466,12 @@
case 1:
switch (tContractRentType.getIncreasingDecreasing()) {
case 1:
- contractRentTypeMoney = contractRentTypeMoney.add(contract.getChangeRent().multiply(new BigDecimal(100).add(tContractRentType.getNumericalValue())).divide(new BigDecimal(100), 2, BigDecimal.ROUND_DOWN).divide(new BigDecimal(30), 2, BigDecimal.ROUND_DOWN).multiply(new BigDecimal(moneyDays)));
+ contractRentTypeMoney = contractRentTypeMoney.add(contract.getChangeRent().multiply(new BigDecimal(100).add(tContractRentType.getNumericalValue())).divide(new BigDecimal(100), 2, BigDecimal.ROUND_DOWN).divide(new BigDecimal(30), 2, BigDecimal.ROUND_DOWN).multiply(new BigDecimal(moneyDays)).setScale(2, BigDecimal.ROUND_DOWN));
// 变动后的每月租金
contract.setChangeRent(contract.getChangeRent().multiply(new BigDecimal(100).add(tContractRentType.getNumericalValue())).divide(new BigDecimal(100), 2, BigDecimal.ROUND_DOWN));
break;
case 2:
- contractRentTypeMoney = contractRentTypeMoney.add(contract.getChangeRent().multiply((new BigDecimal(100).subtract(tContractRentType.getNumericalValue()))).divide(new BigDecimal(100), 2, BigDecimal.ROUND_DOWN).divide(new BigDecimal(30), 2, BigDecimal.ROUND_DOWN).multiply(new BigDecimal(moneyDays)));
+ contractRentTypeMoney = contractRentTypeMoney.add(contract.getChangeRent().multiply((new BigDecimal(100).subtract(tContractRentType.getNumericalValue()))).divide(new BigDecimal(100), 2, BigDecimal.ROUND_DOWN).divide(new BigDecimal(30), 2, BigDecimal.ROUND_DOWN).multiply(new BigDecimal(moneyDays)).setScale(2, BigDecimal.ROUND_DOWN));
contract.setChangeRent(contract.getChangeRent().multiply((new BigDecimal(100).subtract(tContractRentType.getNumericalValue()))).divide(new BigDecimal(100), 2, BigDecimal.ROUND_DOWN));
break;
}
@@ -464,11 +479,11 @@
case 2:
switch (tContractRentType.getIncreasingDecreasing()) {
case 1:
- contractRentTypeMoney = contractRentTypeMoney.add(contract.getChangeRent().add(tContractRentType.getNumericalValue())).divide(new BigDecimal(30), 2, BigDecimal.ROUND_DOWN).multiply(new BigDecimal(moneyDays));
+ contractRentTypeMoney = contractRentTypeMoney.add(contract.getChangeRent().add(tContractRentType.getNumericalValue())).divide(new BigDecimal(30), 2, BigDecimal.ROUND_DOWN).multiply(new BigDecimal(moneyDays)).setScale(2, BigDecimal.ROUND_DOWN);
contract.setChangeRent(contract.getChangeRent().add(tContractRentType.getNumericalValue()));
break;
case 2:
- contractRentTypeMoney = contractRentTypeMoney.add(contract.getChangeRent().subtract(tContractRentType.getNumericalValue())).divide(new BigDecimal(30), 2, BigDecimal.ROUND_DOWN).multiply(new BigDecimal(moneyDays));
+ contractRentTypeMoney = contractRentTypeMoney.add(contract.getChangeRent().subtract(tContractRentType.getNumericalValue())).divide(new BigDecimal(30), 2, BigDecimal.ROUND_DOWN).multiply(new BigDecimal(moneyDays)).setScale(2, BigDecimal.ROUND_DOWN);
contract.setChangeRent(contract.getChangeRent().subtract(tContractRentType.getNumericalValue()));
break;
}
@@ -476,6 +491,7 @@
}
// 不需要涨租金的时间段
long originalDays = ChronoUnit.DAYS.between(beforeBill.getEndTime(), tContractRentType.getChangeTime());
+ System.err.println("不需要长租金时长"+originalDays);
if (originalDays > 0) {
originalMoney = originalMoney.add(contract.getMonthRent().divide(new BigDecimal(30), 2, BigDecimal.ROUND_DOWN))
.multiply(new BigDecimal(originalDays));
@@ -483,19 +499,24 @@
tBill.setPayableFeesMoney(contractRentTypeMoney.add(originalMoney));
tBill.setOutstandingMoney(tBill.getPayableFeesMoney());
contractService.updateById(contract);
-
+ }else{
+ tBill.setPayableFeesMoney(contract.getChangeRent().multiply(new BigDecimal(contract.getPayType().equals("1") ? 1 : contract.getPayType().equals("2") ? 3 : 12)));
+ tBill.setOutstandingMoney(tBill.getPayableFeesMoney());
}
}
} else {
tBill.setPayableFeesMoney(contract.getChangeRent().multiply(new BigDecimal(contract.getPayType().equals("1") ? 1 : contract.getPayType().equals("2") ? 3 : 12)));
tBill.setOutstandingMoney(tBill.getPayableFeesMoney());
}
+ }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");
- 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()));
}
@@ -515,6 +536,7 @@
tBill.setBillType("1");
tBill.setStartTime(beforeBill.getEndTime().plusDays(1));
tBill.setEndTime(contract.getEndTime());
+ tBill.setContractNumber(contract.getContractNumber());
if (contract.getIsIncreasing()) {
if (tContractRentType != null) {
// 如果变过 并且时间在递增递减时间段内
@@ -525,7 +547,7 @@
if (changeTime.isBefore(tBill.getEndTime()) && changeTime.isAfter(tBill.getStartTime())) {
contract.setChangeTime(changeTime);
// 租金递增递减的时长 天
- long moneyDays = Math.abs(ChronoUnit.DAYS.between(tContractRentType.getChangeTime(), beforeBill.getEndTime()));
+ long moneyDays = Math.abs(ChronoUnit.DAYS.between(changeTime, tBill.getEndTime()))+1;
// 递增递减的租金
BigDecimal contractRentTypeMoney = new BigDecimal("0");
// 不递增递减的租金
@@ -535,12 +557,12 @@
case 1:
switch (tContractRentType.getIncreasingDecreasing()) {
case 1:
- contractRentTypeMoney = contractRentTypeMoney.add(contract.getChangeRent().multiply(new BigDecimal(100).add(tContractRentType.getNumericalValue())).divide(new BigDecimal(100), 2, BigDecimal.ROUND_DOWN).divide(new BigDecimal(30), 2, BigDecimal.ROUND_DOWN).multiply(new BigDecimal(moneyDays)));
+ contractRentTypeMoney = contractRentTypeMoney.add(contract.getChangeRent().multiply(new BigDecimal(100).add(tContractRentType.getNumericalValue())).divide(new BigDecimal(100), 2, BigDecimal.ROUND_DOWN).divide(new BigDecimal(30), 2, BigDecimal.ROUND_DOWN).multiply(new BigDecimal(moneyDays)).setScale(2, BigDecimal.ROUND_DOWN));
// 变动后的每月租金
contract.setChangeRent(contract.getChangeRent().multiply(new BigDecimal(100).add(tContractRentType.getNumericalValue())).divide(new BigDecimal(100), 2, BigDecimal.ROUND_DOWN));
break;
case 2:
- contractRentTypeMoney = contractRentTypeMoney.add(contract.getChangeRent().multiply((new BigDecimal(100).subtract(tContractRentType.getNumericalValue()))).divide(new BigDecimal(100), 2, BigDecimal.ROUND_DOWN).divide(new BigDecimal(30), 2, BigDecimal.ROUND_DOWN).multiply(new BigDecimal(moneyDays)));
+ contractRentTypeMoney = contractRentTypeMoney.add(contract.getChangeRent().multiply((new BigDecimal(100).subtract(tContractRentType.getNumericalValue()))).divide(new BigDecimal(100), 2, BigDecimal.ROUND_DOWN).divide(new BigDecimal(30), 2, BigDecimal.ROUND_DOWN).multiply(new BigDecimal(moneyDays)).setScale(2, BigDecimal.ROUND_DOWN));
contract.setChangeRent(contract.getChangeRent().multiply((new BigDecimal(100).subtract(tContractRentType.getNumericalValue()))).divide(new BigDecimal(100), 2, BigDecimal.ROUND_DOWN));
break;
}
@@ -548,11 +570,62 @@
case 2:
switch (tContractRentType.getIncreasingDecreasing()) {
case 1:
- contractRentTypeMoney = contractRentTypeMoney.add(contract.getChangeRent().add(tContractRentType.getNumericalValue())).divide(new BigDecimal(30), 2, BigDecimal.ROUND_DOWN).multiply(new BigDecimal(moneyDays));
+ contractRentTypeMoney = contractRentTypeMoney.add(contract.getChangeRent().add(tContractRentType.getNumericalValue())).divide(new BigDecimal(30), 2, BigDecimal.ROUND_DOWN).multiply(new BigDecimal(moneyDays)).setScale(2, BigDecimal.ROUND_DOWN);
contract.setChangeRent(contract.getChangeRent().add(tContractRentType.getNumericalValue()));
break;
case 2:
- contractRentTypeMoney = contractRentTypeMoney.add(contract.getChangeRent().subtract(tContractRentType.getNumericalValue())).divide(new BigDecimal(30), 2, BigDecimal.ROUND_DOWN).multiply(new BigDecimal(moneyDays));
+ contractRentTypeMoney = contractRentTypeMoney.add(contract.getChangeRent().subtract(tContractRentType.getNumericalValue())).divide(new BigDecimal(30), 2, BigDecimal.ROUND_DOWN).multiply(new BigDecimal(moneyDays)).setScale(2, BigDecimal.ROUND_DOWN);
+ contract.setChangeRent(contract.getChangeRent().subtract(tContractRentType.getNumericalValue()));
+ break;
+ }
+ break;
+ }
+ // 不需要涨租金的时间段
+ long originalDays = ChronoUnit.DAYS.between(beforeBill.getEndTime(), changeTime);
+ if (originalDays > 0) {
+ originalMoney = originalMoney.add(contract.getMonthRent().divide(new BigDecimal(30), 2, BigDecimal.ROUND_DOWN))
+ .multiply(new BigDecimal(originalDays));
+ }
+ tBill.setPayableFeesMoney(contractRentTypeMoney.add(originalMoney));
+ tBill.setOutstandingMoney(tBill.getPayableFeesMoney());
+ contractService.updateById(contract);
+ } 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());
+ }
+ }else{
+ if (tContractRentType.getChangeTime().isBefore(tBill.getEndTime()) && tContractRentType.getChangeTime().isAfter(tBill.getStartTime())) {
+ contract.setChangeTime(tContractRentType.getChangeTime());
+ // 租金递增递减的时长 天
+ long moneyDays = Math.abs(ChronoUnit.DAYS.between(tContractRentType.getChangeTime(), tBill.getEndTime()))+1;
+ // 递增递减的租金
+ BigDecimal contractRentTypeMoney = new BigDecimal("0");
+ // 不递增递减的租金
+ BigDecimal originalMoney = new BigDecimal("0");
+ // 原租金
+ switch (tContractRentType.getIncreasingDecreasingType()) {
+ case 1:
+ switch (tContractRentType.getIncreasingDecreasing()) {
+ case 1:
+ contractRentTypeMoney = contractRentTypeMoney.add(contract.getChangeRent().multiply(new BigDecimal(100).add(tContractRentType.getNumericalValue())).divide(new BigDecimal(100), 2, BigDecimal.ROUND_DOWN).divide(new BigDecimal(30), 2, BigDecimal.ROUND_DOWN).multiply(new BigDecimal(moneyDays)).setScale(2, BigDecimal.ROUND_DOWN));
+ // 变动后的每月租金
+ contract.setChangeRent(contract.getChangeRent().multiply(new BigDecimal(100).add(tContractRentType.getNumericalValue())).divide(new BigDecimal(100), 2, BigDecimal.ROUND_DOWN));
+ break;
+ case 2:
+ contractRentTypeMoney = contractRentTypeMoney.add(contract.getChangeRent().multiply((new BigDecimal(100).subtract(tContractRentType.getNumericalValue()))).divide(new BigDecimal(100), 2, BigDecimal.ROUND_DOWN).divide(new BigDecimal(30), 2, BigDecimal.ROUND_DOWN).multiply(new BigDecimal(moneyDays)).setScale(2, BigDecimal.ROUND_DOWN));
+ contract.setChangeRent(contract.getChangeRent().multiply((new BigDecimal(100).subtract(tContractRentType.getNumericalValue()))).divide(new BigDecimal(100), 2, BigDecimal.ROUND_DOWN));
+ break;
+ }
+ break;
+ case 2:
+ switch (tContractRentType.getIncreasingDecreasing()) {
+ case 1:
+ contractRentTypeMoney = contractRentTypeMoney.add(contract.getChangeRent().add(tContractRentType.getNumericalValue())).divide(new BigDecimal(30), 2, BigDecimal.ROUND_DOWN).multiply(new BigDecimal(moneyDays)).setScale(2, BigDecimal.ROUND_DOWN);
+ contract.setChangeRent(contract.getChangeRent().add(tContractRentType.getNumericalValue()));
+ break;
+ case 2:
+ contractRentTypeMoney = contractRentTypeMoney.add(contract.getChangeRent().subtract(tContractRentType.getNumericalValue())).divide(new BigDecimal(30), 2, BigDecimal.ROUND_DOWN).multiply(new BigDecimal(moneyDays)).setScale(2, BigDecimal.ROUND_DOWN);
contract.setChangeRent(contract.getChangeRent().subtract(tContractRentType.getNumericalValue()));
break;
}
@@ -562,58 +635,7 @@
long originalDays = ChronoUnit.DAYS.between(beforeBill.getEndTime(), tContractRentType.getChangeTime());
if (originalDays > 0) {
originalMoney = originalMoney.add(contract.getMonthRent().divide(new BigDecimal(30), 2, BigDecimal.ROUND_DOWN))
- .multiply(new BigDecimal(originalDays));
- }
- tBill.setPayableFeesMoney(contractRentTypeMoney.add(originalMoney));
- tBill.setOutstandingMoney(tBill.getPayableFeesMoney());
- contractService.updateById(contract);
- } else {
- // 不涨租金 用上次的
- tBill.setPayableFeesMoney(contract.getChangeRent().multiply(new BigDecimal(contract.getPayType().equals("1")?1:contract.getPayType().equals("2")?3:12)));
- tBill.setOutstandingMoney(tBill.getPayableFeesMoney());
- }
- }else{
- if (tContractRentType.getChangeTime().isBefore(tBill.getEndTime()) && tContractRentType.getChangeTime().isAfter(tBill.getStartTime())) {
- contract.setChangeTime(tContractRentType.getChangeTime());
- // 租金递增递减的时长 天
- long moneyDays = Math.abs(ChronoUnit.DAYS.between(tContractRentType.getChangeTime(), beforeBill.getEndTime()));
- // 递增递减的租金
- BigDecimal contractRentTypeMoney = new BigDecimal("0");
- // 不递增递减的租金
- BigDecimal originalMoney = new BigDecimal("0");
- // 原租金
- switch (tContractRentType.getIncreasingDecreasingType()) {
- case 1:
- switch (tContractRentType.getIncreasingDecreasing()) {
- case 1:
- contractRentTypeMoney = contractRentTypeMoney.add(contract.getChangeRent().multiply(new BigDecimal(100).add(tContractRentType.getNumericalValue())).divide(new BigDecimal(100), 2, BigDecimal.ROUND_DOWN).divide(new BigDecimal(30), 2, BigDecimal.ROUND_DOWN).multiply(new BigDecimal(moneyDays)));
- // 变动后的每月租金
- contract.setChangeRent(contract.getChangeRent().multiply(new BigDecimal(100).add(tContractRentType.getNumericalValue())).divide(new BigDecimal(100), 2, BigDecimal.ROUND_DOWN));
- break;
- case 2:
- contractRentTypeMoney = contractRentTypeMoney.add(contract.getChangeRent().multiply((new BigDecimal(100).subtract(tContractRentType.getNumericalValue()))).divide(new BigDecimal(100), 2, BigDecimal.ROUND_DOWN).divide(new BigDecimal(30), 2, BigDecimal.ROUND_DOWN).multiply(new BigDecimal(moneyDays)));
- contract.setChangeRent(contract.getChangeRent().multiply((new BigDecimal(100).subtract(tContractRentType.getNumericalValue()))).divide(new BigDecimal(100), 2, BigDecimal.ROUND_DOWN));
- break;
- }
- break;
- case 2:
- switch (tContractRentType.getIncreasingDecreasing()) {
- case 1:
- contractRentTypeMoney = contractRentTypeMoney.add(contract.getChangeRent().add(tContractRentType.getNumericalValue())).divide(new BigDecimal(30), 2, BigDecimal.ROUND_DOWN).multiply(new BigDecimal(moneyDays));
- contract.setChangeRent(contract.getChangeRent().add(tContractRentType.getNumericalValue()));
- break;
- case 2:
- contractRentTypeMoney = contractRentTypeMoney.add(contract.getChangeRent().subtract(tContractRentType.getNumericalValue())).divide(new BigDecimal(30), 2, BigDecimal.ROUND_DOWN).multiply(new BigDecimal(moneyDays));
- contract.setChangeRent(contract.getChangeRent().subtract(tContractRentType.getNumericalValue()));
- break;
- }
- break;
- }
- // 不需要涨租金的时间段
- long originalDays = ChronoUnit.DAYS.between(beforeBill.getEndTime(), tContractRentType.getChangeTime());
- if (originalDays > 0) {
- originalMoney = originalMoney.add(contract.getChangeRent().divide(new BigDecimal(30), 2, BigDecimal.ROUND_DOWN))
- .multiply(new BigDecimal(originalDays));
+ .multiply(new BigDecimal(originalDays)).setScale(2,BigDecimal.ROUND_DOWN);
}
tBill.setPayableFeesMoney(contractRentTypeMoney.add(originalMoney));
tBill.setOutstandingMoney(tBill.getPayableFeesMoney());
@@ -636,17 +658,15 @@
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 (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()));
+ 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;
--
Gitblit v1.7.1