From e135f00a19b166ad035b45f5b998d3483febe659 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期二, 18 三月 2025 18:43:02 +0800
Subject: [PATCH] 账单

---
 ruoyi-system/src/main/java/com/ruoyi/system/service/impl/FlowListenerService.java |  772 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-
 1 files changed, 758 insertions(+), 14 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 48bf079..b2e6c81 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
@@ -30,15 +30,22 @@
 import com.ruoyi.common.enums.ProcessCategoryEnum;
 import com.ruoyi.common.enums.SubmitStatusEnum;
 import com.ruoyi.common.exception.ServiceException;
-import com.ruoyi.system.service.ISysRoleService;
-import com.ruoyi.system.service.TContractService;
+import com.ruoyi.system.mapper.TCheckAcceptRecordMapper;
+import com.ruoyi.system.model.*;
+import com.ruoyi.system.service.*;
 import com.ruoyi.system.task.base.QuartzManager;
 import com.ruoyi.system.task.base.TimeJobType;
 import com.ruoyi.system.task.jobs.StateProcessJob;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
+import java.math.BigDecimal;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.time.temporal.ChronoUnit;
+import java.time.temporal.TemporalAdjusters;
 import java.util.*;
 import java.util.function.Supplier;
 import java.util.stream.Collectors;
@@ -68,7 +75,26 @@
     private final ISysRoleService sysRoleService;
     private final FlwTaskMapper flwTaskMapper;
     private final TContractService contractService;
+    private final TContractRentTypeService contractRentTypeService;
+    private final TBillService billService;
+    private final TCheckAcceptRecordMapper checkAcceptRecordMapper;
+    private final THouseService houseService;
 
