Merge remote-tracking branch 'origin/master'

cgf

2025-09-10 76088a1a46cbbc05fc92ad8d982b0dcb0da87cb2

 service-fee/src/main/java/com/java110/fee/bmo/fee/impl/FeeBMOImpl.java

@@ -138,7 +138,13 @@
//            endCalender.add(Calendar.HOUR, hours);
            endCalender = getTargetEndTime(endCalender, Double.parseDouble(paramInJson.getString("tmpCycles")));
        } else {
            endCalender.add(Calendar.MONTH, Integer.parseInt(paramInJson.getString("cycles")));
            if (paramInJson.containsKey("custEndTimeUse")){
                endCalender.setTime(DateUtil.getDateFromStringA(paramInJson.getString("custEndTimeUse")+" 23:59:59"));
            }
            else{
                endCalender.add(Calendar.MONTH, new BigDecimal(paramInJson.getString("cycles")).intValue());
                endCalender.add(Calendar.MINUTE, -1);
            }
            if (FeeDto.FEE_FLAG_ONCE.equals(feeDto.getFeeFlag())) {
                if (feeDto.getDeadlineTime() != null) {
                    endCalender.setTime(feeDto.getDeadlineTime());
@@ -216,7 +222,12 @@
        Date endTime = feeInfo.getEndTime();
        Calendar endCalender = Calendar.getInstance();
        endCalender.setTime(endTime);
        if (paramInJson.containsKey("custEndTimeUse")){
            endCalender.setTime(DateUtil.getDateFromStringA(paramInJson.getString("custEndTimeUse")+" 23:59:59"));
            endCalender.add(Calendar.MINUTE, 1);
        }else{
        endCalender.add(Calendar.MONTH, Integer.parseInt(paramInJson.getString("cycles")));
        }
        if (FeeDto.FEE_FLAG_ONCE.equals(feeInfo.getFeeFlag())) {
            if (feeInfo.getDeadlineTime() != null) {
                endCalender.setTime(feeInfo.getDeadlineTime());