feat: 批量拉取轨迹 payload 增加 trackNo、otherNo #3

Merged
zzh merged 1 commits from test into master 2026-10-12 16:39:53 +08:00
5 changed files with 34 additions and 3 deletions

View File

@ -3,7 +3,17 @@ namespace TrackCenter.Application.Dtos.TrackPull;
public class TrackPullPayload public class TrackPullPayload
{ {
/// <summary> /// <summary>
/// 订单号 /// 订单号(按拉取优先级配置的单号类型解析后的主单号)
/// </summary> /// </summary>
public string OrderNo { get; set; } = null!; public string OrderNo { get; set; } = null!;
/// <summary>
/// 尾程单号 / 跟踪号
/// </summary>
public string? TrackNo { get; set; }
/// <summary>
/// 其他单号
/// </summary>
public string? OtherNo { get; set; }
} }

View File

@ -62,6 +62,8 @@ public class ProvideQueries : SqlSugarRootlessRepository<TrackCenterDbContext>,
OrderNo = d.OrderNoType == TrackOrderNoType.客户单号 ? a.OrderNo : OrderNo = d.OrderNoType == TrackOrderNoType.客户单号 ? a.OrderNo :
d.OrderNoType == TrackOrderNoType.跟踪单号 ? a.TrackNo : d.OrderNoType == TrackOrderNoType.跟踪单号 ? a.TrackNo :
d.OrderNoType == TrackOrderNoType.其他单号 ? a.ThirdPartyOrderNumber : a.OrderNo, d.OrderNoType == TrackOrderNoType.其他单号 ? a.ThirdPartyOrderNumber : a.OrderNo,
TrackNo = a.TrackNo,
OtherNo = a.ThirdPartyOrderNumber,
OrderType = a.OrderType, OrderType = a.OrderType,
AppKey = a.AppKey, AppKey = a.AppKey,
ServiceProviderCode = b.ServiceProviderCode, ServiceProviderCode = b.ServiceProviderCode,
@ -165,6 +167,8 @@ public class ProvideQueries : SqlSugarRootlessRepository<TrackCenterDbContext>,
OrderNo = config.OrderNoType == TrackOrderNoType.客户单号 ? a.OrderNo : OrderNo = config.OrderNoType == TrackOrderNoType.客户单号 ? a.OrderNo :
config.OrderNoType == TrackOrderNoType.跟踪单号 ? a.TrackNo : config.OrderNoType == TrackOrderNoType.跟踪单号 ? a.TrackNo :
config.OrderNoType == TrackOrderNoType.其他单号 ? a.ThirdPartyOrderNumber : a.OrderNo, config.OrderNoType == TrackOrderNoType.其他单号 ? a.ThirdPartyOrderNumber : a.OrderNo,
TrackNo = a.TrackNo,
OtherNo = a.ThirdPartyOrderNumber,
OrderType = a.OrderType, OrderType = a.OrderType,
AppKey = a.AppKey, AppKey = a.AppKey,
ServiceProviderCode = b.ServiceProviderCode ServiceProviderCode = b.ServiceProviderCode

View File

@ -68,7 +68,9 @@ public class TrackPullService : ApplicationServiceBase
{ {
var data = new List<object>(group.Select(x => new TrackPullPayload 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 serviceProviderCode = group.Key.ServiceProviderCode;
var attach = Base64Helper.SerializeObject(new TrackRefreshAttach(group.Key.ServiceProviderCode, var attach = Base64Helper.SerializeObject(new TrackRefreshAttach(group.Key.ServiceProviderCode,

View File

@ -106,7 +106,9 @@ public class TrackPullTask(
{ {
var data = new List<object>(group.Select(x => new TrackPullPayload 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, var attach = Base64Helper.SerializeObject(new TrackRefreshAttach(config.ServiceProviderCode,
config.AppKey, group.Key)); config.AppKey, group.Key));

View File

@ -2,8 +2,21 @@ namespace TrackCenter.Domain.Dtos.Order;
public class OrderWithServiceProviderVO public class OrderWithServiceProviderVO
{ {
/// <summary>
/// 按拉取优先级配置解析后的主单号(可能是客户单号/跟踪号/其他单号)
/// </summary>
public string OrderNo { get; set; } = null!; public string OrderNo { get; set; } = null!;
/// <summary>
/// 尾程单号 / 跟踪号
/// </summary>
public string? TrackNo { get; set; }
/// <summary>
/// 其他单号
/// </summary>
public string? OtherNo { get; set; }
/// <summary> /// <summary>
/// 订单类型 /// 订单类型
/// </summary> /// </summary>