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 { /// - /// 订单号 + /// 订单号(按拉取优先级配置的单号类型解析后的主单号) /// public string OrderNo { get; set; } = null!; + + /// + /// 尾程单号 / 跟踪号 + /// + public string? TrackNo { get; set; } + + /// + /// 其他单号 + /// + 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, 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, 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(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(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 { + /// + /// 按拉取优先级配置解析后的主单号(可能是客户单号/跟踪号/其他单号) + /// public string OrderNo { get; set; } = null!; + /// + /// 尾程单号 / 跟踪号 + /// + public string? TrackNo { get; set; } + + /// + /// 其他单号 + /// + public string? OtherNo { get; set; } + /// /// 订单类型 ///