From 3dfbf2598ab5b16ff76a99c7b75c889e261a08bb Mon Sep 17 00:00:00 2001
From: xiaogang <905166056@qq.com>
Date: 星期五, 20 八月 2021 18:00:58 +0800
Subject: [PATCH] 1、收银台费用计算后台计算2、优化显示细节问题
---
service-api/src/main/java/com/java110/api/listener/owner/DeleteCarParkingSpaceListener.java | 21 +++++++++++++--------
1 files changed, 13 insertions(+), 8 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 c90e670..1ab8c03 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,7 +6,6 @@
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;
@@ -77,12 +76,13 @@
ownerCarDto.setCommunityId(reqJson.getString("communityId"));
ownerCarDto.setStatusCd("0");
List<OwnerCarDto> ownerCarDtos = ownerCarInnerServiceSMOImpl.queryOwnerCars(ownerCarDto);
- if(ownerCarDtos!=null && ownerCarDtos.size()>1){
+ if (ownerCarDtos != null && ownerCarDtos.size() > 1) {
throw new IllegalArgumentException("鏈夊涓溅杈嗙粦瀹氭杞︿綅锛岃鍏堝垹闄よ溅杈嗭紒");
}
- String psId = ownerCarDtos.get(0).getPsId();
- if (StringUtil.isEmpty(psId) || "-1".equals(psId)) {
+ String state = ownerCarDtos.get(0).getState();
+
+ if (StringUtil.isEmpty(state) || state.equals(OwnerCarDto.STATE_FINISH)) {
throw new IllegalArgumentException("杞︿綅宸茬粡閲婃斁鏃犻渶閲婃斁");
}
@@ -102,25 +102,30 @@
feeDto.setPayerObjType(FeeDto.PAYER_OBJ_TYPE_CAR);
List<FeeDto> feeDtoList = feeInnerServiceSMOImpl.queryFees(feeDto);
boolean oweFee = false;
+ if (feeDtoList == null || feeDtoList.size() < 1) {
+ oweFee = true;
+ }
for (FeeDto tmpFeeDto : feeDtoList) {
- if (tmpFeeDto.getEndTime().getTime() < ownerCarDto.getEndTime().getTime()) {
+ if (tmpFeeDto.getEndTime().getTime() <= ownerCarDto.getEndTime().getTime()) {
oweFee = true;
break;
+ } else {
+ throw new IllegalArgumentException("璐圭敤鏈紑濮嬶紒");
}
}
- if (OwnerCarDto.STATE_OWE.equals(ownerCarDto.getState())) {
+ if (OwnerCarDto.STATE_FINISH.equals(ownerCarDto.getState())) {
oweFee = false;
}
OwnerCarPo ownerCarPo = new OwnerCarPo();
- ownerCarPo.setPsId("-1");
+// 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);
+ ownerCarPo.setState(OwnerCarDto.STATE_FINISH);
}
super.update(context, ownerCarPo, BusinessTypeConstant.BUSINESS_TYPE_UPDATE_OWNER_CAR);
--
Gitblit v1.8.0