From 1024666b99a24bd7d5e4dc442d6b0c0319fa2f29 Mon Sep 17 00:00:00 2001
From: xiaogang <905166056@qq.com>
Date: 星期六, 17 七月 2021 22:56:48 +0800
Subject: [PATCH] 1、优化细节性问题2、优化采购细节问题
---
service-api/src/main/java/com/java110/api/listener/owner/DeleteCarParkingSpaceListener.java | 12 +++++++-----
1 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/service-api/src/main/java/com/java110/api/listener/owner/DeleteCarParkingSpaceListener.java b/service-api/src/main/java/com/java110/api/listener/owner/DeleteCarParkingSpaceListener.java
index 4f68aaf..c90e670 100755
--- a/service-api/src/main/java/com/java110/api/listener/owner/DeleteCarParkingSpaceListener.java
+++ b/service-api/src/main/java/com/java110/api/listener/owner/DeleteCarParkingSpaceListener.java
@@ -6,6 +6,7 @@
import com.java110.core.annotation.Java110Listener;
import com.java110.core.context.DataFlowContext;
import com.java110.core.event.service.api.ServiceDataFlowEvent;
+import com.java110.dto.fee.FeeDetailDto;
import com.java110.dto.fee.FeeDto;
import com.java110.dto.owner.OwnerCarDto;
import com.java110.dto.parking.ParkingSpaceDto;
@@ -68,16 +69,17 @@
@Override
protected void validate(ServiceDataFlowEvent event, JSONObject reqJson) {
Assert.jsonObjectHaveKey(reqJson, "communityId", "鏈寘鍚皬鍖篒D");
- Assert.jsonObjectHaveKey(reqJson, "carId", "璇锋眰鎶ユ枃涓湭鍖呭惈carId");
+// Assert.jsonObjectHaveKey(reqJson, "carId", "璇锋眰鎶ユ枃涓湭鍖呭惈carId");
Assert.hasLength(reqJson.getString("communityId"), "灏忓尯ID涓嶈兘涓虹┖");
OwnerCarDto ownerCarDto = new OwnerCarDto();
ownerCarDto.setCarId(reqJson.getString("carId"));
ownerCarDto.setCommunityId(reqJson.getString("communityId"));
+ ownerCarDto.setStatusCd("0");
List<OwnerCarDto> ownerCarDtos = ownerCarInnerServiceSMOImpl.queryOwnerCars(ownerCarDto);
-
- Assert.listOnlyOne(ownerCarDtos, "鏈壘鍒拌溅杈嗕俊鎭�");
-
+ if(ownerCarDtos!=null && ownerCarDtos.size()>1){
+ throw new IllegalArgumentException("鏈夊涓溅杈嗙粦瀹氭杞︿綅锛岃鍏堝垹闄よ溅杈嗭紒");
+ }
String psId = ownerCarDtos.get(0).getPsId();
if (StringUtil.isEmpty(psId) || "-1".equals(psId)) {
@@ -87,7 +89,6 @@
if (ownerCarDtos.get(0).getEndTime().getTime() > DateUtil.getCurrentDate().getTime()) {
throw new IllegalArgumentException("杞︿綅绉熺敤杩樻湭缁撴潫涓嶈兘閲婃斁");
}
-
reqJson.put("ownerCarDto", ownerCarDtos.get(0));
}
@@ -116,6 +117,7 @@
OwnerCarPo ownerCarPo = new OwnerCarPo();
ownerCarPo.setPsId("-1");
ownerCarPo.setCarId(reqJson.getString("carId"));
+ ownerCarPo.setMemberId(reqJson.getString("memberId"));
ownerCarPo.setCommunityId(reqJson.getString("communityId"));
if (oweFee) {
ownerCarPo.setState(OwnerCarDto.STATE_OWE);
--
Gitblit v1.8.0