From cab3425bb92d01f3494eb25c1f299038dc634c65 Mon Sep 17 00:00:00 2001
From: Your Name <you@example.com>
Date: 星期三, 15 三月 2023 23:43:48 +0800
Subject: [PATCH] 优化保养转单功能

---
 service-user/src/main/java/com/java110/user/cmd/owner/DeleteOwnerCarsCmd.java |   14 +++++++++-----
 1 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/service-user/src/main/java/com/java110/user/cmd/owner/DeleteOwnerCarsCmd.java b/service-user/src/main/java/com/java110/user/cmd/owner/DeleteOwnerCarsCmd.java
index 99d7463..fdd38e8 100644
--- a/service-user/src/main/java/com/java110/user/cmd/owner/DeleteOwnerCarsCmd.java
+++ b/service-user/src/main/java/com/java110/user/cmd/owner/DeleteOwnerCarsCmd.java
@@ -2,6 +2,7 @@
 
 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.Cmd;
 import com.java110.core.event.cmd.CmdEvent;
@@ -25,6 +26,7 @@
 
 @Java110Cmd(serviceCode = "owner.deleteOwnerCars")
 public class DeleteOwnerCarsCmd extends Cmd {
+
     @Autowired
     private IFeeInnerServiceSMO feeInnerServiceSMOImpl;
 
@@ -42,14 +44,14 @@
 
     @Override
     public void validate(CmdEvent event, ICmdDataFlowContext context, JSONObject reqJson) throws CmdException {
-//Assert.hasKeyAndValue(reqJson, "xxx", "xxx");
+        //Assert.hasKeyAndValue(reqJson, "xxx", "xxx");
 
         Assert.hasKeyAndValue(reqJson, "carId", "carId涓嶈兘涓虹┖");
         Assert.hasKeyAndValue(reqJson, "memberId", "memberId涓嶈兘涓虹┖");
         Assert.hasKeyAndValue(reqJson, "communityId", "灏忓尯ID涓嶈兘涓虹┖");
 
         FeeDto feeDto = new FeeDto();
-        feeDto.setPayerObjId(reqJson.getString("carId"));
+        feeDto.setPayerObjId(reqJson.getString("memberId"));
         feeDto.setCommunityId(reqJson.getString("communityId"));
         feeDto.setPayerObjType(FeeDto.PAYER_OBJ_TYPE_CAR);
         List<FeeDto> feeDtoList = feeInnerServiceSMOImpl.queryFees(feeDto);
@@ -61,6 +63,7 @@
         }
 
         OwnerCarDto ownerCarDto = new OwnerCarDto();
+        ownerCarDto.setCarId(reqJson.getString("carId"));
         ownerCarDto.setMemberId(reqJson.getString("memberId"));
         ownerCarDto.setCommunityId(reqJson.getString("communityId"));
 
@@ -71,14 +74,15 @@
     }
 
     @Override
+    @Java110Transactional
     public void doCmd(CmdEvent event, ICmdDataFlowContext context, JSONObject reqJson) throws CmdException {
         if (reqJson.containsKey("psId") && !StringUtil.isEmpty(reqJson.getString("psId"))) {
             ParkingSpaceDto parkingSpaceDto = new ParkingSpaceDto();
             parkingSpaceDto.setPsId(reqJson.getString("psId"));
             List<ParkingSpaceDto> parkingSpaceDtos = parkingSpaceInnerServiceSMOImpl.queryParkingSpaces(parkingSpaceDto);
-            Assert.listOnlyOne(parkingSpaceDtos, "鏌ヨ杞︿綅閿欒锛�");
-            if (!StringUtil.isEmpty(parkingSpaceDtos.get(0).getParkingType()) && parkingSpaceDtos.get(0).getParkingType().equals("2")
-                    && !StringUtil.isEmpty(reqJson.getString("carTypeCd")) && reqJson.getString("carTypeCd").equals("1001")) { //瀛愭瘝杞︿綅
+            if (parkingSpaceDtos != null && parkingSpaceDtos.size()> 0 &&
+                    "2".equals(parkingSpaceDtos.get(0).getParkingType())
+                    && "1001".equals(reqJson.getString("carTypeCd"))) { //瀛愭瘝杞︿綅
                 OwnerCarDto ownerCarDto = new OwnerCarDto();
                 ownerCarDto.setCarId(reqJson.getString("carId"));
                 ownerCarDto.setPsId(reqJson.getString("psId"));

--
Gitblit v1.8.0