权限

无关风月

2025-02-28 1179607b1e2432dd14b0607365782552f7fb0402

权限

 ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TContractServiceImpl.java

@@ -206,11 +206,8 @@
        rentBill.setContractId(contract.getId());
        rentBill.setContractNumber(contract.getContractNumber());
        rentBill.setPayableFeesTime(firstPayTime.toLocalDate());
        if (firstPayTime.toLocalDate().equals(LocalDate.now())){
            rentBill.setPayFeesStatus("1");
        }else {
            rentBill.setPayFeesStatus("2");
        }
        rentBill.setPayFeesStatus("1");

        rentBill.setBillType("1");
        rentBill.setStartTime(contract.getStartPayTime());
        TContractRentType tContractRentType = contractRentTypes.stream().filter(e -> e.getContractId().equals(contract.getId())).findFirst().orElse(null);
@@ -285,13 +282,10 @@
        depositBill.setStartTime(contract.getStartPayTime());
        depositBill.setEndTime(contract.getEndTime());
        depositBill.setPayableFeesTime(firstPayTime.toLocalDate());
        if (firstPayTime.toLocalDate().equals(LocalDate.now())){
            depositBill.setPayFeesStatus("1");

        }else {
            depositBill.setPayFeesStatus("2");
        depositBill.setPayFeesStatus("1");

        }

        depositBill.setBillType("2");
        this.updateById(contract);
        billService.save(rentBill);
@@ -471,10 +465,10 @@
                                    beforeBill.getEndTime().plusMonths(1).withDayOfMonth(15).toLocalDate():contract.getPayType().equals("2")?
                                    beforeBill.getEndTime().plusMonths(3).withDayOfMonth(15).toLocalDate():beforeBill.getEndTime().withDayOfMonth(15).plusMonths(12).toLocalDate()));
                        }
                        tBill.setPayFeesStatus("2");
                        tBill.setPayFeesStatus("1");
                        tBill.setBillType("1");
                        tBill.setStartTime(beforeBill.getEndTime().plusDays(1));
                        tBill.setEndTime(beforeBill.getEndTime().plusMonths(contract.getPayType().equals("1")? 1:contract.getPayType().equals("2")? 3:12));
                        tBill.setEndTime(beforeBill.getEndTime().plusMonths(contract.getPayType().equals("1")? 1:contract.getPayType().equals("2")? 3:12).with(TemporalAdjusters.lastDayOfMonth()));
                        billMapper.insert(tBill);
                    }
                beforeBill.setEndTime(beforeBill.getEndTime().plusMonths(contract.getPayType().equals("1")? 1:contract.getPayType().equals("2")? 3:12));
@@ -488,11 +482,6 @@
                .last("limit 1").one();
        // 生成最后一笔账单
        if (!(beforeBill.getEndTime().toLocalDate().equals(contract.getEndTime().toLocalDate()))
                &&
                (contract.getPayType().equals("1")?
                        beforeBill.getEndTime().plusMonths(1):contract.getPayType().equals("2")?
                        beforeBill.getEndTime().plusMonths(3):beforeBill.getEndTime().plusMonths(12))
                        .with(TemporalAdjusters.lastDayOfMonth()).isAfter(contract.getEndTime())
                && beforeBill.getEndTime().isBefore(contract.getEndTime())
        ){
            TBill tBill = new TBill();
@@ -646,7 +635,7 @@

                }
            }else{
                long allDays = ChronoUnit.DAYS.between(beforeBill.getEndTime(), contract.getEndTime());
                long allDays = ChronoUnit.DAYS.between(beforeBill.getEndTime().plusDays(1), contract.getEndTime());
                tBill.setPayableFeesMoney(contract.getMonthRent().divide(new BigDecimal(30), 2, BigDecimal.ROUND_DOWN).multiply(new BigDecimal(allDays)));
                tBill.setOutstandingMoney(tBill.getPayableFeesMoney());