无关风月
2025-03-07 8e21b9f23159f38953b99f763742dac301a9ec1b
权限
1个文件已修改
13 ■■■■ 已修改文件
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/FlowListenerService.java 13 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/FlowListenerService.java
@@ -644,15 +644,14 @@
                        tBill.setOutstandingMoney(tBill.getPayableFeesMoney());
                        tBill.setContractNumber(contract.getContractNumber());
                    }
                    if (beforeBill.getEndTime().plusMonths(contract.getPayType().equals("1") ? 1 : contract.getPayType().equals("2") ? 3 : 12).getDayOfMonth() <= 15) {
                        tBill.setPayableFeesTime(contract.getEndTime().withHour(0).withMinute(0).withSecond(0).toLocalDate());
                    if (tBill.getEndTime().getDayOfMonth()>=15){
                        tBill.setPayableFeesTime(tBill.getStartTime().withDayOfMonth(15).toLocalDate());
                    }else if (tBill.getStartTime().getYear()==tBill.getEndTime().getYear()&& tBill.getStartTime().getMonthValue()==tBill.getEndTime().getMonthValue()){
                        // 如果同年同月 且日小于15 缴费时间取合同
                        tBill.setPayableFeesTime(tBill.getStartTime().toLocalDate());
                    } else {
                        tBill.setPayableFeesTime((contract.getPayType().equals("1") ?
                                beforeBill.getEndTime().plusMonths(1).withDayOfMonth(15).toLocalDate() : contract.getPayType().equals("2") ?
                                beforeBill.getEndTime().plusMonths(3).withDayOfMonth(15).toLocalDate() : beforeBill.getEndTime().withDayOfMonth(15).plusMonths(12).withHour(0).withMinute(0).withSecond(0).toLocalDate()));
                        tBill.setPayableFeesTime(tBill.getStartTime().withDayOfMonth(15).toLocalDate());
                    }
                    billService.save(tBill);
                }
                break;