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,