From 0fea532b07be89978343cb4aede3693af99f5656 Mon Sep 17 00:00:00 2001
From: Your Name <you@example.com>
Date: 星期二, 25 七月 2023 23:04:41 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity
---
service-user/src/main/java/com/java110/user/cmd/owner/SaveOwnerCarCmd.java | 35 +++++++++++++++++++----------------
1 files changed, 19 insertions(+), 16 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 39e4287..c404de9 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
@@ -19,7 +19,7 @@
import com.java110.intf.user.IOwnerCarInnerServiceSMO;
import com.java110.intf.user.IOwnerCarV1InnerServiceSMO;
import com.java110.po.car.OwnerCarPo;
-import com.java110.po.ownerCarAttr.OwnerCarAttrPo;
+import com.java110.po.owner.OwnerCarAttrPo;
import com.java110.po.parking.ParkingSpacePo;
import com.java110.utils.cache.MappingCache;
import com.java110.utils.exception.CmdException;
@@ -59,25 +59,28 @@
@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涓嶈兘涓虹┖");
-
+ //妫�鏌ヨ溅浣嶆槸鍚︽槸绌洪棽鐘舵��
+ 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("璇ヨ溅浣嶄笉鏄┖闂茬姸鎬侊紒");
+ }
//鏍￠獙杞︾墝鍙锋槸鍚﹀瓨鍦�
OwnerCarDto ownerCarDto = new OwnerCarDto();
ownerCarDto.setCommunityId(reqJson.getString("communityId"));
ownerCarDto.setCarNum(reqJson.getString("carNum"));
+ ownerCarDto.setPaIds(new String[]{parkingSpaceDtos.get(0).getPaId()});
ownerCarDto.setCarTypeCds(new String[]{OwnerCarDto.CAR_TYPE_PRIMARY, OwnerCarDto.CAR_TYPE_MEMBER}); // 涓存椂杞﹂櫎澶�
int count = ownerCarInnerServiceSMOImpl.queryOwnerCarsCount(ownerCarDto);
@@ -119,7 +122,7 @@
if (!OwnerCarDto.LEASE_TYPE_MONTH.equals(reqJson.getString("leaseType"))) {
reqJson.put("startTime", DateUtil.getFormatTimeString(new Date(), DateUtil.DATE_FORMATE_STRING_B));
- reqJson.put("endTime", "2037-01-01");
+ reqJson.put("endTime", "2050-01-01");
}
JSONObject businessOwnerCar = new JSONObject();
businessOwnerCar.putAll(reqJson);
@@ -158,8 +161,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