优化改造完成批量缴费功能

java110-bean/src/main/java/com/java110/dto/fee/PayFeeDataDto.java

@@ -6,6 +6,12 @@ import java.io.Serializable;
 
 public class PayFeeDataDto extends PayFeeDetailPo implements Serializable {
 
+    public static final String TEMP_CYCLE_DEFAULT="-100";
+    public static final String TEMP_CYCLE_CUSTOM_AMOUNT="-101"; //自定义金额交费
+    public static final String TEMP_CYCLE_CUSTOM_CYCLE ="-102"; // 自定义周期
+    public static final String TEMP_CYCLE_CUSTOM_END_TIME="-103"; //自定义结束时间
+    public static final String TEMP_CYCLE_CUSTOM_START_END_TIME="-105"; //自定义缴费时间段
+
     private String tempCycle;
 
     private String custEndTime;

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

@@ -150,6 +150,7 @@ public class PayBatchFeeCmd extends Cmd {
             payFeeDataDto.setCashierId(userDtos.get(0).getUserId());
             payFeeDataDto.setCashierName(userDtos.get(0).getName());
             payFeeDataDto.setFeeId(paramInObj.getString("feeId"));
+            payFeeDataDto.setCycles(paramInObj.getString("cycles"));
             feeDataDtos.add(payFeeDataDto);
         }
 
@@ -279,7 +280,7 @@ public class PayBatchFeeCmd extends Cmd {
         String receivableAmount = "";
         Map feePriceAll = computeFeeSMOImpl.getFeePrice(payFeeDataDto.getFeeDto());
         BigDecimal feePrice = new BigDecimal(feePriceAll.get("feePrice").toString());
-        if ("-101".equals(payFeeDataDto.getTempCycle())) { //todo  自定义金额交费
+        if (PayFeeDataDto.TEMP_CYCLE_CUSTOM_AMOUNT.equals(payFeeDataDto.getTempCycle())) { //todo  自定义金额交费
             Date endTime = payFeeDataDto.getFeeDto().getEndTime();
             Calendar endCalender = Calendar.getInstance();
             endCalender.setTime(endTime);
@@ -293,7 +294,7 @@ public class PayBatchFeeCmd extends Cmd {
             targetEndTime = endCalender.getTime();
             receivableAmount = payFeeDataDto.getReceivedAmount();
             //处理 可能还存在 实收手工减免的情况
-        } else if ("-103".equals(payFeeDataDto.getTempCycle())) { //todo 这里按缴费结束时间缴费
+        } else if (PayFeeDataDto.TEMP_CYCLE_CUSTOM_END_TIME.equals(payFeeDataDto.getTempCycle())) { //todo 这里按缴费结束时间缴费
             String custEndTime = payFeeDataDto.getCustEndTime();
             Date endDates = DateUtil.getDateFromStringB(custEndTime);
             Calendar c = Calendar.getInstance();