From d585f799bdcb6397a0b8e26d57243a0659f231cb Mon Sep 17 00:00:00 2001 From: hardstylewyl <827778732@qq.com> Date: Mon, 10 Feb 2025 15:36:57 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E8=BD=A8=E8=BF=B9=E5=86=85=E5=AE=B9=E6=97=B6=E7=BC=BA=E5=A4=B1?= =?UTF-8?q?=E6=98=AF=E5=90=A6=E5=AF=B9=E5=A4=96=E5=AD=97=E6=AE=B5=EF=BC=8C?= =?UTF-8?q?=E5=AF=BC=E8=87=B4=E7=9A=84=E6=96=B0=E5=A2=9E/=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E8=BD=A8=E8=BF=B9=EF=BC=8C=E4=B8=AD=E7=9A=84=E8=BD=A8?= =?UTF-8?q?=E8=BF=B9=E6=98=8E=E7=BB=86=E7=BC=BA=E7=9C=81=E5=80=BC=E9=94=99?= =?UTF-8?q?=E8=AF=AF=20fix:=20=E4=BF=AE=E5=A4=8D=E4=B8=AD=E5=8F=B0?= =?UTF-8?q?=E5=86=85=E9=83=A8=E6=9F=A5=E8=AF=A2=E8=BD=A8=E8=BF=B9=E6=98=8E?= =?UTF-8?q?=E7=BB=86=E6=8E=A5=E5=8F=A3=EF=BC=8C=E4=B8=AD=E7=9A=84=E6=98=AF?= =?UTF-8?q?=E5=90=A6=E5=AF=B9=E5=A4=96=E6=A0=87=E8=AF=86=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Services/TrackOrders/TrackOrderService.cs | 18 ------------------ .../Aggregates/OrderAggregate/OrderEntity.cs | 9 ++++++--- .../Queries/ProvideQueries.cs | 2 ++ 3 files changed, 8 insertions(+), 21 deletions(-) diff --git a/src/SJZY.Track.Application/Services/TrackOrders/TrackOrderService.cs b/src/SJZY.Track.Application/Services/TrackOrders/TrackOrderService.cs index 6e709973..71487d75 100644 --- a/src/SJZY.Track.Application/Services/TrackOrders/TrackOrderService.cs +++ b/src/SJZY.Track.Application/Services/TrackOrders/TrackOrderService.cs @@ -141,24 +141,6 @@ public class TrackOrderService : ApplicationService var list = ObjectMapper.Map, List>(trackDetails); - var trackCodes = list.Select(x => x.Code) - .Where(x => x != GlobalConst.EmptyString) - .Distinct() - .ToList(); - - // 是否对外 - if (!trackCodes.IsNullOrEmpty()) - { - var trackContents = await _trackContentRepository.GetListAsync(x => - x.SubSystemId == order.SubSystemId && trackCodes.Contains(x.Code), x => new - { - x.Code, - x.IsExternal - }); - - list.ForEach(x => x.IsExternal = trackContents.FirstOrDefault(y => y.Code == x.Code)?.IsExternal ?? false); - } - // 计算时区 list.ForEach(a => { diff --git a/src/SJZY.Track.Domain/Aggregates/OrderAggregate/OrderEntity.cs b/src/SJZY.Track.Domain/Aggregates/OrderAggregate/OrderEntity.cs index eaf3ca71..d6248fbe 100644 --- a/src/SJZY.Track.Domain/Aggregates/OrderAggregate/OrderEntity.cs +++ b/src/SJZY.Track.Domain/Aggregates/OrderAggregate/OrderEntity.cs @@ -186,12 +186,15 @@ public class OrderEntity : IFullAuditedBasicEntitys, IAggregateRoot [SugarColumn(ColumnName = "TemplateCodes")] public string? TemplateCodes { get; set; } - [SugarColumn(IsIgnore = true)] public List OrderFlights { get; set; } + [SugarColumn(IsIgnore = true)] + public List OrderFlights { get; set; } - [SugarColumn(IsIgnore = true)] public List OrderPullStatus { get; set; } + [SugarColumn(IsIgnore = true)] + public List OrderPullStatus { get; set; } [Navigate(NavigateType.OneToMany, nameof(OrderPlatformNumberEntity.OrderId))] - [SugarColumn(IsIgnore = true)] public List OrderPlatformNumbers { get; set; } + [SugarColumn(IsIgnore = true)] + public List OrderPlatformNumbers { get; set; } public void ResetTrackInfo() { diff --git a/src/SJZY.Track.Repository/Queries/ProvideQueries.cs b/src/SJZY.Track.Repository/Queries/ProvideQueries.cs index a2090ff1..81d6703e 100644 --- a/src/SJZY.Track.Repository/Queries/ProvideQueries.cs +++ b/src/SJZY.Track.Repository/Queries/ProvideQueries.cs @@ -115,6 +115,7 @@ public class ProvideQueries : ISugarRepository, IProvideQueries, ITransientDepen TrackEnContent = x.EnContent, IsCompleted = y.IsCompleted, IsRepeatable = x.IsRepeatable, + IsExternal = x.IsExternal, IsAllowManuallyUpdate = x.IsAllowManuallyUpdate, IsAllowManuallyCreate = x.IsAllowManuallyCreate, IsToMq = y.IsToMq || k.IsToMq, @@ -142,6 +143,7 @@ public class ProvideQueries : ISugarRepository, IProvideQueries, ITransientDepen TrackEnContent = x.EnContent, IsCompleted = y.IsCompleted, IsRepeatable = x.IsRepeatable, + IsExternal = x.IsExternal, IsAllowManuallyUpdate = x.IsAllowManuallyUpdate, IsAllowManuallyCreate = x.IsAllowManuallyCreate, IsToMq = y.IsToMq || k.IsToMq,