修改bug

xuhy

2025-04-09 f0e2b4684b87a4343c20b8619ccd466e7f09edb1

 ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TContractController.java

@@ -14,12 +14,10 @@
import com.ruoyi.common.constant.DictConstants;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.common.enums.DisabledEnum;
import com.ruoyi.common.enums.ProcessCategoryEnum;
import com.ruoyi.common.exception.ServiceException;
import com.ruoyi.common.utils.DateUtils;
import com.ruoyi.common.utils.DictUtils;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.common.utils.WebUtils;
import com.ruoyi.common.utils.*;
import com.ruoyi.system.bo.ProcessStartBO;
import com.ruoyi.system.dto.RevokeDTO;
import com.ruoyi.system.dto.SetContractDto;
@@ -73,6 +71,7 @@
import java.net.URLEncoder;
import java.time.LocalDateTime;
import java.time.temporal.ChronoUnit;
import java.time.temporal.TemporalAdjusters;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Date;
@@ -80,7 +79,6 @@
import java.util.List;
import java.util.Map;
import java.util.Objects;
import java.util.stream.Collectors;

/**
 * <p>
@@ -135,7 +133,11 @@
        if (Objects.isNull(house)) {
            throw new ServiceException("房产信息不存在");
        }
        house.setRentalReturnStatus("1");
        houseService.updateById(house);
        dto.setBusinessDeptId(house.getBusinessDeptId());
        // 生成合同编号
        dto.setContractNumber(CodeGenerateUtils.generateVolumeSn(house.getBusinessDeptId()));
        contractService.save(dto);
        if (dto.getStatus().equals("2")){
            //发起合同新增审批
@@ -318,7 +320,6 @@
    @Log(title = "合同管理-确认结算", businessType =  BusinessType.UPDATE)
    @ApiOperation(value = "确认结算")
    @PostMapping(value = "/confirmSettlement")

    public R<Boolean> confirmSettlement(String id) {
        TContract contract = contractService.getById(id);
        contract.setStatus("8");
@@ -326,11 +327,17 @@
        // 将所有未缴费账单设置未已失效
        List<TBill> tBills = billService.list(new LambdaQueryWrapper<TBill>()
                .ne(TBill::getPayFeesStatus, 3)
                        .ne(TBill::getBillType,4)
                .eq(TBill::getContractId, contract.getId()));
        for (TBill tBill : tBills) {
            tBill.setPayFeesStatus("5");
        }
        billService.updateBatchById(tBills);        return R.ok();
        billService.updateBatchById(tBills);
        // 将房屋改成待出租
        THouse house = houseService.getById(contract.getHouseId());
        house.setLeaseStatus("1");
        houseService.updateById(house);
        return R.ok();
    }
    @ApiOperation(value = "终止合同剩余未缴费账单列表")
    @PostMapping(value = "/contractBillList")
@@ -366,6 +373,18 @@
        return R.ok(res);
    }

    // 计算两个日期相差天数的方法实现：
    public static long calculateDaysBetween(LocalDateTime start, LocalDateTime end) {
        return ChronoUnit.DAYS.between(start, end);
    }

    public static void main(String[] args) {
        LocalDateTime start = LocalDateTime.of(2024, 1, 1, 0, 0);
        LocalDateTime end = LocalDateTime.of(2024, 1, 5, 12, 0);
        long days = calculateDaysBetween(start, end); // 返回4天（不满一天不计）

    }

    private String generateContract(TContract contract) {
        String templateFileName = "1_yzj_租赁合同_个人.docx";
        String contractId = contract.getId();
@@ -375,7 +394,9 @@
        if (StringUtils.isNotEmpty(contractId)) {
            firstBill = billService.lambdaQuery()
                    .eq(TBill::getContractId, contractId)
                    .orderByDesc(TBill::getStartTime)
                    .eq(TBill::getBillType, 1)
                    .orderByAsc(TBill::getStartTime)
                    .ne(TBill::getManualAddition, DisabledEnum.YES.getCode())
                    .last("limit 1")
                    .one();
            tCheckAcceptRecord = checkAcceptRecordService.lambdaQuery()
@@ -403,6 +424,7 @@
            fill(templateParam, "bankNumber", tenant.getBankNumber());
            fill(templateParam, "bankName", tenant.getBankName());
            fill(templateParam, "partyTwoName", tenant.getLessee());
            fill(templateParam, "email", tenant.getEmail());

            // 企业、政府机构、国有企业
            if (Objects.nonNull(tenant.getTenantType())
@@ -463,22 +485,30 @@
                : contract.getPayType().equals("2") ? "季"
                : "年";
        fill(templateParam, "payType", payType);

        BigDecimal extracted = extracted(contract);
        // 首期租金处理
        if (firstBill != null) {
            fill(templateParam, "firstRent", "￥" + firstBill.getPayableFeesMoney() + "元");
            double firstRent = (contract.getPayType().equals("1")
                    ? contract.getMonthRent()
                    : contract.getPayType().equals("2")
                    ? contract.getMonthRent().multiply(new BigDecimal("3"))
                    : contract.getMonthRent().multiply(new BigDecimal("12")))
                    .setScale(2, RoundingMode.DOWN).doubleValue();
            fill(templateParam, "firstRent", "￥" + extracted + "元");
            // 其他财务字段
            fill(templateParam, "firstRentString", "人民币" + NumberToChineseUtils.numberToChinese(extracted.doubleValue()));
        } else {
            fill(templateParam, "firstRent", "");
//            fill(templateParam, "firstRent", "");
        }

        // 其他财务字段
        fill(templateParam, "firstRentString", "人民币" + NumberToChineseUtils.numberToChinese(
                (contract.getPayType().equals("1")
        fill(templateParam, "firstRent",
                "￥"+(contract.getPayType().equals("1")
                        ? contract.getMonthRent()
                        : contract.getPayType().equals("2")
                        ? contract.getMonthRent().multiply(new BigDecimal("3"))
                        : contract.getMonthRent().multiply(new BigDecimal("12")))
                        .setScale(2, RoundingMode.DOWN).doubleValue()));
                        :contract.getPayType().equals("2")
                        ?contract.getMonthRent().multiply(new BigDecimal("3"))
                        :contract.getMonthRent().multiply(new BigDecimal("12"))
                        .setScale(2, RoundingMode.DOWN)).doubleValue()+"元");


        fill(templateParam, "firstRentString",
                "人民币"+NumberToChineseUtils.numberToChinese(
@@ -517,6 +547,232 @@
                templateParam,
                "租赁合同",
                "/usr/local/project/file/");
    }

    private BigDecimal extracted(TContract contract) {
        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) {
                    System.err.println("第一笔账单 1号计算整月:");
                    money = money.add(contract.getMonthRent());
                } else {
                    long allDays = Math.abs(ChronoUnit.DAYS.between(rentBill.getStartTime(), rentBill.getStartTime().with(TemporalAdjusters.lastDayOfMonth())) + 1);
                    System.err.println("第一笔账单 计算天数"+allDays);
                    money =money.add(contract.getMonthRent().divide(new BigDecimal(30), 2, BigDecimal.ROUND_DOWN).multiply(new BigDecimal(allDays)));
                    System.err.println("第一笔账单 计算天数金额"+money);
                }
                // 后续
                if (contract.getStartPayTime().getMonthValue()==3|| contract.getStartPayTime().getMonthValue()==6|| contract.getStartPayTime().getMonthValue()==9|| contract.getStartPayTime().getMonthValue()==12){
                    System.err.println("后续账单 月为3 6 9 12金额"+money);
                    rentBill.setPayableFeesMoney(money);
                    rentBill.setOutstandingMoney(rentBill.getPayableFeesMoney());
                }else{

                    LocalDateTime localDateTime = rentBill.getStartTime().plusMonths(1).with(TemporalAdjusters.lastDayOfMonth());
                    System.err.println("后续账单逻辑时间"+localDateTime);
                    while (true){
                        if (localDateTime.toLocalDate().isBefore(rentBill.getEndTime().toLocalDate())){
                            System.err.println("后续while 在结束之前");
                            money = money.add(contract.getMonthRent());
                        }else if(localDateTime.toLocalDate().equals(rentBill.getEndTime().toLocalDate())){
                            System.err.println("后续while 结束");
                            money = money.add(contract.getMonthRent());
                            break;
                        }else {
                            System.err.println("后续while 加一个月大于结束时间");
                            if (localDateTime.with(TemporalAdjusters.firstDayOfMonth()).isBefore(rentBill.getEndTime())){
                                long a = ChronoUnit.DAYS.between(localDateTime.with(TemporalAdjusters.firstDayOfMonth()),rentBill.getEndTime())+1;
                                System.err.println("后续while 加一个月大于结束时间 计算天数"+a);
                                money = money.add(contract.getMonthRent().divide(new BigDecimal(30), 2, BigDecimal.ROUND_DOWN).multiply(
                                        new BigDecimal(ChronoUnit.DAYS.between(localDateTime.with(TemporalAdjusters.firstDayOfMonth()),rentBill.getEndTime())+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(rentBill.getStartTime(), rentBill.getStartTime().with(TemporalAdjusters.lastDayOfMonth())) ;
                    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());
                    LocalDateTime localDateTime = rentBill.getStartTime().with(TemporalAdjusters.lastDayOfMonth()).plusDays(1);
                    while (true){
                        if (localDateTime.isBefore(rentBill.getEndTime())){
                            localDateTime = localDateTime.plusMonths(1);
                            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())))));
                            break;
                        }
                    }
                    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");
        rentBill.setBusinessDeptId(contract.getBusinessDeptId());
        depositBill.setBusinessDeptId(contract.getBusinessDeptId());
        return rentBill.getPayableFeesMoney() ;

    }


@@ -594,7 +850,7 @@
        if (Objects.isNull(contract)) {
            throw new ServiceException("合同不存在");
        }
        if (StringUtils.isNotBlank(contract.getContractFile())) {
  /*      if (StringUtils.isNotBlank(contract.getContractFile())) {
            List<String> contractFileList = Arrays.stream(contract.getContractFile().split(",")).collect(Collectors.toList());
            List<String> memoryList = Arrays.stream(contract.getMemory().split(",")).collect(Collectors.toList());
            List<String> contractNameList = Arrays.stream(contract.getContractFileName().split(",")).collect(Collectors.toList());
@@ -608,7 +864,10 @@
            contract.setContractFile(dto.getContractFile());
            contract.setContractFileName(dto.getContractFileName());
            contract.setMemory(dto.getMemory());
        }
        }*/
        contract.setContractFile(dto.getContractFile());
        contract.setContractFileName(dto.getContractFileName());
        contract.setMemory(dto.getMemory());
        return R.ok(contractService.updateById(contract));
    }