From 7958f1dddb8a7f4e70d232b07a7703955ecedae0 Mon Sep 17 00:00:00 2001
From: Your Name <you@example.com>
Date: 星期六, 26 八月 2023 12:45:33 +0800
Subject: [PATCH] 优化diamante

---
 service-common/src/main/java/com/java110/common/cmd/carInoutPayment/ListCarInoutPaymentCmd.java |   10 +++++++---
 1 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/service-common/src/main/java/com/java110/common/cmd/carInoutPayment/ListCarInoutPaymentCmd.java b/service-common/src/main/java/com/java110/common/cmd/carInoutPayment/ListCarInoutPaymentCmd.java
index bf8f72d..2078ff8 100644
--- a/service-common/src/main/java/com/java110/common/cmd/carInoutPayment/ListCarInoutPaymentCmd.java
+++ b/service-common/src/main/java/com/java110/common/cmd/carInoutPayment/ListCarInoutPaymentCmd.java
@@ -20,8 +20,8 @@
 import com.java110.core.context.ICmdDataFlowContext;
 import com.java110.core.event.cmd.Cmd;
 import com.java110.core.event.cmd.CmdEvent;
-import com.java110.dto.carInoutPayment.CarInoutPaymentDto;
-import com.java110.dto.parkingBoxArea.ParkingBoxAreaDto;
+import com.java110.dto.payment.CarInoutPaymentDto;
+import com.java110.dto.parking.ParkingBoxAreaDto;
 import com.java110.intf.common.ICarInoutPaymentV1InnerServiceSMO;
 import com.java110.intf.community.IParkingBoxAreaV1InnerServiceSMO;
 import com.java110.utils.exception.CmdException;
@@ -68,7 +68,11 @@
     public void doCmd(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) throws CmdException {
 
         CarInoutPaymentDto carInoutPaymentDto = BeanConvertUtil.covertBean(reqJson, CarInoutPaymentDto.class);
-        carInoutPaymentDto.setPaIds(getPaIds(reqJson));
+        if(reqJson.containsKey("boxId")) {
+            carInoutPaymentDto.setPaIds(getPaIds(reqJson));
+        }else{
+            carInoutPaymentDto.setPaId(reqJson.getString("paId"));
+        }
 
         if(!StringUtil.isEmpty(carInoutPaymentDto.getEndTime())){
             Date endTime = DateUtil.getDateFromStringB(carInoutPaymentDto.getEndTime());

--
Gitblit v1.8.0