Merge remote-tracking branch 'origin/master'

src/TrackCenter.Application/Dtos/ProvideServices/GetDetailTimelineOutput.cs

@@ -7,6 +7,16 @@ public class GetDetailTimelineOutput
     /// </summary>
     public string TrackCode { get; set; }
 
+    /// <summary>
+    /// 轨迹状态（如：已揽收、运输中、派送中、已签收）
+    /// </summary>
+    public string TrackStatus { get; set; }
+
+    /// <summary>
+    /// 轨迹状态 code
+    /// </summary>
+    public string TrackStatusCode { get; set; }
+
     /// <summary>
     /// 轨迹内容
     /// </summary>

src/TrackCenter.Application/Services/TrackOrders/TrackOrderService.cs

@@ -223,7 +223,7 @@ public class TrackOrderService : ApplicationServiceBase
                 : item.TrackTime);
             res.Add(new GetDetailTimelineOutput()
             {
-                IsHighlight = true,
+                IsHighlight = false,
                 IsShowHover = true,
                 Remark = item.Remarks == null || item.Remarks == "--" ? "" : item.Remarks,
                 TrackTimeZone = $"GMT{(item.TrackTimeZone >= 0 ? "+" : "-")}{GetTimeZoneStr(item.TrackTimeZone)}",
@@ -240,14 +240,20 @@ public class TrackOrderService : ApplicationServiceBase
                     }).ToList(),
                 Content = item.TrackContent,
                 TrackCode = item.TrackCode,
+                TrackStatus = item.TrackStatus,
+                TrackStatusCode = item.TrackStatusCode,
                 TrackPlaceNation = item.TrackPlaceNation,
                 TrackPlaceProvince = item.TrackPlaceProvince,
                 TrackPlaceCity = item.TrackPlaceCity,
             });
         }
 
-        // 按轨迹发生时间正序排序
+        // 按轨迹发生时间正序排序；最新一条高亮
         res = res.OrderBy(m => m.TrackTime).ToList();
+        if (res.Count > 0)
+        {
+            res[^1].IsHighlight = true;
+        }
 
         return res;
     }