From c2b97e88614a8c0bb641848a4d868f54cb8382df Mon Sep 17 00:00:00 2001
From: xiaogang <905166056@qq.com>
Date: 星期二, 14 二月 2023 17:21:24 +0800
Subject: [PATCH] 1、优化访客预约2、优化报修设置3、优化缴费明细4、其他相关页面bug调整

---
 service-community/src/main/java/com/java110/community/cmd/parkingSpaceApply/DeleteParkingSpaceApplyCmd.java |   41 +++++++++++++++++++++++++++++++----------
 1 files changed, 31 insertions(+), 10 deletions(-)

diff --git a/service-community/src/main/java/com/java110/community/cmd/parkingSpaceApply/DeleteParkingSpaceApplyCmd.java b/service-community/src/main/java/com/java110/community/cmd/parkingSpaceApply/DeleteParkingSpaceApplyCmd.java
index d5f41a1..f810010 100644
--- a/service-community/src/main/java/com/java110/community/cmd/parkingSpaceApply/DeleteParkingSpaceApplyCmd.java
+++ b/service-community/src/main/java/com/java110/community/cmd/parkingSpaceApply/DeleteParkingSpaceApplyCmd.java
@@ -19,18 +19,24 @@
 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.core.factory.GenerateCodeFactory;
+import com.java110.dto.parking.ParkingSpaceDto;
 import com.java110.intf.community.IParkingSpaceApplyV1InnerServiceSMO;
+import com.java110.intf.community.IParkingSpaceV1InnerServiceSMO;
+import com.java110.po.parking.ParkingSpacePo;
 import com.java110.po.parkingSpaceApply.ParkingSpaceApplyPo;
 import com.java110.utils.exception.CmdException;
 import com.java110.utils.util.Assert;
 import com.java110.utils.util.BeanConvertUtil;
+import com.java110.utils.util.StringUtil;
 import com.java110.vo.ResultVo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.slf4j.Logger;
 import com.java110.core.log.LoggerFactory;
+
+import java.util.List;
+
 /**
  * 绫昏〃杩帮細鍒犻櫎
  * 鏈嶅姟缂栫爜锛歱arkingSpaceApply.deleteParkingSpaceApply
@@ -42,30 +48,45 @@
  * // modify by 寮犱笁 at 2021-09-12 绗�10琛屽湪鏌愮鍦烘櫙涓嬪瓨鍦ㄦ煇绉峛ug 闇�瑕佷慨澶嶏紝娉ㄩ噴10鑷�20琛� 鍔犲叆 20琛岃嚦30琛�
  */
 @Java110Cmd(serviceCode = "parkingSpaceApply.deleteParkingSpaceApply")
-public class DeleteParkingSpaceApplyCmd extends AbstractServiceCmdListener {
-  private static Logger logger = LoggerFactory.getLogger(DeleteParkingSpaceApplyCmd.class);
+public class DeleteParkingSpaceApplyCmd extends Cmd {
+
+    private static Logger logger = LoggerFactory.getLogger(DeleteParkingSpaceApplyCmd.class);
 
     @Autowired
     private IParkingSpaceApplyV1InnerServiceSMO parkingSpaceApplyV1InnerServiceSMOImpl;
 
+    @Autowired
+    private IParkingSpaceV1InnerServiceSMO parkingSpaceV1InnerServiceSMOImpl;
+
     @Override
     public void validate(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) {
         Assert.hasKeyAndValue(reqJson, "applyId", "applyId涓嶈兘涓虹┖");
-Assert.hasKeyAndValue(reqJson, "applyId", "applyId涓嶈兘涓虹┖");
-
     }
 
     @Override
     @Java110Transactional
     public void doCmd(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) throws CmdException {
-
-       ParkingSpaceApplyPo parkingSpaceApplyPo = BeanConvertUtil.covertBean(reqJson, ParkingSpaceApplyPo.class);
+        ParkingSpaceApplyPo parkingSpaceApplyPo = BeanConvertUtil.covertBean(reqJson, ParkingSpaceApplyPo.class);
         int flag = parkingSpaceApplyV1InnerServiceSMOImpl.deleteParkingSpaceApply(parkingSpaceApplyPo);
-
         if (flag < 1) {
             throw new CmdException("鍒犻櫎鏁版嵁澶辫触");
         }
-
+        if (!StringUtil.isEmpty(reqJson.getString("state")) && (reqJson.getString("state").equals("2002")
+                || reqJson.getString("state").equals("3003"))) { //瀹℃牳閫氳繃寰呯即璐圭姸鎬佹垨瀹屾垚鐘舵��
+            if (!StringUtil.isEmpty(reqJson.getString("psId"))) {
+                ParkingSpaceDto parkingSpaceDto = new ParkingSpaceDto();
+                parkingSpaceDto.setPsId(reqJson.getString("psId"));
+                List<ParkingSpaceDto> parkingSpaceDtos = parkingSpaceV1InnerServiceSMOImpl.queryParkingSpaces(parkingSpaceDto);
+                Assert.listOnlyOne(parkingSpaceDtos, "鏌ヨ杞︿綅澶辫触");
+                ParkingSpacePo parkingSpacePo = new ParkingSpacePo();
+                parkingSpacePo.setPsId(parkingSpaceDtos.get(0).getPsId());
+                parkingSpacePo.setState("F"); //鍑哄敭 S锛屽嚭绉� H 锛岀┖闂� F
+                int i = parkingSpaceV1InnerServiceSMOImpl.updateParkingSpace(parkingSpacePo);
+                if (i < 1) {
+                    throw new CmdException("鏇存柊鏁版嵁澶辫触");
+                }
+            }
+        }
         cmdDataFlowContext.setResponseEntity(ResultVo.success());
     }
 }

--
Gitblit v1.8.0