优化变更非因公时的bug

service-fee/src/main/java/com/java110/fee/cmd/fee/PayBatchFeeCmd.java

@@ -134,7 +134,7 @@ public class PayBatchFeeCmd extends Cmd {
             if (maxEndTime != null && endTime != null && !FeeDto.FEE_FLAG_ONCE.equals(feeDtos.get(0).getFeeFlag())) {
                 Date newDate = DateUtil.stepMonth(endTime, paramInObj.getDouble("cycles").intValue());
                 if (newDate.getTime() > maxEndTime.getTime()) {
-                    throw new IllegalArgumentException("缴费周期超过 缴费结束时间,请用按结束时间方式缴费");
+                    throw new CmdException(feeConfigDtos.get(0).getFeeName() + "缴费周期超过 缴费结束时间,请用按结束时间方式缴费");
                 }
             }
             //todo 封装数据
@@ -291,12 +291,12 @@ public class PayBatchFeeCmd extends Cmd {
                 receivedAmount = receivedAmount.add(new BigDecimal(payFeeDataDto.getAccountAmount()));
             }
             cycles = receivedAmount.divide(feePrice, 4, BigDecimal.ROUND_HALF_EVEN);
-            targetEndTime = computeFeeSMOImpl.getTargetEndTime(cycles.doubleValue(),endCalender.getTime());
+            targetEndTime = computeFeeSMOImpl.getTargetEndTime(cycles.doubleValue(), endCalender.getTime());
             receivableAmount = payFeeDataDto.getReceivedAmount();
             //处理 可能还存在 实收手工减免的情况
         } else if (PayFeeDataDto.TEMP_CYCLE_CUSTOM_END_TIME.equals(payFeeDataDto.getTempCycle())) { //todo 这里按缴费结束时间缴费
             String custEndTime = payFeeDataDto.getCustEndTime();
-            if(!custEndTime.contains(":")){
+            if (!custEndTime.contains(":")) {
                 custEndTime += " 23:59:59";
             }
             targetEndTime = DateUtil.getDateFromStringA(custEndTime);
@@ -327,9 +327,6 @@ public class PayBatchFeeCmd extends Cmd {
     }
 
 
-
-
-
     private void ifHasAccount(JSONObject reqJson, List<PayFeeDataDto> feeDataDtos) {
         if (!reqJson.containsKey("accountAmount")) {
             return;