优化代码

service-fee/src/main/java/com/java110/fee/cmd/meterWater/SaveMeterWaterCmd.java

@@ -175,6 +175,11 @@ public class SaveMeterWaterCmd extends Cmd {
             payFeePo.setState(FeeDto.STATE_DOING);
             payFeePo.setBatchId(reqJson.getString("batchId"));
             payFeePo.setUserId("-1");
+
+            //todo 先写 不然 写月离散表 查询费用时 查不到
+            reqJson.put("feeId", payFeePo.getFeeId());
+            addMeterWater(reqJson);
+
             int flag = payFeeV1InnerServiceSMOImpl.savePayFee(payFeePo);
             if (flag < 1) {
                 throw new CmdException("保存数据失败");
@@ -228,10 +233,7 @@ public class SaveMeterWaterCmd extends Cmd {
                     throw new CmdException("保存数据失败");
                 }
             }
-            reqJson.put("feeId", payFeePo.getFeeId());
-
 
-            addMeterWater(reqJson);
         }
         cmdDataFlowContext.setResponseEntity(ResultVo.success());
     }

service-fee/src/main/java/com/java110/fee/feeMonth/PayFeeMonthHelp.java

@@ -114,10 +114,7 @@ public class PayFeeMonthHelp implements IPayFeeMonthHelp {
      */
     @Override
     public void waitDispersedOweFee(FeeDto feeDto, PayFeeMonthOwnerDto payFeeMonthOwnerDto, Double feePrice, Date deadlineTime) {
-        // todo 费用已经结束
-        if (FeeDto.STATE_FINISH.equals(feeDto.getState())) {
-            return;
-        }
+
 
         // todo 清理 detailId 为-1 的数据
         PayFeeDetailMonthPo payFeeDetailMonthPo = new PayFeeDetailMonthPo();
@@ -126,6 +123,11 @@ public class PayFeeMonthHelp implements IPayFeeMonthHelp {
         payFeeDetailMonthPo.setDetailId("-1");
         payFeeDetailMonthInnerServiceSMOImpl.deletePayFeeDetailMonth(payFeeDetailMonthPo);
 
+        // todo 费用已经结束
+        if (FeeDto.STATE_FINISH.equals(feeDto.getState())) {
+            return;
+        }
+
         List<PayFeeDetailMonthPo> payFeeDetailMonthPos = new ArrayList<>();
         // todo 处理 开始时间和结束时间
         Date startTime = DateUtil.timeToDate(feeDto.getEndTime());