wuxw
2024-04-05 d6b30c6097618391359565de48519614363e8a26
java110-core/src/main/java/com/java110/core/smo/impl/ComputeFeeSMOImpl.java
@@ -762,16 +762,15 @@
            } else {
                endCalender.setTime(feeDto.getImportFeeEndTime());
            }
        } else if (FeeDto.FEE_FLAG_CYCLE_ONCE.equals(feeDto.getFeeFlag())) {
            if (feeDto.getDeadlineTime() == null) {
                throw new IllegalArgumentException("间接性费用未设置结束时间");
            }
            if ((endCalender.getTime()).after(feeDto.getDeadlineTime())) {
                endCalender.setTime(feeDto.getDeadlineTime());
            }
        } else {
            if ((endCalender.getTime()).after(feeDto.getConfigEndTime())) {
                endCalender.setTime(feeDto.getConfigEndTime());
            Date deadLineTime = feeDto.getDeadlineTime();
            if (deadLineTime == null) {
                deadLineTime = feeDto.getConfigEndTime();
            }
            if ((endCalender.getTime()).after(deadLineTime)) {
                endCalender.setTime(feeDto.getDeadlineTime());
            } else {
                endCalender.add(Calendar.SECOND, -1);
            }
        }