西藏国投
parent: 68ca7bdc | 补丁 | 提交 | ignore whitespace
无关风月
2025-03-07 aac696c7caa9b9610cffec62dfc2b2e0e8f8bf50 
账单
1个文件已修改
10 ■■■■■ 已修改文件
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/FlowListenerService.java 10 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 
 ruoyi-system/src/main/java/com/ruoyi/system/service/impl/FlowListenerService.java


@@ -339,7 +339,7 @@


                            break;


                    }


                    // 不需要涨租金的时间段


                    long originalDays = Math.abs(ChronoUnit.DAYS.between(contract.getFirstPayTime(), tContractRentType.getChangeTime()))+1;


                    long 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));


                    rentBill.setPayableFeesMoney(contractRentTypeMoney.add(originalMoney));


@@ -437,7 +437,7 @@


                                                    break;


                                            }


                                            // 不需要涨租金的时间段


                                            long originalDays = ChronoUnit.DAYS.between(beforeBill.getEndTime(), tContractRentType.getChangeTime());


                                            long originalDays = ChronoUnit.DAYS.between(tBill.getEndTime(), tContractRentType.getChangeTime());


                                            if (originalDays > 0) {


                                                originalMoney = originalMoney.add(contract.getChangeRent().divide(new BigDecimal(30), 2, BigDecimal.ROUND_DOWN))


                                                        .multiply(new BigDecimal(originalDays));


@@ -490,7 +490,7 @@


                                                    break;


                                            }


                                            // 不需要涨租金的时间段


                                            long originalDays = ChronoUnit.DAYS.between(beforeBill.getEndTime(), tContractRentType.getChangeTime());


                                            long originalDays = ChronoUnit.DAYS.between(tBill.getEndTime(), tContractRentType.getChangeTime());


                                            System.err.println("不需要长租金时长"+originalDays);


                                            if (originalDays > 0) {


                                                originalMoney = originalMoney.add(contract.getMonthRent().divide(new BigDecimal(30), 2, BigDecimal.ROUND_DOWN))


@@ -581,7 +581,7 @@


                                            break;


                                    }


                                    // 不需要涨租金的时间段


                                    long originalDays = ChronoUnit.DAYS.between(beforeBill.getEndTime(), changeTime);


                                    long originalDays = ChronoUnit.DAYS.between(tBill.getEndTime(), changeTime);


                                    if (originalDays > 0) {


                                        originalMoney = originalMoney.add(contract.getMonthRent().divide(new BigDecimal(30), 2, BigDecimal.ROUND_DOWN))


                                                .multiply(new BigDecimal(originalDays));


@@ -632,7 +632,7 @@


                                            break;


                                    }


                                    // 不需要涨租金的时间段


                                    long originalDays = ChronoUnit.DAYS.between(beforeBill.getEndTime(), tContractRentType.getChangeTime());


                                    long originalDays = ChronoUnit.DAYS.between(tBill.getEndTime(), tContractRentType.getChangeTime());


                                    if (originalDays > 0) {


                                        originalMoney = originalMoney.add(contract.getMonthRent().divide(new BigDecimal(30), 2, BigDecimal.ROUND_DOWN))


                                                .multiply(new BigDecimal(originalDays)).setScale(2,BigDecimal.ROUND_DOWN);