修改bug

xuhy

2025-04-09 f0e2b4684b87a4343c20b8619ccd466e7f09edb1

修改bug

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

@@ -71,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;
@@ -484,7 +485,7 @@
                : contract.getPayType().equals("2") ? "季"
                : "年";
        fill(templateParam, "payType", payType);

        BigDecimal extracted = extracted(contract);
        // 首期租金处理
        if (firstBill != null) {
            double firstRent = (contract.getPayType().equals("1")
@@ -493,9 +494,9 @@
                    ? contract.getMonthRent().multiply(new BigDecimal("3"))
                    : contract.getMonthRent().multiply(new BigDecimal("12")))
                    .setScale(2, RoundingMode.DOWN).doubleValue();
            fill(templateParam, "firstRent", "￥" + firstBill.getPayableFeesMoney() + "元");
            fill(templateParam, "firstRent", "￥" + extracted + "元");
            // 其他财务字段
            fill(templateParam, "firstRentString", "人民币" + NumberToChineseUtils.numberToChinese(firstBill.getPayableFeesMoney().doubleValue()));
            fill(templateParam, "firstRentString", "人民币" + NumberToChineseUtils.numberToChinese(extracted.doubleValue()));
        } else {
//            fill(templateParam, "firstRent", "");
        }
@@ -548,6 +549,232 @@
                "/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() ;

    }


    private void fill(Map<String, Object> templateParam, String key, Object value) {
        if (StringUtils.isEmpty(key)){

 ruoyi-system/src/main/java/com/ruoyi/system/service/TBillService.java

@@ -116,7 +116,6 @@
     * @return
     */
    List<TBill> getJiFuBillListByTime(String businessDeptId, Date first, Date last);
    List<ScreenRentRankVO> getStreetRentRank();

    void editAmount(TbillSaveDto bill);
}