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/fee/PayFeeListener.java | 23 ++++++++++++++++++++++-
1 files changed, 22 insertions(+), 1 deletions(-)
diff --git a/service-api/src/main/java/com/java110/api/listener/fee/PayFeeListener.java b/service-api/src/main/java/com/java110/api/listener/fee/PayFeeListener.java
index 6a4adae..97140e8 100755
--- a/service-api/src/main/java/com/java110/api/listener/fee/PayFeeListener.java
+++ b/service-api/src/main/java/com/java110/api/listener/fee/PayFeeListener.java
@@ -14,9 +14,11 @@
import com.java110.dto.fee.FeeDto;
import com.java110.dto.feeReceipt.FeeReceiptDetailDto;
import com.java110.dto.owner.OwnerCarDto;
+import com.java110.dto.parking.ParkingSpaceDto;
import com.java110.dto.repair.RepairDto;
import com.java110.dto.repair.RepairUserDto;
import com.java110.entity.center.AppService;
+import com.java110.intf.community.IParkingSpaceInnerServiceSMO;
import com.java110.intf.community.IRepairInnerServiceSMO;
import com.java110.intf.community.IRepairUserInnerServiceSMO;
import com.java110.intf.community.IRoomInnerServiceSMO;
@@ -79,7 +81,6 @@
@Autowired
private IOwnerCarInnerServiceSMO ownerCarInnerServiceSMOImpl;
-
@Autowired
private IPayFeeDetailDiscountBMO payFeeDetailDiscountBMOImpl;
@@ -94,6 +95,9 @@
@Autowired
private IApplyRoomDiscountInnerServiceSMO applyRoomDiscountInnerServiceSMOImpl;
+
+ @Autowired
+ private IParkingSpaceInnerServiceSMO parkingSpaceInnerServiceSMOImpl;
@Override
public String getServiceCode() {
@@ -148,7 +152,24 @@
OwnerCarDto ownerCarDto = new OwnerCarDto();
ownerCarDto.setCommunityId(paramObj.getString("communityId"));
ownerCarDto.setCarId(paramObj.getString("carPayerObjId"));
+ ownerCarDto.setCarTypeCd("1001"); //涓氫富杞﹁締
List<OwnerCarDto> ownerCarDtos = ownerCarInnerServiceSMOImpl.queryOwnerCars(ownerCarDto);
+ Assert.listOnlyOne(ownerCarDtos, "鏌ヨ涓氫富閿欒锛�");
+ //鑾峰彇杞︿綅id
+ String psId = ownerCarDtos.get(0).getPsId();
+ //鑾峰彇杞﹁締鐘舵��(1001 姝ｅ父鐘舵�侊紝2002 娆犺垂鐘舵�� 3003 杞︿綅閲婃斁)
+ String carState = ownerCarDtos.get(0).getState();
+ if (!StringUtil.isEmpty(psId) && !StringUtil.isEmpty(carState) && carState.equals("3003")) {
+ ParkingSpaceDto parkingSpaceDto = new ParkingSpaceDto();
+ parkingSpaceDto.setPsId(psId);
+ List<ParkingSpaceDto> parkingSpaceDtos = parkingSpaceInnerServiceSMOImpl.queryParkingSpaces(parkingSpaceDto);
+ Assert.listOnlyOne(parkingSpaceDtos, "鏌ヨ杞︿綅淇℃伅閿欒锛�");
+ //鑾峰彇杞︿綅鐘舵��(鍑哄敭 S锛屽嚭绉� H 锛岀┖闂� F)
+ String state = parkingSpaceDtos.get(0).getState();
+ if (!StringUtil.isEmpty(state) && !state.equals("F")) {
+ throw new IllegalArgumentException("杞︿綅宸茶浣跨敤锛屼笉鑳藉啀缂磋垂锛�");
+ }
+ }
//杞︿綅璐圭敤缁
if (ownerCarDtos != null) {
for (OwnerCarDto tmpOwnerCarDto : ownerCarDtos) {
--
Gitblit v1.8.0