From f1d9bedb3b155daa73274c0d5d82bcd8eb817595 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期六, 27 二月 2021 18:56:28 +0800
Subject: [PATCH] 加入字母车位
---
service-api/src/main/java/com/java110/api/bmo/parkingSpace/impl/ParkingSpaceBMOImpl.java | 20 +++++++++++++++-----
1 files changed, 15 insertions(+), 5 deletions(-)
diff --git a/service-api/src/main/java/com/java110/api/bmo/parkingSpace/impl/ParkingSpaceBMOImpl.java b/service-api/src/main/java/com/java110/api/bmo/parkingSpace/impl/ParkingSpaceBMOImpl.java
index c91abdf..1f745e5 100644
--- a/service-api/src/main/java/com/java110/api/bmo/parkingSpace/impl/ParkingSpaceBMOImpl.java
+++ b/service-api/src/main/java/com/java110/api/bmo/parkingSpace/impl/ParkingSpaceBMOImpl.java
@@ -4,13 +4,14 @@
import com.java110.api.bmo.ApiBaseBMO;
import com.java110.api.bmo.parkingSpace.IParkingSpaceBMO;
import com.java110.core.context.DataFlowContext;
-import com.java110.intf.community.IParkingSpaceInnerServiceSMO;
-import com.java110.intf.fee.IFeeConfigInnerServiceSMO;
-import com.java110.intf.fee.IFeeInnerServiceSMO;
+import com.java110.core.factory.GenerateCodeFactory;
import com.java110.dto.fee.FeeConfigDto;
import com.java110.dto.fee.FeeDto;
import com.java110.dto.owner.OwnerCarDto;
import com.java110.dto.parking.ParkingSpaceDto;
+import com.java110.intf.community.IParkingSpaceInnerServiceSMO;
+import com.java110.intf.fee.IFeeConfigInnerServiceSMO;
+import com.java110.intf.fee.IFeeInnerServiceSMO;
import com.java110.po.car.OwnerCarPo;
import com.java110.po.fee.PayFeeDetailPo;
import com.java110.po.fee.PayFeePo;
@@ -22,6 +23,7 @@
import com.java110.utils.exception.ListenerExecuteException;
import com.java110.utils.util.BeanConvertUtil;
import com.java110.utils.util.DateUtil;
+import com.java110.utils.util.StringUtil;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -212,9 +214,17 @@
JSONObject businessOwnerCar = new JSONObject();
businessOwnerCar.putAll(paramInJson);
- businessOwnerCar.put("carId", "-1");
+ businessOwnerCar.put("memberId", GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_carId));
+ if (!paramInJson.containsKey("carId") || paramInJson.getString("carId").startsWith("-")) {
+ businessOwnerCar.put("carId", businessOwnerCar.getString("memberId"));
+ }
OwnerCarPo ownerCarPo = BeanConvertUtil.covertBean(businessOwnerCar, OwnerCarPo.class);
ownerCarPo.setState(OwnerCarDto.STATE_NORMAL);
+
+ //娌℃湁鎸囧畾鏃朵负涓昏杞﹁締
+ if (!paramInJson.containsKey("carTypeCd") || StringUtil.isEmpty(paramInJson.getString("carTypeCd"))) {
+ ownerCarPo.setCarTypeCd(OwnerCarDto.CAR_TYPE_PRIMARY);
+ }
super.insert(dataFlowContext, ownerCarPo, BusinessTypeConstant.BUSINESS_TYPE_SAVE_OWNER_CAR);
}
@@ -233,7 +243,7 @@
if (parkingSpaceDtos == null || parkingSpaceDtos.size() != 1) {
//throw new ListenerExecuteException(ResponseConstant.RESULT_CODE_ERROR, "鏈煡璇㈠埌鍋滆溅浣嶄俊鎭�" + JSONObject.toJSONString(parkingSpaceDto));
- return ;
+ return;
}
parkingSpaceDto = parkingSpaceDtos.get(0);
--
Gitblit v1.8.0