diff --git a/src/SJZY.Track.Application/Services/TrackOrders/TrackOrderService.cs b/src/SJZY.Track.Application/Services/TrackOrders/TrackOrderService.cs
index c846c6c3..f57dc80c 100644
--- a/src/SJZY.Track.Application/Services/TrackOrders/TrackOrderService.cs
+++ b/src/SJZY.Track.Application/Services/TrackOrders/TrackOrderService.cs
@@ -175,7 +175,7 @@ public class TrackOrderService : ApplicationService
///
///
///
- [HttpPost("GetDetailTimeline")]
+ [HttpPost("GetDetailTimeline")]
public async Task>> GetDetailTimeline(GetDetailTimelineInput input)
{
var res = new UnifyResultDto>(true);
@@ -242,15 +242,17 @@ public class TrackOrderService : ApplicationService
{
var eddUnixTimestamp = order.EstimatedDeliveryDate.HasValue ? ToUnixTimestamp(DateTime.Parse(order.EstimatedDeliveryDate.ToString()!)) : 0;
+ var isShowTime = eddUnixTimestamp > 0 && res.Data != null && res.Data.All(m => m.TrackTime < eddUnixTimestamp);
res.Data.Add(new GetDetailTimelineOutput()
{
Content = "签收",
IsHighlight = false,
- TrackTimeZone = order.EstimatedDeliveryDate.HasValue ? $"GMT{(order.DestinationTimeZone >= 0 ? "+" : "-")}{order.DestinationTimeZone}" : "",
- TrackTime = eddUnixTimestamp > 0 && res.Data != null && res.Data.All(m => m.TrackTime > eddUnixTimestamp) ? eddUnixTimestamp : 0,
- TrackTimePrefix = order.EstimatedDeliveryDate.HasValue ? "预计签收时间:" : "",
+ TrackTimeZone = isShowTime ? $"GMT{(order.DestinationTimeZone >= 0 ? "+" : "-")}{order.DestinationTimeZone}" : "",
+ TrackTime = isShowTime ? eddUnixTimestamp : 0,
+ TrackTimePrefix = isShowTime ? "预计签收时间:" : "",
});
}
+
return res;
}