Merge branch 'S02-轨迹中台' into test

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

@@ -32,6 +32,16 @@ namespace SJZY.Track.Application.Contract.Dtos.ProvideServices
         /// </summary>
         public int OrderId { set; get; }
 
+        /// <summary>
+        /// 订单类型（主数据枚举TrackOrderType）
+        /// </summary>
+        public int OrderType { get; set; }
+
+        /// <summary>
+        /// 订单号
+        /// </summary>
+        public string OrderNo { get; set; } = null!;
+
         /// <summary>
         /// 轨迹代码
         /// </summary>

src/SJZY.Track.Application/Services/TrackPull/TrackPullCacheService.cs

@@ -35,7 +35,7 @@ public class TrackPullCacheService : ApplicationService, ITrackPullCacheService,
         var data = new TrackPullConfigDto();
 
         Expression<Func<TrackPullConfigEntity, bool>> exp = x =>
-        (!id.HasValue || x.Id == id) && (id.HasValue || (x.SubSystemId == subSystemId && x.ServiceProviderId == serviceProviderId));
+        (id == null || x.Id == id) && (id != null || (x.SubSystemId == subSystemId && x.ServiceProviderId == serviceProviderId));
 
         var trackPullConfigEntity = await _trackPullConfigRepository.GetFirstAsync(exp);
         if (trackPullConfigEntity == null) return data;

src/SJZY.Track.Domain/Dtos/Order/GetPageTrackOrderInputVO.cs

@@ -70,9 +70,9 @@ namespace SJZY.Track.Domain.Dtos.Order
         public int OrderType { get; set; }
 
         /// <summary>
-        /// 订单名称
+        /// 订单类型名称
         /// </summary>
-        public string OrderTypeName { get; set; }
+        public string? OrderTypeName { get; set; }
 
         /// <summary>
         /// 订单号