update: 由于S06新增了字段，现增加填充拉取轨迹请求接口通回调填充轨迹明细的数据

update: 【提供接口 /ProviderService/Track/Query】轨迹查询接口增加S06新增字段

src/SJZY.Track.Application.Contract/Dtos/ProvideServices/GetTrackOutput.cs

@@ -7,6 +7,9 @@ public class GetTrackOutput
     /// </summary>
     public string OrderNo { get; set; } = null!;
 
+    /// <summary>
+    /// 轨迹明细列表
+    /// </summary>
     public List<TrackDetail> TrackDetails { get; set; } = new();
 }
 
@@ -32,4 +35,70 @@ public class TrackDetail
     /// 是否对外
     /// </summary>
     public bool IsDisplay { get; set; }
+
+    /// <summary>
+    /// 客户是否可见
+    /// </summary>
+    public bool IsVisibility { get; set; }
+
+    /// <summary>
+    /// 数据来源：1外部服务商创建，2内部系统创建，3人工创建
+    /// </summary>
+    public int Source { get; set; }
+
+    /// <summary>
+    /// 备注
+    /// </summary>
+    public string? Remarks { get; set; }
+
+    /// <summary>
+    /// 附件集合
+    /// </summary>
+    public List<FileItemDto>? Files { get; set; }
+
+    /// <summary>
+    /// 轨迹发生地（城市）
+    /// </summary>
+    public string? TrackPlaceCity { get; set; }
+
+    /// <summary>
+    /// 轨迹发生地（城市）Id
+    /// </summary>
+    public int? TrackPlaceCityId { get; set; }
+
+    /// <summary>
+    /// 轨迹发生地（省/州）
+    /// </summary>
+    public string? TrackPlaceProvince { get; set; }
+
+    /// <summary>
+    /// 轨迹发生地（省/州）Id
+    /// </summary>
+    public int? TrackPlaceProvinceId { get; set; }
+
+    /// <summary>
+    /// 轨迹发生地（国家/地区）
+    /// </summary>
+    public string? TrackPlaceNation { get; set; }
+
+    /// <summary>
+    /// 轨迹发生地（国家/地区）Id
+    /// </summary>
+    public int? TrackPlaceNationId { get; set; }
+
+    /// <summary>
+    /// 轨迹发生地邮编
+    /// </summary>
+    public string? TrackPlacePostcode { get; set; }
+
+
+    /// <summary>
+    /// 预计到达时间
+    /// </summary>
+    public DateTime? EstimatedDeliveryDate { get; set; }
+
+    /// <summary>
+    /// 目的地时区
+    /// </summary>
+    public float? DestinationTimeZone { get; set; }
 }

src/SJZY.Track.Application/Rabbit/TrackRefreshEventHandler.cs

@@ -15,6 +15,7 @@ using SJZY.Track.Application.Contract.Services;
 using SJZY.Track.Application.Helpers;
 using SJZY.Track.Domain.Aggregates.OrderAggregate;
 using SJZY.Track.Domain.Aggregates.TrackDetailsAggregate;
+using SJZY.Track.Domain.Enums;
 using Volo.Abp.DependencyInjection;
 
 namespace SJZY.Track.Application.Rabbit;
@@ -258,6 +259,22 @@ public class TrackRefreshEventHandler : ITransientDependency, IRabbitHandler
             TrackTime = trackTime ?? DateTime.Now,
             TrackTimeZone = trackTimeZone ?? GlobalConst.NoneTrackTimeZone,
             IsAdd = true,
+            //S06新增
+            IsVisibility = false,
+            Source = (int)TrackSourceEnum.ExternalServiceProvide,
+            Remarks = GlobalConst.EmptyString,
+            Files = null,
+            Content = GlobalConst.EmptyString,
+            EnStatus = GlobalConst.EmptyString,
+            TrackPlaceCity = GlobalConst.EmptyString,
+            TrackPlaceCityId = GlobalConst.NotExistId,
+            TrackPlaceProvince = GlobalConst.EmptyString,
+            TrackPlaceProvinceId = GlobalConst.NotExistId,
+            TrackPlaceNation = GlobalConst.EmptyString,
+            TrackPlaceNationId = GlobalConst.NotExistId,
+            TrackPlacePostcode = GlobalConst.EmptyString,
+            DestinationTimeZone = null,
+            EstimatedDeliveryDate = null,
         };
 
         await _capPublisher.PublishAsync(GlobalConst.TrackUpsertForRefreshSubscribe, trackUpsertEvent);
@@ -281,7 +298,26 @@ public class TrackRefreshEventHandler : ITransientDependency, IRabbitHandler
             OriginTrackDataHash = StringHelper.GetHash(JsonConvert.SerializeObject(trackToken)),
             OriginTrackContent = trackContent ?? GlobalConst.EmptyString,
             CreateUser = GlobalConst.SystemUser,
-            CreateTime = DateTime.Now
+            CreateTime = DateTime.Now,
+            //来源轨迹内容,第一次新增的时候使用轨迹内容表提供的
+            TrackStatus = GlobalConst.EmptyString,
+            TrackStatusCode = GlobalConst.EmptyString,
+            TrackContent = GlobalConst.EmptyString,
+            TrackEnContent = GlobalConst.EmptyString,
+            //S06新增轨迹明细字段
+            IsVisibility = false,
+            Source = (int) TrackSourceEnum.ExternalServiceProvide,
+            Remarks = GlobalConst.EmptyString,
+            Files = null,
+            TrackPlaceCity = GlobalConst.EmptyString,
+            TrackPlaceCityId = GlobalConst.NotExistId,
+            TrackPlaceProvince = GlobalConst.EmptyString,
+            TrackPlaceProvinceId = GlobalConst.NotExistId,
+            TrackPlaceNation = GlobalConst.EmptyString,
+            TrackPlaceNationId = GlobalConst.NotExistId,
+            TrackPlacePostcode = GlobalConst.EmptyString,
+            DestinationTimeZone = null,
+            EstimatedDeliveryDate = null,
         };
 
         track.ZeroTrackTime = Math.Abs(track.TrackTimeZone - GlobalConst.NoneTrackTimeZone) < 1

src/SJZY.Track.Application/Services/ProvideServices/TrackService.Query.cs

@@ -62,7 +62,24 @@ public partial class TrackService
                 TimeZone = Math.Abs(x.TrackTimeZone - GlobalConst.NoneTrackTimeZone) < 1
                     ? null
                     : input.TimeZone ?? 8,
-                IsDisplay = trackContentDic.TryGetValue(x.TrackCode, out var isExternal) && isExternal
+                IsDisplay = trackContentDic.TryGetValue(x.TrackCode, out var isExternal) && isExternal,
+                IsVisibility =  x.IsVisibility,
+                Source = x.Source,
+                Remarks = x.Remarks,
+                Files = x.Files?.Select(y => new FileItemDto
+                {
+                   FileName = y.FileName,
+                   OssKey = y.OssKey
+                }).ToList(),
+                TrackPlaceCity = x.TrackPlaceCity,
+                TrackPlaceCityId = x.TrackPlaceCityId,
+                TrackPlaceProvince = x.TrackPlaceProvince,
+                TrackPlaceProvinceId = x.TrackPlaceProvinceId,
+                TrackPlaceNation = x.TrackPlaceNation,
+                TrackPlaceNationId = x.TrackPlaceNationId,
+                TrackPlacePostcode = x.TrackPlacePostcode,
+                DestinationTimeZone = x.DestinationTimeZone,
+                EstimatedDeliveryDate = x.EstimatedDeliveryDate
             }).ToList();
 
             res.Add(item);