From 67f3ba76c79c21fde86618e9484afe1487e68a89 Mon Sep 17 00:00:00 2001
From: zzh <1368735060@qq.com>
Date: Mon, 12 Oct 2026 16:36:40 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E6=89=B9=E9=87=8F=E6=8B=89=E5=8F=96?=
 =?UTF-8?q?=E8=BD=A8=E8=BF=B9=20payload=20=E5=A2=9E=E5=8A=A0=20trackNo?=
 =?UTF-8?q?=E3=80=81otherNo?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Cursor <cursoragent@cursor.com>
---
 .../Dtos/TrackPull/TrackPullPayload.cs              | 12 +++++++++++-
 .../Queries/ProvideQueries.cs                       |  4 ++++
 .../Services/ProvideServices/TrackPullService.cs    |  4 +++-
 .../Services/TimerTaskss/TrackPullTask.cs           |  4 +++-
 .../Dtos/Order/OrderWithServiceProviderVO.cs        | 13 +++++++++++++
 5 files changed, 34 insertions(+), 3 deletions(-)

diff --git a/src/TrackCenter.Application/Dtos/TrackPull/TrackPullPayload.cs b/src/TrackCenter.Application/Dtos/TrackPull/TrackPullPayload.cs
index c48bdded..75612ffa 100644
--- a/src/TrackCenter.Application/Dtos/TrackPull/TrackPullPayload.cs
+++ b/src/TrackCenter.Application/Dtos/TrackPull/TrackPullPayload.cs
@@ -3,7 +3,17 @@ namespace TrackCenter.Application.Dtos.TrackPull;
 public class TrackPullPayload
 {
     /// <summary>
-    /// 订单号
+    /// 订单号（按拉取优先级配置的单号类型解析后的主单号）
     /// </summary>
     public string OrderNo { get; set; } = null!;
+
+    /// <summary>
+    /// 尾程单号 / 跟踪号
+    /// </summary>
+    public string? TrackNo { get; set; }
+
+    /// <summary>
+    /// 其他单号
+    /// </summary>
+    public string? OtherNo { get; set; }
 }
diff --git a/src/TrackCenter.Application/Queries/ProvideQueries.cs b/src/TrackCenter.Application/Queries/ProvideQueries.cs
index 1e5226fc..57da1285 100644
--- a/src/TrackCenter.Application/Queries/ProvideQueries.cs
+++ b/src/TrackCenter.Application/Queries/ProvideQueries.cs
@@ -62,6 +62,8 @@ public class ProvideQueries : SqlSugarRootlessRepository<TrackCenterDbContext>,
                 OrderNo = d.OrderNoType == TrackOrderNoType.客户单号 ? a.OrderNo :
                     d.OrderNoType == TrackOrderNoType.跟踪单号 ? a.TrackNo :
                     d.OrderNoType == TrackOrderNoType.其他单号 ? a.ThirdPartyOrderNumber : a.OrderNo,
+                TrackNo = a.TrackNo,
+                OtherNo = a.ThirdPartyOrderNumber,
                 OrderType = a.OrderType,
                 AppKey = a.AppKey,
                 ServiceProviderCode = b.ServiceProviderCode,
@@ -165,6 +167,8 @@ public class ProvideQueries : SqlSugarRootlessRepository<TrackCenterDbContext>,
                 OrderNo = config.OrderNoType == TrackOrderNoType.客户单号 ? a.OrderNo :
                     config.OrderNoType == TrackOrderNoType.跟踪单号 ? a.TrackNo :
                     config.OrderNoType == TrackOrderNoType.其他单号 ? a.ThirdPartyOrderNumber : a.OrderNo,
+                TrackNo = a.TrackNo,
+                OtherNo = a.ThirdPartyOrderNumber,
                 OrderType = a.OrderType,
                 AppKey = a.AppKey,
                 ServiceProviderCode = b.ServiceProviderCode
diff --git a/src/TrackCenter.Application/Services/ProvideServices/TrackPullService.cs b/src/TrackCenter.Application/Services/ProvideServices/TrackPullService.cs
index 22fd0039..a4248da4 100644
--- a/src/TrackCenter.Application/Services/ProvideServices/TrackPullService.cs
+++ b/src/TrackCenter.Application/Services/ProvideServices/TrackPullService.cs
@@ -68,7 +68,9 @@ public class TrackPullService : ApplicationServiceBase
         {
             var data = new List<object>(group.Select(x => new TrackPullPayload
             {
-                OrderNo = x.OrderNo
+                OrderNo = x.OrderNo,
+                TrackNo = x.TrackNo,
+                OtherNo = x.OtherNo,
             }));
             var serviceProviderCode = group.Key.ServiceProviderCode;
             var attach = Base64Helper.SerializeObject(new TrackRefreshAttach(group.Key.ServiceProviderCode,
diff --git a/src/TrackCenter.Application/Services/TimerTaskss/TrackPullTask.cs b/src/TrackCenter.Application/Services/TimerTaskss/TrackPullTask.cs
index 6c41fdb1..e8c7818b 100644
--- a/src/TrackCenter.Application/Services/TimerTaskss/TrackPullTask.cs
+++ b/src/TrackCenter.Application/Services/TimerTaskss/TrackPullTask.cs
@@ -106,7 +106,9 @@ public class TrackPullTask(
                 {
                     var data = new List<object>(group.Select(x => new TrackPullPayload
                     {
-                        OrderNo = x.OrderNo
+                        OrderNo = x.OrderNo,
+                        TrackNo = x.TrackNo,
+                        OtherNo = x.OtherNo,
                     }));
                     var attach = Base64Helper.SerializeObject(new TrackRefreshAttach(config.ServiceProviderCode,
                         config.AppKey, group.Key));
diff --git a/src/TrackCenter.Domain/Dtos/Order/OrderWithServiceProviderVO.cs b/src/TrackCenter.Domain/Dtos/Order/OrderWithServiceProviderVO.cs
index 13fe51f8..9fd09ccd 100644
--- a/src/TrackCenter.Domain/Dtos/Order/OrderWithServiceProviderVO.cs
+++ b/src/TrackCenter.Domain/Dtos/Order/OrderWithServiceProviderVO.cs
@@ -2,8 +2,21 @@ namespace TrackCenter.Domain.Dtos.Order;
 
 public class OrderWithServiceProviderVO
 {
+    /// <summary>
+    /// 按拉取优先级配置解析后的主单号（可能是客户单号/跟踪号/其他单号）
+    /// </summary>
     public string OrderNo { get; set; } = null!;
 
+    /// <summary>
+    /// 尾程单号 / 跟踪号
+    /// </summary>
+    public string? TrackNo { get; set; }
+
+    /// <summary>
+    /// 其他单号
+    /// </summary>
+    public string? OtherNo { get; set; }
+
     /// <summary>
     /// 订单类型
     /// </summary>