From a1986273c6706df764998b382cacaafe9f54ce02 Mon Sep 17 00:00:00 2001 From: eli Date: Wed, 20 Nov 2024 17:56:32 +0800 Subject: [PATCH] =?UTF-8?q?fix:=E6=97=B6=E9=97=B4=E8=BD=B4=E6=98=AF?= =?UTF-8?q?=E5=90=A6=E5=AE=8C=E7=BB=93=E4=BB=8E=E8=AE=A2=E5=8D=95=E4=B8=8A?= =?UTF-8?q?=E8=8E=B7=E5=8F=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Services/TrackOrders/TrackOrderService.cs | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/src/SJZY.Track.Application/Services/TrackOrders/TrackOrderService.cs b/src/SJZY.Track.Application/Services/TrackOrders/TrackOrderService.cs index c57d1abd..adaf0a18 100644 --- a/src/SJZY.Track.Application/Services/TrackOrders/TrackOrderService.cs +++ b/src/SJZY.Track.Application/Services/TrackOrders/TrackOrderService.cs @@ -194,25 +194,17 @@ public class TrackOrderService : ApplicationService if (system == null) return new UnifyResultDto>(false, "未找到指定id的子系统"); - var trackStatus = await _trackStatusRepository.GetListAsync(m => m.SubSystemId == input.SystemId); - if (trackStatus == null) - return new UnifyResultDto>(false, "未找到子系统下的任何轨迹状态"); - var trackContent = await _trackContentRepository.GetListAsync(m => m.SubSystemId == input.SystemId); if (trackContent == null) return new UnifyResultDto>(false, "未找到子系统下的任何轨迹内容"); var trackDetails = await _trackDetailsEsRepository.GetListAsync(order.Id); res.Data = new List(); - var isCompleted = false; + foreach (var item in trackDetails) { - var currentTrackStatus = trackStatus.FirstOrDefault(m => m.Code == item.TrackStatusCode); var currentTrackContet = trackContent.FirstOrDefault(m => m.Code == item.TrackCode); - //是否完结 - if (!isCompleted) - isCompleted = currentTrackStatus is { IsCompleted: true }; //如果是外部系统，且轨迹内容不对外则跳过这条轨迹内容 if (system.SystemProperty == 2 && currentTrackContet != null && !currentTrackContet.IsExternal) @@ -244,7 +236,7 @@ public class TrackOrderService : ApplicationService } //如果轨迹状态没完结则追加最后一个默认节点 - if (!isCompleted) + if (!order.IsCompleted) { res.Data.Add(new GetDetailTimelineOutput() {