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/SaveOwnerCarCmd.java | 46 +++++++++++++++++++++++++++-------------------
1 files changed, 27 insertions(+), 19 deletions(-)
diff --git a/service-user/src/main/java/com/java110/user/cmd/owner/SaveOwnerCarCmd.java b/service-user/src/main/java/com/java110/user/cmd/owner/SaveOwnerCarCmd.java
index d572870..0847b54 100644
--- a/service-user/src/main/java/com/java110/user/cmd/owner/SaveOwnerCarCmd.java
+++ b/service-user/src/main/java/com/java110/user/cmd/owner/SaveOwnerCarCmd.java
@@ -22,14 +22,14 @@
import com.java110.po.ownerCarAttr.OwnerCarAttrPo;
import com.java110.po.parking.ParkingSpacePo;
import com.java110.utils.cache.MappingCache;
-import com.java110.utils.constant.ResponseConstant;
import com.java110.utils.exception.CmdException;
-import com.java110.utils.exception.ListenerExecuteException;
import com.java110.utils.util.Assert;
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 java.util.Date;
import java.util.List;
@Java110Cmd(serviceCode = "owner.saveOwnerCar")
@@ -59,23 +59,21 @@
@Override
public void validate(CmdEvent event, ICmdDataFlowContext context, JSONObject reqJson) throws CmdException {
- Assert.jsonObjectHaveKey(reqJson, "communityId", "鏈寘鍚皬鍖篒D");
- Assert.jsonObjectHaveKey(reqJson, "ownerId", "璇锋眰鎶ユ枃涓湭鍖呭惈ownerId");
- Assert.jsonObjectHaveKey(reqJson, "carNum", "璇锋眰鎶ユ枃涓湭鍖呭惈carNum");
- Assert.jsonObjectHaveKey(reqJson, "carBrand", "璇锋眰鎶ユ枃涓湭鍖呭惈carBrand");
- Assert.jsonObjectHaveKey(reqJson, "carType", "璇锋眰鎶ユ枃涓湭鍖呭惈carType");
- Assert.jsonObjectHaveKey(reqJson, "carColor", "鏈寘鍚玞arColor");
- Assert.jsonObjectHaveKey(reqJson, "psId", "鏈寘鍚玴sId");
- Assert.jsonObjectHaveKey(reqJson, "storeId", "鏈寘鍚玸toreId");
- Assert.jsonObjectHaveKey(reqJson, "carNumType", "鏈寘鍚玞arNumType");
+ Assert.hasKeyAndValue(reqJson, "communityId", "鏈寘鍚皬鍖篒D");
+ Assert.hasKeyAndValue(reqJson, "ownerId", "璇锋眰鎶ユ枃涓湭鍖呭惈ownerId");
+ Assert.hasKeyAndValue(reqJson, "carNum", "璇锋眰鎶ユ枃涓湭鍖呭惈carNum");
+ Assert.hasKeyAndValue(reqJson, "carType", "璇锋眰鎶ユ枃涓湭鍖呭惈carType");
+ Assert.hasKeyAndValue(reqJson, "psId", "鏈寘鍚玴sId");
- Assert.hasLength(reqJson.getString("communityId"), "灏忓尯ID涓嶈兘涓虹┖");
- Assert.hasLength(reqJson.getString("ownerId"), "ownerId涓嶈兘涓虹┖");
- Assert.hasLength(reqJson.getString("psId"), "psId涓嶈兘涓虹┖");
-
- if (!"H".equals(reqJson.getString("carNumType"))
- && !"S".equals(reqJson.getString("carNumType"))) {
- throw new ListenerExecuteException(ResponseConstant.RESULT_CODE_ERROR, "璇锋眰鎶ユ枃涓璼ellOrFire鍊奸敊璇� 锛屽嚭鍞负S 鍑虹涓篐");
+ //妫�鏌ヨ溅浣嶆槸鍚︽槸绌洪棽鐘舵��
+ ParkingSpaceDto parkingSpaceDto = new ParkingSpaceDto();
+ parkingSpaceDto.setPsId(reqJson.getString("psId"));
+ List<ParkingSpaceDto> parkingSpaceDtos = parkingSpaceInnerServiceSMOImpl.queryParkingSpaces(parkingSpaceDto);
+ Assert.listOnlyOne(parkingSpaceDtos, "鏌ヨ杞︿綅閿欒锛�");
+ //鑾峰彇杞︿綅鐘舵��
+ String state = parkingSpaceDtos.get(0).getState();
+ if (StringUtil.isEmpty(state) || !state.equals("F")) {
+ throw new IllegalArgumentException("璇ヨ溅浣嶄笉鏄┖闂茬姸鎬侊紒");
}
//鏍￠獙杞︾墝鍙锋槸鍚﹀瓨鍦�
@@ -117,6 +115,14 @@
@Override
@Java110Transactional
public void doCmd(CmdEvent event, ICmdDataFlowContext context, JSONObject reqJson) throws CmdException {
+ if (!reqJson.containsKey("leaseType")) {
+ reqJson.put("leaseType", OwnerCarDto.LEASE_TYPE_MONTH);
+ }
+
+ if (!OwnerCarDto.LEASE_TYPE_MONTH.equals(reqJson.getString("leaseType"))) {
+ reqJson.put("startTime", DateUtil.getFormatTimeString(new Date(), DateUtil.DATE_FORMATE_STRING_B));
+ reqJson.put("endTime", "2050-01-01");
+ }
JSONObject businessOwnerCar = new JSONObject();
businessOwnerCar.putAll(reqJson);
businessOwnerCar.put("memberId", GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_carId));
@@ -132,6 +138,8 @@
}
//娣诲姞杞﹁締灞炴��
dealOwnerCarAttr(reqJson, ownerCarPo);
+
+
int flag = ownerCarV1InnerServiceSMOImpl.saveOwnerCar(ownerCarPo);
if (flag < 1) {
throw new CmdException("淇濆瓨杞﹁締灞炴�уけ璐�");
@@ -152,8 +160,8 @@
JSONObject businessParkingSpace = new JSONObject();
businessParkingSpace.putAll(BeanConvertUtil.beanCovertMap(parkingSpaceDto));
- businessParkingSpace.put("state", reqJson.getString("carNumType"));
ParkingSpacePo parkingSpacePo = BeanConvertUtil.covertBean(businessParkingSpace, ParkingSpacePo.class);
+ parkingSpacePo.setState("H"); //S 鍑哄敭 H 鍑虹 F 绌洪棽
flag = parkingSpaceV1InnerServiceSMOImpl.updateParkingSpace(parkingSpacePo);
if (flag < 1) {
throw new CmdException("淇敼杞︿綅鐘舵�佸け璐�");
--
Gitblit v1.8.0