From 5c23609bcc876f3e8b4fa3a78059a9ad67724546 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期五, 17 三月 2023 15:26:06 +0800
Subject: [PATCH] optimize staff

---
 service-common/src/main/java/com/java110/common/charge/ChargeCoreImpl.java |   11 +++++++++--
 1 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/service-common/src/main/java/com/java110/common/charge/ChargeCoreImpl.java b/service-common/src/main/java/com/java110/common/charge/ChargeCoreImpl.java
index 10b7b1b..28608b2 100644
--- a/service-common/src/main/java/com/java110/common/charge/ChargeCoreImpl.java
+++ b/service-common/src/main/java/com/java110/common/charge/ChargeCoreImpl.java
@@ -219,7 +219,11 @@
         chargeMachineDto.setMachineCode(notifyChargeOrderDto.getMachineCode());
         List<ChargeMachineDto> chargeMachineDtos = chargeMachineV1InnerServiceSMOImpl.queryChargeMachines(chargeMachineDto);
 
-        Assert.listOnlyOne(chargeMachineDtos, "鍏呯數妗� 涓嶅瓨鍦�");
+        //Assert.listOnlyOne(chargeMachineDtos, "鍏呯數妗� 涓嶅瓨鍦�");
+
+        if(chargeMachineDtos == null || chargeMachineDtos.size() < 1){
+            return new ResultVo(ResultVo.CODE_OK, "鎴愬姛");
+        }
 
         // todo 鎻掓Ы鏄惁绌洪棽
 
@@ -228,7 +232,10 @@
         chargeMachinePortDto.setPortCode(notifyChargeOrderDto.getPortCode());
         chargeMachinePortDto.setState(ChargeMachinePortDto.STATE_WORKING);
         List<ChargeMachinePortDto> chargeMachinePortDtos = chargeMachinePortV1InnerServiceSMOImpl.queryChargeMachinePorts(chargeMachinePortDto);
-        Assert.listOnlyOne(chargeMachinePortDtos, "鎻掓Ы绌洪棽");
+        //Assert.listOnlyOne(chargeMachinePortDtos, "鎻掓Ы绌洪棽");
+        if(chargeMachinePortDtos == null || chargeMachinePortDtos.size() < 1){
+            return new ResultVo(ResultVo.CODE_OK, "鎴愬姛");
+        }
 
         ChargeMachinePortPo chargeMachinePortPo = new ChargeMachinePortPo();
         chargeMachinePortPo.setPortId(chargeMachinePortDtos.get(0).getPortId());

--
Gitblit v1.8.0