From 2eb7ae9047f3534d912b76a0f9bab52d790a28c5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BA=91=E9=BE=99=20=E7=8E=8B?= Date: Tue, 26 Nov 2024 11:03:04 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E8=A7=A3=E5=86=B3=E5=88=A0=E9=99=A4?= =?UTF-8?q?=E8=BD=A8=E8=BF=B9=E5=90=8E=E8=AE=A2=E5=8D=95=E4=B8=BB=E8=A1=A8?= =?UTF-8?q?=E8=BF=9B=E8=A1=8C=E5=9B=9E=E9=80=80=E6=9B=B4=E6=96=B0=EF=BC=8C?= =?UTF-8?q?=E6=9B=B4=E6=96=B0=E5=80=BC=E4=B8=BA=E8=A2=AB=E5=88=A0=E9=99=A4?= =?UTF-8?q?=E7=9A=84=E8=BD=A8=E8=BF=B9=E5=86=85=E5=AE=B9=EF=BC=8C=E6=9B=B4?= =?UTF-8?q?=E6=94=B9=E4=B8=BA=E5=BD=93=E5=89=8D=E8=AE=A2=E5=8D=95=E7=9A=84?= =?UTF-8?q?=E6=9C=80=E6=96=B0=E8=BD=A8=E8=BF=B9=E5=86=85=E5=AE=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../EventHandlers/TrackDeleteEventHandler.cs | 17 ++++++++++------- .../ITrackDetailsEsRepository.cs | 2 +- .../Repositories/TrackDetailsEsRepository.cs | 6 ++++-- 3 files changed, 15 insertions(+), 10 deletions(-) diff --git a/src/SJZY.Track.Application/CAP/EventHandlers/TrackDeleteEventHandler.cs b/src/SJZY.Track.Application/CAP/EventHandlers/TrackDeleteEventHandler.cs index dd4704ca..08e079d6 100644 --- a/src/SJZY.Track.Application/CAP/EventHandlers/TrackDeleteEventHandler.cs +++ b/src/SJZY.Track.Application/CAP/EventHandlers/TrackDeleteEventHandler.cs @@ -201,9 +201,8 @@ public class TrackDeleteEventHandler : ITransientDependency, ICapSubscribe } else //原有逻辑，根据轨迹code和订单进行删除 { - var trackCodes = @event.TrackIdentifiers.Select(x => x.TrackCode).ToList(); - // 删除轨迹（删的是同子系统下的单，所以code是统一的） - tracks = await _trackDetailsEsRepository.GetListAsync(@event.OrderIds, trackCodes,null); + //根据订单查询出所有的轨迹，查所有是因为主单上需要进行回退更新 + tracks = await _trackDetailsEsRepository.GetListAsync(@event.OrderIds); //构建标识符集合 var ids = @event.TrackIdentifiers.Select(x => $"{x.TrackCode}{x.TrackTime}").ToList(); @@ -217,8 +216,10 @@ public class TrackDeleteEventHandler : ITransientDependency, ICapSubscribe await _trackDetailsEsRepository.DeleteTrackByIdAsync(track.Id, track.IndexName); } - orderIds = tracks.Select(m => m.OrderId).Distinct().ToList(); - tracks = deleteTracks; + //从被删除轨迹寻找订单id，稍后会更新订单主表 + orderIds = deleteTracks.Select(m => m.OrderId).Distinct().ToList(); + //排除掉已经删除的轨迹 + tracks = tracks.Except(deleteTracks).ToList(); } @@ -236,7 +237,9 @@ public class TrackDeleteEventHandler : ITransientDependency, ICapSubscribe foreach (var order in orders) { - var track = tracks.FirstOrDefault(x => x.OrderId == order.Id); + //找到最新的轨迹数据 + var track = tracks?.OrderByDescending(x=>x.TrackTime) + .FirstOrDefault(x => x.OrderId == order.Id); // 删除全部轨迹导致的重置行为 if (track == default) @@ -264,7 +267,7 @@ public class TrackDeleteEventHandler : ITransientDependency, ICapSubscribe OrderId = order.Id, OrderNo = order.OrderNo, OptionType = OrderOperationType.删除轨迹.ToString(), - Content = tracks?.Where(m => m.OrderId == order.Id)?.ToList().ToJson(), + Content = tracks?.Where(m => m.OrderId == order.Id).ToList().ToJson(), CreateUserId = @event.OperationManId, CreateUserName = @event.OperationMan ?? "", CreateTime = DateTime.Now diff --git a/src/SJZY.Track.Domain/Aggregates/TrackDetailsAggregate/ITrackDetailsEsRepository.cs b/src/SJZY.Track.Domain/Aggregates/TrackDetailsAggregate/ITrackDetailsEsRepository.cs index c57b797b..bf5e3af3 100644 --- a/src/SJZY.Track.Domain/Aggregates/TrackDetailsAggregate/ITrackDetailsEsRepository.cs +++ b/src/SJZY.Track.Domain/Aggregates/TrackDetailsAggregate/ITrackDetailsEsRepository.cs @@ -24,7 +24,7 @@ public interface ITrackDetailsEsRepository : IElasticsearchClientService> GetListAsync(int orderId); - Task> GetListAsync(int[] orderIds, List trackCodes, TrackSourceEnum? source); + Task> GetListAsync(int[] orderIds, List? trackCodes = null, TrackSourceEnum? source = null); Task> DeleteTrackAsync(int[] orderIds, List trackCodes); diff --git a/src/SJZY.Track.Repository/Repositories/TrackDetailsEsRepository.cs b/src/SJZY.Track.Repository/Repositories/TrackDetailsEsRepository.cs index 346d8c57..e4dbd518 100644 --- a/src/SJZY.Track.Repository/Repositories/TrackDetailsEsRepository.cs +++ b/src/SJZY.Track.Repository/Repositories/TrackDetailsEsRepository.cs @@ -357,7 +357,7 @@ public class TrackDetailsEsRepository : ElasticSearchContextAbstract> GetListAsync(int[] orderIds, List trackCodes, TrackSourceEnum? source) + public async Task> GetListAsync(int[] orderIds, List? trackCodes = null, TrackSourceEnum? source = null) { var query = new QueryContainer(); @@ -365,10 +365,12 @@ public class TrackDetailsEsRepository : ElasticSearchContextAbstract.Terms(t => t.Field(f => f.OrderId).Terms(orderIds)); } - if (trackCodes.Count > 0) + + if (trackCodes != null && trackCodes.Count > 0) { query &= Query.Terms(t => t.Field(f => f.TrackCode.Suffix("keyword")).Terms(trackCodes)); } + if (source.HasValue) { query &= Query.Term(t => t.Field(f => f.Source).Value(source.Value));