mitao
2025-04-04 28d40a97ffa0acfda8e3766b0edd08e24c8dd21f
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/FlowListenerService.java
@@ -989,7 +989,13 @@
                            BigDecimal originalMoney = new BigDecimal("0");
                            // 不需要涨租金的时间段
                            long originalDays = 0;
                            if (tBill.getStartTime().getDayOfMonth()==1&&(tBill.getStartTime().with(TemporalAdjusters.lastDayOfMonth()).toLocalDate().isAfter(tBill.getEndTime().toLocalDate())||tBill.getStartTime().with(TemporalAdjusters.lastDayOfMonth()).toLocalDate().equals(tBill.getEndTime().toLocalDate()))){
                            if (tBill.getStartTime().getDayOfMonth()==1
                                    &&
                                    (
                                            tBill.getStartTime().with(TemporalAdjusters.lastDayOfMonth()).toLocalDate().isBefore(tBill.getEndTime().toLocalDate())
                                            ||tBill.getStartTime().with(TemporalAdjusters.lastDayOfMonth()).toLocalDate().equals(tBill.getEndTime().toLocalDate())
                                    )
                            ){
                                // 计算整月
                                originalMoney = originalMoney.add(contract.getChangeRent());
                            }else{