From 85d0b9efe10e66ac925b2d8532da8b219fe34cb8 Mon Sep 17 00:00:00 2001
From: eli <xumengen_eli@online.com>
Date: Wed, 27 Nov 2024 17:48:36 +0800
Subject: [PATCH] =?UTF-8?q?=E8=BD=A8=E8=BF=B9=E8=AF=A6=E6=83=85=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=E6=94=AF=E6=8C=81=E8=AE=A2=E5=8D=95=E5=8F=B7+?=
 =?UTF-8?q?=E5=AD=90=E7=B3=BB=E7=BB=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Services/TrackOrders/TrackOrderService.cs      | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/src/SJZY.Track.Application/Services/TrackOrders/TrackOrderService.cs b/src/SJZY.Track.Application/Services/TrackOrders/TrackOrderService.cs
index 75806f9e..e21286df 100644
--- a/src/SJZY.Track.Application/Services/TrackOrders/TrackOrderService.cs
+++ b/src/SJZY.Track.Application/Services/TrackOrders/TrackOrderService.cs
@@ -1,3 +1,4 @@
+using System.Linq.Expressions;
 using SJZY.Expand.AliyunOSS;
 using SJZY.Track.Application.Contract.Dtos.ProvideServices;
 using SJZY.Track.Application.Contract.Dtos.TrackOrder;
@@ -108,11 +109,20 @@ public class TrackOrderService : ApplicationService
     /// 根据订单id获取轨迹明细列表
     /// </summary>
     /// <param name="orderId"></param>
+    /// <param name="orderNo"></param>
+    /// <param name="systemId"></param>
     /// <returns></returns>
     [HttpPost("GetDetails")]
-    public async Task<List<TrackOrderDetailDto>> GetTracksAsync(int orderId)
+    public async Task<List<TrackOrderDetailDto>> GetTracksAsync(int orderId, string orderNo, int systemId)
     {
-        var subSystemId = await _orderRepository.GetFirstAsync(x => x.Id == orderId, x => x.SubSystemId);
+        Expression<Func<OrderEntity, bool>> whereExpression = null;
+        if (orderId > 0)
+            whereExpression = m => m.Id == orderId;
+
+        if (string.IsNullOrEmpty(orderNo) && systemId > 0)
+            whereExpression = m => m.OrderNo == orderNo && m.SubSystemId == systemId;
+
+        var subSystemId = await _orderRepository.GetFirstAsync(whereExpression, x => x.SubSystemId);
         if (subSystemId == default)
         {
             throw new BusinessException(message: "订单不存在");