优化车辆修改

service-api/src/main/java/com/java110/api/listener/owner/DeleteOwnerCarListener.java

@@ -83,8 +83,10 @@ public class DeleteOwnerCarListener extends AbstractServiceApiPlusListener {
             return;
         }
         //释放车位
-        reqJson.put("carNumType", ParkingSpaceDto.STATE_FREE);//修改为空闲
-        parkingSpaceBMOImpl.modifySellParkingSpaceState(reqJson, context);
+        if (reqJson.getString("carId").equals(reqJson.getString("memberId"))) {
+            reqJson.put("carNumType", ParkingSpaceDto.STATE_FREE);//修改为空闲
+            parkingSpaceBMOImpl.modifySellParkingSpaceState(reqJson, context);
+        }
     }
 
     @Override

service-api/src/main/java/com/java110/api/listener/owner/EditOwnerCarListener.java

@@ -67,7 +67,7 @@ public class EditOwnerCarListener extends AbstractServiceApiPlusListener {
         Assert.hasLength(reqJson.getString("communityId"), "小区ID不能为空");
 
         OwnerCarDto ownerCarDto = new OwnerCarDto();
-        ownerCarDto.setCarId(reqJson.getString("carId"));
+        ownerCarDto.setMemberId(reqJson.getString("memberId"));
         ownerCarDto.setCommunityId(reqJson.getString("communityId"));
         List<OwnerCarDto> ownerCarDtos = ownerCarInnerServiceSMOImpl.queryOwnerCars(ownerCarDto);
 

service-api/src/main/java/com/java110/api/listener/owner/SaveOwnerCarMemberListener.java

@@ -117,7 +117,7 @@ public class SaveOwnerCarMemberListener extends AbstractServiceApiPlusListener {
 
         OwnerCarPo ownerCarPo = BeanConvertUtil.covertBean(tmpOwnerCar, OwnerCarPo.class);
         ownerCarPo.setState(OwnerCarDto.STATE_NORMAL);
-        ownerCarPo.setCarTypeCd(OwnerCarDto.CAR_TYPE_PRIMARY);
+        ownerCarPo.setCarTypeCd(OwnerCarDto.CAR_TYPE_MEMBER);
         super.insert(context, ownerCarPo, BusinessTypeConstant.BUSINESS_TYPE_SAVE_OWNER_CAR);
 
     }

service-user/src/main/java/com/java110/user/listener/car/AbstractOwnerCarBusinessServiceDataFlowListener.java

@@ -63,7 +63,7 @@ public abstract class AbstractOwnerCarBusinessServiceDataFlowListener extends Ab
     protected void autoSaveDelBusinessOwnerCar(Business business, JSONObject businessOwnerCar) {
 //自动插入DEL
         Map info = new HashMap();
-        info.put("carId", businessOwnerCar.getString("carId"));
+        info.put("memberId", businessOwnerCar.getString("memberId"));
         info.put("statusCd", StatusConstant.STATUS_CD_VALID);
         List<Map> currentOwnerCarInfos = getOwnerCarServiceDaoImpl().getOwnerCarInfo(info);
         if (currentOwnerCarInfos == null || currentOwnerCarInfos.size() != 1) {

service-user/src/main/java/com/java110/user/listener/car/DeleteOwnerCarInfoListener.java

@@ -161,9 +161,9 @@ public class DeleteOwnerCarInfoListener extends AbstractOwnerCarBusinessServiceD
      */
     private void doBusinessOwnerCar(Business business, JSONObject businessOwnerCar) {
 
-        Assert.jsonObjectHaveKey(businessOwnerCar, "carId", "businessOwnerCar 节点下没有包含 carId 节点");
+        Assert.jsonObjectHaveKey(businessOwnerCar, "memberId", "businessOwnerCar 节点下没有包含 memberId 节点");
 
-        if (businessOwnerCar.getString("carId").startsWith("-")) {
+        if (businessOwnerCar.getString("memberId").startsWith("-")) {
             throw new ListenerExecuteException(ResponseConstant.RESULT_PARAM_ERROR, "carId 错误，不能自动生成（必须已经存在的carId）" + businessOwnerCar);
         }
         //自动插入DEL

service-user/src/main/java/com/java110/user/listener/car/UpdateOwnerCarInfoListener.java

@@ -162,9 +162,9 @@ public class UpdateOwnerCarInfoListener extends AbstractOwnerCarBusinessServiceD
      */
     private void doBusinessOwnerCar(Business business, JSONObject businessOwnerCar) {
 
-        Assert.jsonObjectHaveKey(businessOwnerCar, "carId", "businessOwnerCar 节点下没有包含 carId 节点");
+        Assert.jsonObjectHaveKey(businessOwnerCar, "memberId", "businessOwnerCar 节点下没有包含 carId 节点");
 
-        if (businessOwnerCar.getString("carId").startsWith("-")) {
+        if (businessOwnerCar.getString("memberId").startsWith("-")) {
             throw new ListenerExecuteException(ResponseConstant.RESULT_PARAM_ERROR, "carId 错误，不能自动生成（必须已经存在的carId）" + businessOwnerCar);
         }
         //自动保存DEL