ideship/track
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix:时间轴显示时间逻辑调整

Browse Source
This commit is contained in:
eli 2024-11-21 16:28:54 +08:00
parent b0e8b8ec56
commit d4c5c84779
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/SJZY.Track.Application/Services/TrackOrders/TrackOrderService.cs
View File

@ -175,7 +175,7 @@ public class TrackOrderService : ApplicationService
/// </summary> /// </summary>
/// <param name="input"></param> /// <param name="input"></param>
/// <returns></returns> /// <returns></returns>
[HttpPost("GetDetailTimeline")] [HttpPost("GetDetailTimeline")]
public async Task<UnifyResultDto<List<GetDetailTimelineOutput>>> GetDetailTimeline(GetDetailTimelineInput input) public async Task<UnifyResultDto<List<GetDetailTimelineOutput>>> GetDetailTimeline(GetDetailTimelineInput input)
{ {
var res = new UnifyResultDto<List<GetDetailTimelineOutput>>(true); 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 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() res.Data.Add(new GetDetailTimelineOutput()
{ {
Content = "签收", Content = "签收",
IsHighlight = false, IsHighlight = false,
TrackTimeZone = order.EstimatedDeliveryDate.HasValue ? $"GMT{(order.DestinationTimeZone >= 0 ? "+" : "-")}{order.DestinationTimeZone}" : "", TrackTimeZone = isShowTime ? $"GMT{(order.DestinationTimeZone >= 0 ? "+" : "-")}{order.DestinationTimeZone}" : "",
TrackTime = eddUnixTimestamp > 0 && res.Data != null && res.Data.All(m => m.TrackTime > eddUnixTimestamp) ? eddUnixTimestamp : 0, TrackTime = isShowTime ? eddUnixTimestamp : 0,
TrackTimePrefix = order.EstimatedDeliveryDate.HasValue ? "预计签收时间：" : "", TrackTimePrefix = isShowTime ? "预计签收时间：" : "",
}); });
} }
return res; return res;
} }