From 0b3ff378a9faaf9d7a4831b7f0de67378fe0dfea Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期二, 30 五月 2023 12:20:15 +0800
Subject: [PATCH] optimize 统计

---
 service-fee/src/main/java/com/java110/fee/cmd/payFeeBatch/UpdatePayFeeBatchCmd.java |   22 ++++++++++++++++------
 1 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/service-fee/src/main/java/com/java110/fee/cmd/payFeeBatch/UpdatePayFeeBatchCmd.java b/service-fee/src/main/java/com/java110/fee/cmd/payFeeBatch/UpdatePayFeeBatchCmd.java
index 1c3f5a8..df87b72 100644
--- a/service-fee/src/main/java/com/java110/fee/cmd/payFeeBatch/UpdatePayFeeBatchCmd.java
+++ b/service-fee/src/main/java/com/java110/fee/cmd/payFeeBatch/UpdatePayFeeBatchCmd.java
@@ -17,12 +17,13 @@
 
 import com.alibaba.fastjson.JSONObject;
 import com.java110.core.annotation.Java110Cmd;
-import com.java110.core.annotation.Java110Transactional;
 import com.java110.core.context.ICmdDataFlowContext;
-import com.java110.core.event.cmd.AbstractServiceCmdListener;
+import com.java110.core.event.cmd.Cmd;
 import com.java110.core.event.cmd.CmdEvent;
+import com.java110.dto.meterWater.MeterWaterDto;
 import com.java110.dto.payFeeBatch.PayFeeBatchDto;
 import com.java110.intf.fee.IFeeInnerServiceSMO;
+import com.java110.intf.fee.IMeterWaterV1InnerServiceSMO;
 import com.java110.intf.fee.IPayFeeBatchV1InnerServiceSMO;
 import com.java110.po.fee.PayFeePo;
 import com.java110.po.payFeeBatch.PayFeeBatchPo;
@@ -32,7 +33,7 @@
 import com.java110.utils.util.BeanConvertUtil;
 import com.java110.vo.ResultVo;
 import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import com.java110.core.log.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 
 
@@ -47,7 +48,7 @@
  * // modify by 寮犱笁 at 2021-09-12 绗�10琛屽湪鏌愮鍦烘櫙涓嬪瓨鍦ㄦ煇绉峛ug 闇�瑕佷慨澶嶏紝娉ㄩ噴10鑷�20琛� 鍔犲叆 20琛岃嚦30琛�
  */
 @Java110Cmd(serviceCode = "payFeeBatch.updatePayFeeBatch")
-public class UpdatePayFeeBatchCmd extends AbstractServiceCmdListener {
+public class UpdatePayFeeBatchCmd extends Cmd {
 
     private static Logger logger = LoggerFactory.getLogger(UpdatePayFeeBatchCmd.class);
 
@@ -58,12 +59,15 @@
     @Autowired
     private IFeeInnerServiceSMO feeInnerServiceSMOImpl;
 
+    @Autowired
+    private IMeterWaterV1InnerServiceSMO meterWaterV1InnerServiceSMOImpl;
+
     @Override
     public void validate(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) {
         Assert.hasKeyAndValue(reqJson, "batchId", "batchId涓嶈兘涓虹┖");
         Assert.hasKeyAndValue(reqJson, "communityId", "communityId涓嶈兘涓虹┖");
         Assert.hasKeyAndValue(reqJson, "state", "鐘舵�佷笉鑳戒负绌�");
-        Assert.hasKeyAndValue(reqJson, "message", "娑堟伅涓嶈兘涓虹┖");
+        Assert.hasKeyAndValue(reqJson, "msg", "娑堟伅涓嶈兘涓虹┖");
     }
 
     @Override
@@ -84,7 +88,7 @@
             throw new CmdException("鏇存柊鏁版嵁澶辫触");
         }
 
-        if (!PayFeeBatchDto.STATE_FAIL.equals(payFeeBatchPo.getState())) {
+        if (PayFeeBatchDto.STATE_FAIL.equals(payFeeBatchPo.getState())) {
             cmdDataFlowContext.setResponseEntity(ResultVo.success());
             return;
         }
@@ -94,6 +98,12 @@
         feePo.setCommunityId(payFeeBatchPo.getCommunityId());
         feeInnerServiceSMOImpl.deleteFeesByBatch(feePo);
 
+        //todo 鍒犻櫎鎶勮〃璁板綍
+        MeterWaterDto meterWaterDto = new MeterWaterDto();
+        meterWaterDto.setCommunityId(payFeeBatchPo.getCommunityId());
+        meterWaterDto.setBatchId(payFeeBatchPo.getBatchId());
+        meterWaterV1InnerServiceSMOImpl.deleteMeterWaterByBatch(meterWaterDto);
+
         cmdDataFlowContext.setResponseEntity(ResultVo.success());
     }
 }

--
Gitblit v1.8.0