+    public static void main(String[] args) {
+        LocalDate localDate1 = LocalDate.now().withYear(2025).withMonth(1).withDayOfMonth(31);
+        System.err.println(localDate1.plusMonths(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;
+        int monthValue = LocalDateTime.now().getMonthValue();
+         LocalDateTime.now();
+         LocalDateTime.now();
+
+        System.err.println(LocalDateTime.now().isBefore(LocalDateTime.now()));
+    }
 
     @Override
     public boolean notify(EventType eventType, Supplier<FlwTask> supplier, NodeModel nodeModel, FlowCreator flowCreator) {
@@ -101,7 +127,7 @@
                             new ImmutableMap.Builder<String, Long>().
                                     put("id", flwTask.getId())
                                     .build();
-                    QuartzManager.addJob(StateProcessJob.class, (StateProcessJob.name+flwTask.getId()).toUpperCase(), TimeJobType.AUTO_AUDIT,new Date(new Date().getTime()+10*1000L), maps);
+                    QuartzManager.addJob(StateProcessJob.class, (StateProcessJob.name + flwTask.getId()).toUpperCase(), TimeJobType.AUTO_AUDIT, new Date(new Date().getTime() + 48 * 60 * 60 * 1000L), maps);
 
 
                     //对比发起人和节点审批人
@@ -124,9 +150,9 @@
                     List<String> roleIds = nodeAssigneeList.stream().map(NodeAssignee::getId).collect(Collectors.toList());
                     List<SysRole> actorList = sysRoleService.selectRoleByUserIds(roleIds);
                     List<FlwTaskActor> flwTaskActors = new ArrayList<>();
-                    if(ObjectUtils.isNotEmpty(actorList)) {
+                    if (ObjectUtils.isNotEmpty(actorList)) {
                         for (SysRole sysRole : actorList) {
-                            if(ObjectUtil.isEmpty(sysRole.getRoleName())) {
+                            if (ObjectUtil.isEmpty(sysRole.getRoleName())) {
                                 continue;
                             }
                             NodeAssignee nodeAssignee = new NodeAssignee();
@@ -152,7 +178,7 @@
                             new ImmutableMap.Builder<String, Long>().
                                     put("id", flwTask.getId())
                                     .build();
-                    QuartzManager.addJob(StateProcessJob.class, (StateProcessJob.name+flwTask.getId()).toUpperCase(), TimeJobType.AUTO_AUDIT,new Date(new Date().getTime()+10*1000L), maps);
+                    QuartzManager.addJob(StateProcessJob.class, (StateProcessJob.name + flwTask.getId()).toUpperCase(), TimeJobType.AUTO_AUDIT, new Date(new Date().getTime() + 48 * 60 * 60 * 1000L), maps);
 
 
                     //对比发起人和节点审批人
@@ -185,8 +211,8 @@
                 log.error("节点不存在 TaskName:{} InstanceId:{}", flwTask.getTaskName(), flwTask.getInstanceId());
                 return true;
             }
-            long count = flwTaskMapper.selectCount(new LambdaQueryWrapper<FlwTask>().eq(FlwTask::getInstanceId,flwTask.getInstanceId()));
-            if(count > 0){
+            long count = flwTaskMapper.selectCount(new LambdaQueryWrapper<FlwTask>().eq(FlwTask::getInstanceId, flwTask.getInstanceId()));
+            if (count > 0) {
                 return true;
             }
             //最后一个节点
@@ -209,7 +235,7 @@
                 System.out.println("流程完成:" + flwTask.getVariable());
                 handlerBusiness(flwTask.getVariable(), 1);
             }
-        } else if(eventType.eq(EventType.autoJump)){
+        } else if (eventType.eq(EventType.autoJump)) {
             // 查询流程模型 自动跳转
             FlwExtInstance flwExtInstance = flwExtInstanceMapper.selectById(flwTask.getInstanceId());
             String modelContent = flwExtInstance.getModelContent();
@@ -219,8 +245,8 @@
                 log.error("节点不存在 TaskName:{} InstanceId:{}", flwTask.getTaskName(), flwTask.getInstanceId());
                 return true;
             }
-            long count = flwTaskMapper.selectCount(new LambdaQueryWrapper<FlwTask>().eq(FlwTask::getInstanceId,flwTask.getInstanceId()));
-            if(count > 0){
+            long count = flwTaskMapper.selectCount(new LambdaQueryWrapper<FlwTask>().eq(FlwTask::getInstanceId, flwTask.getInstanceId()));
+            if (count > 0) {
                 return true;
             }
             //最后一个节点
@@ -231,6 +257,7 @@
         }
         return true;
     }
+
 
     /**
      * 业务状态变更
@@ -244,21 +271,738 @@
         switch (categoryEnum) {
             case CATEGORY1: {
                 // 合同新增审批
-                int submitStatus = status==0?2:(status==1?3:5);
+                int submitStatus = status == 0 ? 2 : (status == 1 ? 3 : 1);
                 contractService.updateContractAuditStatus(processParameter.getString("projectId"), submitStatus);
                 // TODO 发短信
                 break;
             }
             case CATEGORY2: {
                 // 合同签订审批
-                int submitStatus = status==0?3:(status==1?4:5);
+                int submitStatus = status == 0 ? 3 : (status == 1 ? 4 : 1);
                 contractService.updateContractAuditStatus(processParameter.getString("projectId"), submitStatus);
+                TContract contract = contractService.getById(processParameter.getString("projectId"));
+                if (contract.getStatus().equals("4")) {
+
+                    // 修改房屋状态
+                    THouse house = houseService.getById(contract.getHouseId());
+                    if (Objects.nonNull(house)) {
+                        house.setLeaseStatus("2");
+                        houseService.updateById(house);
+                    }
+                    List<TContractRentType> contractRentTypes = contractRentTypeService.list();
+                    TContractRentType tContractRentType = contractRentTypes.stream().filter(e -> e.getContractId().equals(contract.getId())).findFirst().orElse(null);
+
+                    // 生成第一笔账单
+                    // 第一次应缴费日期
+                    LocalDateTime firstPayTime = contract.getStartTime().plusDays(10).withHour(0).withMinute(0).withSecond(0);
+                    TBill rentBill = new TBill();
+                    rentBill.setContractId(contract.getId());
+                    rentBill.setContractNumber(contract.getContractNumber());
+                    rentBill.setPayableFeesTime(firstPayTime.toLocalDate());
+                    rentBill.setPayFeesStatus("1");
+                    rentBill.setBillType("1");
+                    rentBill.setStartTime(contract.getStartPayTime());
+                    if (contract.getPayType().equals("2")) {
+                        // 季付 取3 6 9 12
+                        int temp = 0 ;
+                        if (contract.getStartPayTime().getMonthValue() <= 3 ) {
+                            temp = 3;
+                        } else if (contract.getStartPayTime().getMonthValue() <= 6) {
+                            temp = 6;
+                        } else if (contract.getStartPayTime().getMonthValue() <= 9) {
+                            temp = 9;
+                        } else {
+                            temp = 12;
+                        }
+                        if (contract.getEndTime().isAfter(contract.getStartPayTime().withMonth(temp).with(TemporalAdjusters.lastDayOfMonth()))){
+                            rentBill.setEndTime(contract.getStartPayTime().withMonth(temp).with(TemporalAdjusters.lastDayOfMonth()));
+                        }else {
+                            rentBill.setEndTime(contract.getEndTime());
+                        }
+                    } else if (contract.getPayType().equals("3")) {
+                        if (contract.getEndTime().isAfter(contract.getStartPayTime().withMonth(12).with(TemporalAdjusters.lastDayOfMonth()))){
+                            rentBill.setEndTime(contract.getStartPayTime().withMonth(12).with(TemporalAdjusters.lastDayOfMonth()));
+                        }else {
+                            rentBill.setEndTime(contract.getEndTime());
+                        }
+                    } else {
+                        rentBill.setEndTime(rentBill.getStartTime().with(TemporalAdjusters.lastDayOfMonth()));
+                    }
+                    if (tContractRentType != null && rentBill.getEndTime().isAfter(tContractRentType.getChangeTime())){
+                        long moneyDays = 0;
+                        if (tContractRentType.getChangeTime().with(TemporalAdjusters.lastDayOfMonth()).isBefore(rentBill.getEndTime())){
+                            moneyDays = ChronoUnit.DAYS.between(tContractRentType.getChangeTime(), tContractRentType.getChangeTime().with(TemporalAdjusters.lastDayOfMonth())) + 1;
+                        }else{
+                            moneyDays = ChronoUnit.DAYS.between(tContractRentType.getChangeTime(),rentBill.getEndTime()) + 1;
+                        }
+                        // 计算租金变动的天数
+                        contract.setChangeTime(tContractRentType.getChangeTime());
+                        // 递增递减的租金
+                        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;
+                                }
+                                break;
+                        }
+                        LocalDateTime localDateTime = tContractRentType.getChangeTime().with(TemporalAdjusters.lastDayOfMonth()).plusDays(1);
+                        while(true){
+                            if (localDateTime.isBefore(rentBill.getEndTime())){
+                                if (localDateTime.plusMonths(1).isBefore(rentBill.getEndTime())){
+                                    contractRentTypeMoney = contractRentTypeMoney.add(contract.getChangeRent());
+                                    localDateTime = localDateTime.plusMonths(1);
+                                }else {
+                                    break;
+                                }
+                            }else{
+                                break;
+                            }
+                        }
+                        long temp  = ChronoUnit.DAYS.between(localDateTime,rentBill.getEndTime()) + 1;
+                        contractRentTypeMoney = contractRentTypeMoney.add(contract.getChangeRent().divide(new BigDecimal(30), 2, BigDecimal.ROUND_DOWN).multiply(new BigDecimal(temp)));
+                        // 不需要涨租金的时间段
+                        long originalDays = 0;
+                        if (contract.getFirstPayTime().with(TemporalAdjusters.lastDayOfMonth()).isBefore(tContractRentType.getChangeTime())){
+                            originalDays = Math.abs(ChronoUnit.DAYS.between(contract.getFirstPayTime(), contract.getFirstPayTime().with(TemporalAdjusters.lastDayOfMonth())));
+                        }else{
+                            originalDays = Math.abs(ChronoUnit.DAYS.between(contract.getFirstPayTime(), tContractRentType.getChangeTime()));
+                        }
+                        originalMoney = originalMoney.add(contract.getMonthRent().divide(new BigDecimal(30), 2, BigDecimal.ROUND_DOWN).multiply(new BigDecimal(originalDays)));
+                        LocalDateTime originalTime = contract.getFirstPayTime().with(TemporalAdjusters.lastDayOfMonth()).plusDays(1);
+                        while(true){
+                            if (originalTime.isBefore(tContractRentType.getChangeTime())){
+                                if (originalTime.plusMonths(1).isBefore(tContractRentType.getChangeTime())){
+                                    originalMoney = originalMoney.add(contract.getMonthRent());
+                                    originalTime = originalTime.plusMonths(1);
+                                }else {
+                                    break;
+                                }
+                            }else{
+                                break;
+                            }
+                        }
+                        long tempOriginal  = ChronoUnit.DAYS.between(localDateTime,tContractRentType.getChangeTime()) ;
+                        originalMoney = originalMoney.add(contract.getChangeRent().divide(new BigDecimal(30), 2, BigDecimal.ROUND_DOWN).multiply(new BigDecimal(tempOriginal)));
+                        rentBill.setPayableFeesMoney(contractRentTypeMoney.add(originalMoney));
+                        rentBill.setOutstandingMoney(rentBill.getPayableFeesMoney());
+                    } else {
+                        // 不走递增递减
+                        if (contract.getPayType().equals("2")){
+                            BigDecimal money = new BigDecimal("0");
+                            // 第一个月计算天
+                            int dayOfMonth = rentBill.getStartTime().getDayOfMonth();
+                            if (dayOfMonth == 1) {
+                                money = money.add(contract.getMonthRent());
+                            } else {
+                                long allDays = ChronoUnit.DAYS.between(contract.getStartPayTime(), contract.getStartPayTime().with(TemporalAdjusters.lastDayOfMonth())) + 1;
+                                money =money.add(contract.getMonthRent().divide(new BigDecimal(30), 2, BigDecimal.ROUND_DOWN).multiply(new BigDecimal(allDays)));
+                            }
+                            // 后续
+                            if (contract.getStartPayTime().getMonthValue()==3||contract.getStartPayTime().getMonthValue()==6||contract.getStartPayTime().getMonthValue()==9||contract.getStartPayTime().getMonthValue()==12){
+                                rentBill.setPayableFeesMoney(money);
+                                rentBill.setOutstandingMoney(rentBill.getPayableFeesMoney());
+                            }else{
+                                LocalDateTime localDateTime = rentBill.getStartTime().plusMonths(1).with(TemporalAdjusters.lastDayOfMonth());
+                                while (true){
+                                    if (localDateTime.isBefore(rentBill.getEndTime())){
+                                        money = money.add(contract.getMonthRent());
+                                    }else{
+                                        money = money.add(contract.getMonthRent().divide(new BigDecimal(30), 2, BigDecimal.ROUND_DOWN).multiply(new BigDecimal(ChronoUnit.DAYS.between(rentBill.getEndTime(),localDateTime.with(TemporalAdjusters.firstDayOfMonth()))+1)));
+                                        break;
+                                    }
+                                    localDateTime = localDateTime.plusMonths(1).with(TemporalAdjusters.lastDayOfMonth());
+                                }
+                                rentBill.setPayableFeesMoney(money);
+                                rentBill.setOutstandingMoney(rentBill.getPayableFeesMoney());
+                            }
+                        }else if (contract.getPayType().equals("3")){
+                            BigDecimal money = new BigDecimal("0");
+                            // 第一个月计算天
+                            int dayOfMonth = rentBill.getStartTime().getDayOfMonth();
+                            if (dayOfMonth == 1) {
+                                money = money.add(contract.getMonthRent());
+                            } else {
+                                long allDays = ChronoUnit.DAYS.between(contract.getStartPayTime(), contract.getStartPayTime().with(TemporalAdjusters.lastDayOfMonth())) + 1;
+                                money =money.add(contract.getMonthRent().divide(new BigDecimal(30), 2, BigDecimal.ROUND_DOWN).multiply(new BigDecimal(allDays)));
+                            }
+                            // 后续
+                            if (contract.getStartPayTime().getMonthValue()==12){
+                                rentBill.setPayableFeesMoney(money);
+                                rentBill.setOutstandingMoney(rentBill.getPayableFeesMoney());
+                            }else{
+                                LocalDateTime localDateTime = rentBill.getStartTime().plusMonths(1).with(TemporalAdjusters.lastDayOfMonth());
+                                while (true){
+                                    if (localDateTime.isBefore(rentBill.getEndTime())){
+                                        money = money.add(contract.getMonthRent());
+                                    }else{
+                                        money = money.add(contract.getMonthRent().divide(new BigDecimal(30), 2, BigDecimal.ROUND_DOWN).multiply(new BigDecimal(ChronoUnit.DAYS.between(rentBill.getEndTime(),localDateTime.with(TemporalAdjusters.firstDayOfMonth()))+1)));
+                                        break;
+                                    }
+                                    localDateTime = localDateTime.plusMonths(1).with(TemporalAdjusters.lastDayOfMonth());
+                                }
+                                rentBill.setPayableFeesMoney(money);
+                                rentBill.setOutstandingMoney(rentBill.getPayableFeesMoney());
+                            }
+                        }else {
+                            long allDays = ChronoUnit.DAYS.between(contract.getStartPayTime(), rentBill.getEndTime()) + 1;
+                            int dayOfMonth = rentBill.getStartTime().getDayOfMonth();
+                            if (dayOfMonth == 1) {
+                                rentBill.setPayableFeesMoney(contract.getMonthRent());
+                            } else {
+                                rentBill.setPayableFeesMoney(contract.getMonthRent().divide(new BigDecimal(30), 2, BigDecimal.ROUND_DOWN).multiply(new BigDecimal(allDays)));
+                            }
+                            rentBill.setOutstandingMoney(rentBill.getPayableFeesMoney());
+                        }
+                    }
+                    // 押金账单
+                    TBill depositBill = new TBill();
+                    depositBill.setContractId(contract.getId());
+                    depositBill.setContractNumber(contract.getContractNumber());
+                    depositBill.setPayableFeesMoney(contract.getDeposit());
+                    depositBill.setOutstandingMoney(depositBill.getPayableFeesMoney());
+                    depositBill.setStartTime(contract.getStartPayTime());
+                    depositBill.setEndTime(contract.getEndTime());
+                    depositBill.setPayableFeesTime(firstPayTime.toLocalDate());
+
+                    depositBill.setPayFeesStatus("1");
+
+
+                    depositBill.setBillType("2");
+                    contractService.updateById(contract);
+                    billService.save(rentBill);
+                    billService.save(depositBill);
+                    // 生成后续账单
+                    try {
+                        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());
+                                } else {
+                                    tBill.setPayableFeesTime(beforeBill.getEndTime().plusMonths(1).withDayOfMonth(15).toLocalDate());
+                                }
+                                tBill.setContractId(contract.getId());
+                                if (contract.getIsIncreasing()) {
+                                    System.err.println("执行递增递减");
+                                    if (tContractRentType != null) {
+                                        // 如果变过 并且时间在递增递减时间段内
+                                        if (contract.getChangeTime() != null) {
+                                            // 下次递增递减时间
+                                            LocalDateTime changeTime = contract.getChangeTime().plusYears(tContractRentType.getCycleTime());
+                                            // 之前已经涨、跌过租金了 需要判断周期是否还需要再涨、跌
+                                            if (changeTime.isBefore(tBill.getEndTime()) && changeTime.isAfter(tBill.getStartTime())) {
+                                                contract.setChangeTime(changeTime);
+                                                long moneyDays = 0;
+                                                if (changeTime.with(TemporalAdjusters.lastDayOfMonth()).isBefore(tBill.getEndTime())){
+                                                    moneyDays = ChronoUnit.DAYS.between(changeTime, changeTime.with(TemporalAdjusters.lastDayOfMonth())) + 1;
+                                                }else{
+                                                    moneyDays = ChronoUnit.DAYS.between(changeTime,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;
+                                                        }
+                                                        break;
+                                                }
+                                                LocalDateTime localDateTime = changeTime.with(TemporalAdjusters.lastDayOfMonth()).plusDays(1);
+                                                while(true){
+                                                    if (localDateTime.isBefore(tBill.getEndTime())){
+                                                        if (localDateTime.plusMonths(1).isBefore(tBill.getEndTime())){
+                                                            contractRentTypeMoney = contractRentTypeMoney.add(contract.getChangeRent());
+                                                            localDateTime = localDateTime.plusMonths(1);
+                                                        }else {
+                                                            break;
+                                                        }
+                                                    }else{
+                                                        break;
+                                                    }
+                                                }
+                                                long temp  = ChronoUnit.DAYS.between(localDateTime,tBill.getEndTime()) + 1;
+                                                contractRentTypeMoney = contractRentTypeMoney.add(contract.getChangeRent().divide(new BigDecimal(30), 2, BigDecimal.ROUND_DOWN).multiply(new BigDecimal(temp)));
+                                                // 不需要涨租金的时间段
+                                                long originalDays = 0;
+                                                if (tBill.getStartTime().with(TemporalAdjusters.lastDayOfMonth()).isBefore(changeTime)){
+                                                    originalDays = Math.abs(ChronoUnit.DAYS.between(tBill.getStartTime(), tBill.getStartTime().with(TemporalAdjusters.lastDayOfMonth())));
+                                                }else{
+                                                    originalDays = Math.abs(ChronoUnit.DAYS.between(tBill.getStartTime(), changeTime));
+                                                }
+                                                originalMoney = originalMoney.add(contract.getChangeRent().divide(new BigDecimal(30), 2, BigDecimal.ROUND_DOWN).multiply(new BigDecimal(originalDays)));
+                                                LocalDateTime originalTime = tBill.getStartTime().with(TemporalAdjusters.lastDayOfMonth()).plusDays(1);
+                                                while(true){
+                                                    if (originalTime.isBefore(changeTime)){
+                                                        if (originalTime.plusMonths(1).isBefore(changeTime)){
+                                                            originalMoney = originalMoney.add(contract.getChangeRent());
+                                                            originalTime = originalTime.plusMonths(1);
+                                                        }else {
+                                                            break;
+                                                        }
+                                                    }else{
+                                                        break;
+                                                    }
+                                                }
+                                                long tempOriginal  = ChronoUnit.DAYS.between(originalTime,changeTime);
+                                                originalMoney = originalMoney.add(contract.getChangeRent().divide(new BigDecimal(30), 2, BigDecimal.ROUND_DOWN).multiply(new BigDecimal(tempOriginal)));
+
+                                                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())) {
+                                                System.err.println("首次递增递减");
+                                                contract.setChangeTime(tContractRentType.getChangeTime());
+                                                // 租金递增递减的时长 天
+                                                long moneyDays = 0 ;
+                                                if (tContractRentType.getChangeTime().with(TemporalAdjusters.lastDayOfMonth()).isBefore(rentBill.getEndTime())){
+                                                    moneyDays = ChronoUnit.DAYS.between(tContractRentType.getChangeTime(), tContractRentType.getChangeTime().with(TemporalAdjusters.lastDayOfMonth())) + 1;
+                                                }else{
+                                                    moneyDays = ChronoUnit.DAYS.between(tContractRentType.getChangeTime(),rentBill.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;
+                                                        }
+                                                        break;
+                                                }
+                                                LocalDateTime localDateTime = tContractRentType.getChangeTime().with(TemporalAdjusters.lastDayOfMonth()).plusDays(1);
+                                                while(true){
+                                                    if (localDateTime.isBefore(tBill.getEndTime())){
+                                                        if (localDateTime.plusMonths(1).isBefore(tBill.getEndTime())){
+                                                            contractRentTypeMoney = contractRentTypeMoney.add(contract.getChangeRent());
+                                                            localDateTime = localDateTime.plusMonths(1);
+                                                        }else {
+                                                            break;
+                                                        }
+                                                    }else{
+                                                        break;
+                                                    }
+                                                }
+                                                long temp  = ChronoUnit.DAYS.between(localDateTime,tBill.getEndTime()) + 1;
+                                                contractRentTypeMoney = contractRentTypeMoney.add(contract.getChangeRent().divide(new BigDecimal(30), 2, BigDecimal.ROUND_DOWN).multiply(new BigDecimal(temp)));
+
+                                                // 不需要涨租金的时间段
+                                                long originalDays = 0;
+                                                if (tBill.getStartTime().with(TemporalAdjusters.lastDayOfMonth()).isBefore(tContractRentType.getChangeTime())){
+                                                    originalDays = Math.abs(ChronoUnit.DAYS.between(tBill.getStartTime(), tBill.getStartTime().with(TemporalAdjusters.lastDayOfMonth())));
+                                                }else{
+                                                    originalDays = Math.abs(ChronoUnit.DAYS.between(tBill.getStartTime(), tContractRentType.getChangeTime()));
+                                                }
+                                                originalMoney = originalMoney.add(contract.getMonthRent().divide(new BigDecimal(30), 2, BigDecimal.ROUND_DOWN).multiply(new BigDecimal(originalDays)));
+                                                LocalDateTime originalTime = contract.getFirstPayTime().with(TemporalAdjusters.lastDayOfMonth()).plusDays(1);
+                                                while(true){
+                                                    if (originalTime.isBefore(tContractRentType.getChangeTime())){
+                                                        if (originalTime.plusMonths(1).isBefore(tContractRentType.getChangeTime())){
+                                                            originalMoney = originalMoney.add(contract.getMonthRent());
+                                                            originalTime = originalTime.plusMonths(1);
+                                                        }else {
+                                                            break;
+                                                        }
+                                                    }else{
+                                                        break;
+                                                    }
+                                                }
+                                                long tempOriginal  = ChronoUnit.DAYS.between(originalTime,tContractRentType.getChangeTime()) ;
+                                                originalMoney = originalMoney.add(contract.getChangeRent().divide(new BigDecimal(30), 2, BigDecimal.ROUND_DOWN).multiply(new BigDecimal(tempOriginal)));
+
+                                                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");
+
+                                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) {
+                        e.printStackTrace();
+                    }
+                    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()))
+                            && beforeBill.getEndTime().isBefore(contract.getEndTime())
+                    ) {
+                        TBill tBill = new TBill();
+                        tBill.setContractId(contract.getId());
+                        tBill.setPayFeesStatus("1");
+                        tBill.setBillType("1");
+                        tBill.setStartTime(beforeBill.getEndTime().plusDays(1));
+                        tBill.setEndTime(contract.getEndTime());
+                        tBill.setContractNumber(contract.getContractNumber());
+                        if (contract.getIsIncreasing()) {
+                            if (tContractRentType != null) {
+                                // 如果变过 并且时间在递增递减时间段内
+                                if (contract.getChangeTime() != null) {
+                                    // 下次递增递减时间
+                                    LocalDateTime changeTime = contract.getChangeTime().plusYears(tContractRentType.getCycleTime());
+                                    // 之前已经涨、跌过租金了 需要判断周期是否还需要再涨、跌
+                                    if (changeTime.isBefore(tBill.getEndTime()) && changeTime.isAfter(tBill.getStartTime())) {
+                                        contract.setChangeTime(changeTime);
+                                        // 租金递增递减的时长 天
+                                        long moneyDays = 0;
+                                        if (changeTime.with(TemporalAdjusters.lastDayOfMonth()).isBefore(tBill.getEndTime())){
+                                            moneyDays = ChronoUnit.DAYS.between(changeTime, changeTime.with(TemporalAdjusters.lastDayOfMonth())) + 1;
+                                        }else{
+                                            moneyDays = ChronoUnit.DAYS.between(changeTime,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;
+                                                }
+                                                break;
+                                        }
+                                        LocalDateTime localDateTime = changeTime.with(TemporalAdjusters.lastDayOfMonth()).plusDays(1);
+                                        while(true){
+                                            if (localDateTime.isBefore(tBill.getEndTime())){
+                                                if (localDateTime.plusMonths(1).isBefore(tBill.getEndTime())){
+                                                    contractRentTypeMoney = contractRentTypeMoney.add(contract.getChangeRent());
+                                                    localDateTime = localDateTime.plusMonths(1);
+                                                }else {
+                                                    break;
+                                                }
+                                            }else{
+                                                break;
+                                            }
+                                        }
+                                        long temp  = ChronoUnit.DAYS.between(localDateTime,tBill.getEndTime()) + 1;
+                                        contractRentTypeMoney = contractRentTypeMoney.add(contract.getChangeRent().divide(new BigDecimal(30), 2, BigDecimal.ROUND_DOWN).multiply(new BigDecimal(temp)));
+                                        // 不需要涨租金的时间段
+                                        long originalDays = 0;
+                                        if (tBill.getStartTime().with(TemporalAdjusters.lastDayOfMonth()).isBefore(tContractRentType.getChangeTime())){
+                                            originalDays = Math.abs(ChronoUnit.DAYS.between(tBill.getStartTime(), changeTime.with(TemporalAdjusters.lastDayOfMonth())));
+                                        }else{
+                                            originalDays = Math.abs(ChronoUnit.DAYS.between(tBill.getStartTime(), changeTime));
+                                        }
+                                        originalMoney = originalMoney.add(contract.getChangeRent().divide(new BigDecimal(30), 2, BigDecimal.ROUND_DOWN).multiply(new BigDecimal(originalDays)));
+                                        LocalDateTime originalTime = tBill.getStartTime().with(TemporalAdjusters.lastDayOfMonth()).plusDays(1);
+                                        while(true){
+                                            if (originalTime.isBefore(changeTime)){
+                                                if (originalTime.plusMonths(1).isBefore(changeTime)){
+                                                    originalMoney = originalMoney.add(contract.getChangeRent());
+                                                    originalTime = originalTime.plusMonths(1);
+                                                }else {
+                                                    break;
+                                                }
+                                            }else{
+                                                break;
+                                            }
+                                        }
+                                        long tempOriginal  = ChronoUnit.DAYS.between(originalTime,changeTime);
+                                        originalMoney = originalMoney.add(contract.getChangeRent().divide(new BigDecimal(30), 2, BigDecimal.ROUND_DOWN).multiply(new BigDecimal(tempOriginal)));
+
+
+                                        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 = 0;
+                                        if (tContractRentType.getChangeTime().with(TemporalAdjusters.lastDayOfMonth()).isBefore(tBill.getEndTime())){
+                                            moneyDays = ChronoUnit.DAYS.between(tContractRentType.getChangeTime(), tContractRentType.getChangeTime().with(TemporalAdjusters.lastDayOfMonth())) + 1;
+                                        }else{
+                                            moneyDays = 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;
+                                                }
+                                                break;
+                                        }
+                                        LocalDateTime localDateTime = tContractRentType.getChangeTime().with(TemporalAdjusters.lastDayOfMonth()).plusDays(1);
+                                        while(true){
+                                            if (localDateTime.isBefore(tBill.getEndTime())){
+                                                if (localDateTime.plusMonths(1).isBefore(tBill.getEndTime())){
+                                                    contractRentTypeMoney = contractRentTypeMoney.add(contract.getChangeRent());
+                                                    localDateTime = localDateTime.plusMonths(1);
+                                                }else {
+                                                    break;
+                                                }
+                                            }else{
+                                                break;
+                                            }
+                                        }
+                                        long temp  = ChronoUnit.DAYS.between(localDateTime,tBill.getEndTime()) + 1;
+                                        contractRentTypeMoney = contractRentTypeMoney.add(contract.getChangeRent().divide(new BigDecimal(30), 2, BigDecimal.ROUND_DOWN).multiply(new BigDecimal(temp)));
+                                        // 不需要涨租金的时间段
+                                        long originalDays = 0;
+                                        if (tBill.getStartTime().with(TemporalAdjusters.lastDayOfMonth()).isBefore(tContractRentType.getChangeTime())){
+                                            originalDays = Math.abs(ChronoUnit.DAYS.between(tBill.getStartTime(), tBill.getStartTime().with(TemporalAdjusters.lastDayOfMonth())));
+                                        }else{
+                                            originalDays = Math.abs(ChronoUnit.DAYS.between(tBill.getStartTime(), tContractRentType.getChangeTime()));
+                                        }
+                                        originalMoney = originalMoney.add(contract.getChangeRent().divide(new BigDecimal(30), 2, BigDecimal.ROUND_DOWN).multiply(new BigDecimal(originalDays)));
+                                        LocalDateTime originalTime = tBill.getStartTime().with(TemporalAdjusters.lastDayOfMonth()).plusDays(1);
+                                        while(true){
+                                            if (originalTime.isBefore(tContractRentType.getChangeTime())){
+                                                if (originalTime.plusMonths(1).isBefore(tContractRentType.getChangeTime())){
+                                                    originalMoney = originalMoney.add(contract.getChangeRent());
+                                                    originalTime = originalTime.plusMonths(1);
+                                                }else {
+                                                    break;
+                                                }
+                                            }else{
+                                                break;
+                                            }
+                                        }
+                                        long tempOriginal  = ChronoUnit.DAYS.between(originalTime,tContractRentType.getChangeTime());
+                                        originalMoney = originalMoney.add(contract.getChangeRent().divide(new BigDecimal(30), 2, BigDecimal.ROUND_DOWN).multiply(new BigDecimal(tempOriginal)));
+                                        tBill.setPayableFeesMoney(contractRentTypeMoney.add(originalMoney));
+                                        tBill.setOutstandingMoney(tBill.getPayableFeesMoney());
+                                        contractService.updateById(contract);
+
+                                    }
+                                }
+                            } else {
+                                BigDecimal originalMoney = new BigDecimal("0");
+                                // 不需要涨租金的时间段
+                                long originalDays = 0;
+                                if (tBill.getStartTime().with(TemporalAdjusters.lastDayOfMonth()).isBefore(tBill.getEndTime())){
+                                    originalDays = Math.abs(ChronoUnit.DAYS.between(tBill.getStartTime(), tBill.getStartTime().with(TemporalAdjusters.lastDayOfMonth())));
+                                }else{
+                                    originalDays = Math.abs(ChronoUnit.DAYS.between(tBill.getStartTime(), tBill.getEndTime()));
+                                }
+                                originalMoney = originalMoney.add(contract.getChangeRent().divide(new BigDecimal(30), 2, BigDecimal.ROUND_DOWN).multiply(new BigDecimal(originalDays)));
+                                LocalDateTime originalTime = tBill.getStartTime().with(TemporalAdjusters.lastDayOfMonth()).plusDays(1);
+                                while(true){
+                                    if (originalTime.isBefore(tBill.getEndTime())){
+                                        if (originalTime.plusMonths(1).isBefore(tContractRentType.getChangeTime())){
+                                            originalMoney = originalMoney.add(contract.getChangeRent());
+                                            originalTime = originalTime.plusMonths(1);
+                                        }else {
+                                            break;
+                                        }
+                                    }else{
+                                        break;
+                                    }
+                                }
+                                long tempOriginal  = ChronoUnit.DAYS.between(originalTime,tBill.getEndTime());
+                                originalMoney = originalMoney.add(contract.getChangeRent().divide(new BigDecimal(30), 2, BigDecimal.ROUND_DOWN).multiply(new BigDecimal(tempOriginal)));
+                                tBill.setPayableFeesMoney(originalMoney);
+                                tBill.setOutstandingMoney(tBill.getPayableFeesMoney());
+                            }
+                        } else {
+                            BigDecimal originalMoney = new BigDecimal("0");
+                            // 不需要涨租金的时间段
+                            long originalDays = 0;
+                            if (tBill.getStartTime().with(TemporalAdjusters.lastDayOfMonth()).isBefore(tBill.getEndTime())){
+                                originalDays = Math.abs(ChronoUnit.DAYS.between(tBill.getStartTime(), tBill.getStartTime().with(TemporalAdjusters.lastDayOfMonth())));
+                            }else{
+                                originalDays = Math.abs(ChronoUnit.DAYS.between(tBill.getStartTime(), tBill.getEndTime()));
+                            }
+                            originalMoney = originalMoney.add(contract.getChangeRent().divide(new BigDecimal(30), 2, BigDecimal.ROUND_DOWN).multiply(new BigDecimal(originalDays)));
+                            LocalDateTime originalTime = tBill.getStartTime().with(TemporalAdjusters.lastDayOfMonth()).plusDays(1);
+                            while(true){
+                                if (originalTime.isBefore(tBill.getEndTime())){
+                                    if (originalTime.plusMonths(1).isBefore(tContractRentType.getChangeTime())){
+                                        originalMoney = originalMoney.add(contract.getChangeRent());
+                                        originalTime = originalTime.plusMonths(1);
+                                    }else {
+                                        break;
+                                    }
+                                }else{
+                                    break;
+                                }
+                            }
+                            long tempOriginal  = ChronoUnit.DAYS.between(originalTime,tBill.getEndTime());
+                            originalMoney = originalMoney.add(contract.getChangeRent().divide(new BigDecimal(30), 2, BigDecimal.ROUND_DOWN).multiply(new BigDecimal(tempOriginal)));
+                            tBill.setPayableFeesMoney(originalMoney);
+                            tBill.setOutstandingMoney(tBill.getPayableFeesMoney());
+                        }
+                        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"));
+                TCheckAcceptRecord tCheckAcceptRecord = new TCheckAcceptRecord();
+                tCheckAcceptRecord.setContractId(contract.getId());
+                tCheckAcceptRecord.setHouseId(contract.getHouseId());
+                tCheckAcceptRecord.setLeaseReason("后台终止合同");
+                tCheckAcceptRecord.setAcceptanceTime(LocalDateTime.now());
+                LocalDate now = LocalDate.now();
+                String replace = (now + "").replace("-", "");
+                int size = checkAcceptRecordMapper.selectList(new LambdaQueryWrapper<TCheckAcceptRecord>()
+                        .likeRight(TCheckAcceptRecord::getAcceptanceTime, LocalDate.now())).size();
+                tCheckAcceptRecord.setCode(replace.substring(2) + String.format("%03d", size + 1));
+
+                checkAcceptRecordMapper.insert(tCheckAcceptRecord);
+
                 break;
             }
             default:

--
Gitblit v1.7.1