From 6ea5a977df2b224a105e8b7fb083e1ed089ef772 Mon Sep 17 00:00:00 2001 From: hardstylewyl <827778732@qq.com> Date: Wed, 22 Jan 2025 16:11:12 +0800 Subject: [PATCH] =?UTF-8?q?fix:=E8=A1=A5=E5=85=85=E8=A2=AB=E8=BD=A8?= =?UTF-8?q?=E8=BF=B9=E5=86=85=E5=AE=B9=E6=A0=87=E8=AF=86=E4=B8=BA=E5=A4=96?= =?UTF-8?q?=E9=83=A8=E7=9A=84=E8=BD=A8=E8=BF=B9=E5=9C=A8=E5=A4=96=E9=83=A8?= =?UTF-8?q?=E7=B3=BB=E7=BB=9F=E8=A2=AB=E8=AE=BF=E9=97=AE=E6=97=B6=E5=BA=94?= =?UTF-8?q?=E8=A2=AB=E8=BF=87=E6=BB=A4,byP02?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Dtos/ProvideServices/GetTrackOutput.cs | 1 + .../Services/ProvideServices/TrackService.Query.cs | 10 ++++++++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/src/SJZY.Track.Application.Contract/Dtos/ProvideServices/GetTrackOutput.cs b/src/SJZY.Track.Application.Contract/Dtos/ProvideServices/GetTrackOutput.cs index f5313b3b..edf15090 100644 --- a/src/SJZY.Track.Application.Contract/Dtos/ProvideServices/GetTrackOutput.cs +++ b/src/SJZY.Track.Application.Contract/Dtos/ProvideServices/GetTrackOutput.cs @@ -19,6 +19,7 @@ public class TrackDetail public string Code { get; set; } = null!; public string Status { get; set; } = null!; public string? Content { get; set; } + public string? EnContent { get; set; } public string? OriginContent { get; set; } public string Location { get; set; } = null!; diff --git a/src/SJZY.Track.Application/Services/ProvideServices/TrackService.Query.cs b/src/SJZY.Track.Application/Services/ProvideServices/TrackService.Query.cs index f6768eee..bc140364 100644 --- a/src/SJZY.Track.Application/Services/ProvideServices/TrackService.Query.cs +++ b/src/SJZY.Track.Application/Services/ProvideServices/TrackService.Query.cs @@ -56,7 +56,9 @@ public partial class TrackService foreach (var group in details.GroupBy(x => x.OrderId)) { var item = new GetTrackOutput(); - var trackDetails = group.ToList(); + var trackDetails = group + .WhereIf(isFilterExternal, x => trackContentDic.TryGetValue(x.TrackCode, out var isExternal) && isExternal) + .ToList(); item.OrderNo = trackDetails.First().OrderNo; item.TrackDetails = trackDetails.Select(x => new TrackDetail @@ -65,6 +67,7 @@ public partial class TrackService Code = x.TrackCode, Status = x.TrackStatus, Content = x.TrackContent, + EnContent = x.TrackEnContent, OriginContent = x.OriginTrackContent, Location = x.TrackPlace, Time = Math.Abs(x.TrackTimeZone - GlobalConst.NoneTrackTimeZone) < 1 @@ -142,7 +145,9 @@ public partial class TrackService foreach (var group in details.GroupBy(x => x.OrderId)) { var item = new GetTrackOutput(); - var trackDetails = group.ToList(); + var trackDetails = group + .WhereIf(isFilterExternal, x => trackContentDic.TryGetValue(x.TrackCode, out var isExternal) && isExternal) + .ToList(); item.OrderNo = trackDetails.First().OrderNo; item.TrackDetails = trackDetails.Select(x => new TrackDetail @@ -151,6 +156,7 @@ public partial class TrackService Code = x.TrackCode, Status = x.TrackStatus, Content = x.TrackContent, + EnContent = x.TrackEnContent, OriginContent = x.OriginTrackContent, Location = x.TrackPlace, Time = x.TrackTime,