权限

无关风月

2025-03-07 6b5c8b69c7fd9a816cefb805d71daaf64b3dabf3

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

@@ -443,6 +443,7 @@
                                        }
                                    }else{
                                        if (tContractRentType.getChangeTime().isBefore(tBill.getEndTime()) && tContractRentType.getChangeTime().isAfter(tBill.getStartTime())) {
                                            System.err.println("首次递增递减");
                                            contract.setChangeTime(tContractRentType.getChangeTime());
                                            // 租金递增递减的时长 天
                                            long moneyDays = Math.abs(ChronoUnit.DAYS.between(tContractRentType.getChangeTime(), tBill.getEndTime()));
@@ -487,7 +488,9 @@
                                            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 {
@@ -533,7 +536,7 @@
                                if (changeTime.isBefore(tBill.getEndTime()) && changeTime.isAfter(tBill.getStartTime())) {
                                    contract.setChangeTime(changeTime);
                                    // 租金递增递减的时长 天
                                    long moneyDays = Math.abs(ChronoUnit.DAYS.between(tContractRentType.getChangeTime(), tBill.getEndTime()));
                                    long moneyDays = Math.abs(ChronoUnit.DAYS.between(changeTime, tBill.getEndTime()));
                                    // 递增递减的租金
                                    BigDecimal contractRentTypeMoney = new BigDecimal("0");
                                    // 不递增递减的租金
@@ -567,7 +570,7 @@
                                            break;
                                    }
                                    // 不需要涨租金的时间段
                                    long originalDays = ChronoUnit.DAYS.between(beforeBill.getEndTime(), tContractRentType.getChangeTime());
                                    long originalDays = ChronoUnit.DAYS.between(beforeBill.getEndTime(), changeTime);
                                    if (originalDays > 0) {
                                        originalMoney = originalMoney.add(contract.getMonthRent().divide(new BigDecimal(30), 2, BigDecimal.ROUND_DOWN))
                                                .multiply(new BigDecimal(originalDays));
@@ -576,8 +579,8 @@
                                    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)));
                                    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{