From 3c202c2a1fb6119c23196155f1c4b3e7901987fa Mon Sep 17 00:00:00 2001
From: hardstylewyl <827778732@qq.com>
Date: Wed, 30 Apr 2025 10:53:30 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E8=B0=83=E6=95=B4=E8=AE=A2=E5=8D=95?=
 =?UTF-8?q?=E6=8B=89=E5=8F=96=E6=88=90=E5=8A=9F=E6=B7=BB=E5=8A=A0=E8=BD=A8?=
 =?UTF-8?q?=E8=BF=B9=E6=97=B6=E8=BD=A8=E8=BF=B9=E6=98=8E=E7=BB=86=E5=AD=98?=
 =?UTF-8?q?=E5=82=A8=E7=9A=84=E7=AC=AC=E4=B8=89=E6=96=B9=E5=8D=95=E5=8F=B7?=
 =?UTF-8?q?=E6=94=B9=E4=B8=BA=E4=B8=BB=E5=8D=95=E5=8D=95=E5=8F=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Rabbit/TrackRefreshEventHandler.cs                    | 8 ++++----
 .../Aggregates/OrderAggregate/IOrderRepository.cs         | 4 ++--
 src/SJZY.Track.Repository/Repositories/OrderRepository.cs | 7 ++++---
 3 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/src/SJZY.Track.Application/Rabbit/TrackRefreshEventHandler.cs b/src/SJZY.Track.Application/Rabbit/TrackRefreshEventHandler.cs
index 2903eb5e..5e0e0b82 100644
--- a/src/SJZY.Track.Application/Rabbit/TrackRefreshEventHandler.cs
+++ b/src/SJZY.Track.Application/Rabbit/TrackRefreshEventHandler.cs
@@ -123,11 +123,11 @@ public class TrackRefreshEventHandler : ITransientDependency, IRabbitHandler
         var context = new TrackRefreshContext
         {
             OrderId = order.MainOrderId,
-            OrderType = attach.OrderType,
-            OrderNo = orderNo!,
-            ServiceProviderCode = attach.ServiceProviderCode,
+            OrderNo = order.OrderNo,
             CustomId = order.CustomId,
-            SubSystemId = attach.SubSystemId
+            OrderType = attach.OrderType,
+            SubSystemId = attach.SubSystemId,
+            ServiceProviderCode = attach.ServiceProviderCode
         };
 
 
diff --git a/src/SJZY.Track.Domain/Aggregates/OrderAggregate/IOrderRepository.cs b/src/SJZY.Track.Domain/Aggregates/OrderAggregate/IOrderRepository.cs
index 718124c6..75ce70f3 100644
--- a/src/SJZY.Track.Domain/Aggregates/OrderAggregate/IOrderRepository.cs
+++ b/src/SJZY.Track.Domain/Aggregates/OrderAggregate/IOrderRepository.cs
@@ -24,8 +24,8 @@ public interface IOrderRepository : IBasicRepository<OrderEntity>
     /// </summary>
     /// <param name="serviceProviderCode">三方平台</param>
     /// <param name="orderNo">三方平台单号</param>
-    /// <returns>（主单号id,客户id）</returns>
-    Task<(int MainOrderId, int CustomId)> GetTrackOrderByProviderAndOrderNo(string serviceProviderCode, string orderNo);
+    /// <returns>（主单id,主单号,客户id）</returns>
+    Task<(int MainOrderId, string OrderNo, int CustomId)> GetTrackOrderByProviderAndOrderNo(string serviceProviderCode, string orderNo);
 
     /// <summary>
     /// 创建订单
diff --git a/src/SJZY.Track.Repository/Repositories/OrderRepository.cs b/src/SJZY.Track.Repository/Repositories/OrderRepository.cs
index ace340fa..c4933fcd 100644
--- a/src/SJZY.Track.Repository/Repositories/OrderRepository.cs
+++ b/src/SJZY.Track.Repository/Repositories/OrderRepository.cs
@@ -236,7 +236,7 @@ public class OrderRepository : BasicRepository<OrderEntity>, IOrderRepository, I
         return pageList;
     }
 
-    public async Task<(int MainOrderId, int CustomId)> GetTrackOrderByProviderAndOrderNo(string serviceProviderCode, string orderNo)
+    public async Task<(int MainOrderId, string OrderNo, int CustomId)> GetTrackOrderByProviderAndOrderNo(string serviceProviderCode, string orderNo)
     {
         var orderList = await Context.Queryable<OrderEntity>()
             .LeftJoin<OrderPlatformNumberEntity>((a, b) => a.Id == b.OrderId && b.IsDeleted == false)
@@ -246,6 +246,7 @@ public class OrderRepository : BasicRepository<OrderEntity>, IOrderRepository, I
             {
                 a.Id,
                 a.CustomId,
+                a.OrderNo,
                 b.Platform,
                 b.OrderNumber
             })
@@ -260,8 +261,8 @@ public class OrderRepository : BasicRepository<OrderEntity>, IOrderRepository, I
         //当出现了多条记录匹配，优先使用外部单匹配提升精确度
         var matchOrder = orderList.FirstOrDefault(x => x.Platform == serviceProviderCode && x.OrderNumber == orderNo);
         return matchOrder != null
-            ? (matchOrder.Id, matchOrder.CustomId)
-            : (order.Id, order.CustomId);
+            ? (matchOrder.Id, matchOrder.OrderNo, matchOrder.CustomId)
+            : (order.Id, order.OrderNo, order.CustomId);
     }
 
     public async Task<int> CreateOrderAsync(OrderEntity order)