From d4c5c84779d0f5cfd7e9ac742689807781c6a4de Mon Sep 17 00:00:00 2001
From: eli <xumengen_eli@online.com>
Date: Thu, 21 Nov 2024 16:28:54 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E6=97=B6=E9=97=B4=E8=BD=B4=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA=E6=97=B6=E9=97=B4=E9=80=BB=E8=BE=91=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Services/TrackOrders/TrackOrderService.cs          | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

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
     /// </summary>
     /// <param name="input"></param>
     /// <returns></returns>
-   [HttpPost("GetDetailTimeline")]
+    [HttpPost("GetDetailTimeline")]
     public async Task<UnifyResultDto<List<GetDetailTimelineOutput>>> GetDetailTimeline(GetDetailTimelineInput input)
     {
         var res = new UnifyResultDto<List<GetDetailTimelineOutput>>(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;
     }