From 390297315364c819eaff83e409c4eae7ed2eeca4 Mon Sep 17 00:00:00 2001
From: rszn <645583145@qq.com>
Date: Wed, 26 Jun 2024 18:02:06 +0800
Subject: [PATCH] =?UTF-8?q?=E5=85=85=E7=94=B5=E8=AE=A2=E5=8D=95=E8=AE=B0?=
 =?UTF-8?q?=E5=BD=95=E6=8D=A2=E7=94=B5=E8=AE=A2=E5=8D=95=E5=8F=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Service/Charger/Client/ChargerClient.cs | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/Service/Charger/Client/ChargerClient.cs b/Service/Charger/Client/ChargerClient.cs
index 183ac37..fed6044 100644
--- a/Service/Charger/Client/ChargerClient.cs
+++ b/Service/Charger/Client/ChargerClient.cs
@@ -11,7 +11,6 @@ using HybirdFrameworkDriver.Session;
 using HybirdFrameworkDriver.TcpClient;
 using log4net;
 using Newtonsoft.Json;
-using Org.BouncyCastle.Asn1.Cmp;
 using Repository.Station;
 using Service.Charger.Codec;
 using Service.Charger.Common;
@@ -172,7 +171,7 @@ public class ChargerClient : TcpClient<IBaseHandler, Decoder, Encoder>
     /// 充电桩状态信息
     /// </summary>
     public ConcurrentDictionary<byte, ChargerPile> ChargerPile = new();
-    
+
     /// <summary>
     /// 充电桩功率
     /// </summary>
@@ -631,7 +630,7 @@ public class ChargerClient : TcpClient<IBaseHandler, Decoder, Encoder>
         }
 
         BatteryNo = binInfo.BatteryNo;
-        if (string.IsNullOrWhiteSpace(BatteryNo))
+        if (string.IsNullOrWhiteSpace(BatteryNo) || "-1" == BatteryNo)
         {
             return Result<bool>.Fail($"charger-{BinNo} battery not exist");
         }
@@ -662,6 +661,9 @@ public class ChargerClient : TcpClient<IBaseHandler, Decoder, Encoder>
             return Result<bool>.Fail(chargeOrderNo.Msg);
         }
 
+        SwapOrderBatteryRepository swapOrderBatteryRepository = AppInfo.Container.Resolve<SwapOrderBatteryRepository>();
+        SwapOrderBattery? swapOrder = swapOrderBatteryRepository.QueryLatestOrderNoByBatterySn(BatteryNo);
+
         ChargeOrderNo = chargeOrderNo.Data;
         _chargeOrderRepository.Insert(new ChargeOrder()
         {
@@ -670,6 +672,7 @@ public class ChargerClient : TcpClient<IBaseHandler, Decoder, Encoder>
             CmdStatus = 0,
             ChargerNo = BinNo,
             ChargeMode = 1,
+            SwapOrderSn = swapOrder?.SwapOrderSn,
             StartMode = 1
         });
 
@@ -724,7 +727,7 @@ public class ChargerClient : TcpClient<IBaseHandler, Decoder, Encoder>
             propertyTimePeriodPeakIden.SetValue(timeRng, timeRng.GetType().GetProperty("TimePeak" + (i + 1)).GetValue(timeRng));
 
 
-            
+
         }
 
         return timeRng;