From f046f251821bc5f09e4670e075152d2a6bee30a6 Mon Sep 17 00:00:00 2001 From: eli Date: Thu, 21 Nov 2024 11:41:09 +0800 Subject: [PATCH] =?UTF-8?q?fix:=E8=A1=A5=E5=85=85=E9=80=BB=E8=BE=91?= =?UTF-8?q?=EF=BC=8C=E8=8B=A5=E9=A2=84=E8=AE=A1=E5=88=B0=E8=BE=BE=E6=97=B6?= =?UTF-8?q?=E9=97=B4=E4=B8=BA=E7=A9=BA=E6=97=B6=E4=B9=9F=E6=98=BE=E7=A4=BA?= =?UTF-8?q?=E7=AD=BE=E6=94=B6=E8=8A=82=E7=82=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Services/TrackOrders/TrackOrderService.cs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/SJZY.Track.Application/Services/TrackOrders/TrackOrderService.cs b/src/SJZY.Track.Application/Services/TrackOrders/TrackOrderService.cs index 1a6e1f0f..42e67fe3 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,8 +242,8 @@ public class TrackOrderService : ApplicationService { var eddUnixTimestamp = order.EstimatedDeliveryDate.HasValue ? ToUnixTimestamp(DateTime.Parse(order.EstimatedDeliveryDate.ToString()!)) : 0; - //订单上有预计签收时间，需要对比预计到达时间是否大于时间轴上所有轨迹内容的发生时间，如果有任意一条时间大于预计签收时间,则隐藏签收节点 - if (eddUnixTimestamp > 0 && res.Data != null && res.Data.All(m => m.TrackTime < eddUnixTimestamp)) + //订单没有预计签收时间，或者订单上有预计签收事件，且预计到达时间大于时间轴上所有轨迹内容的发生时间,则显示签收节点 + if (eddUnixTimestamp == 0 || (eddUnixTimestamp > 0 && res.Data != null && res.Data.All(m => m.TrackTime < eddUnixTimestamp))) { res.Data.Add(new GetDetailTimelineOutput() {