From a254d735bf87e1ad5215eb3ebe824a078e65c932 Mon Sep 17 00:00:00 2001 From: hardstylewyl <827778732@qq.com> Date: Fri, 21 Mar 2025 16:17:28 +0800 Subject: [PATCH] =?UTF-8?q?fix:=E5=BD=93=E8=AE=A2=E5=8D=95=E5=8F=98?= =?UTF-8?q?=E6=9B=B4=E4=B8=BA=E5=B7=B2=E5=AE=8C=E7=BB=93=E6=98=AF=E5=8F=AA?= =?UTF-8?q?=E5=85=B3=E9=97=AD=E8=BF=90=E8=BE=93=E6=97=B6=E6=95=88=E9=A2=84?= =?UTF-8?q?=E8=AD=A6=E7=9B=B8=E5=85=B3=E4=BA=A7=E7=89=A9=20fix:=E5=9B=9E?= =?UTF-8?q?=E4=BC=A0=E9=A2=84=E8=AD=A6=E5=92=8C=E5=AE=8C=E6=95=B4=E9=A2=84?= =?UTF-8?q?=E8=AD=A6=E5=8F=AA=E5=BF=BD=E7=95=A5=E4=B8=8D=E5=AD=98=E5=9C=A8?= =?UTF-8?q?=E7=9A=84=E8=AE=A2=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Warning/Handlers/CompleteWarningHandler.cs | 13 ++++--------- .../Warning/Handlers/OrderWarningHandler.cs | 12 +++++++----- .../Warning/Handlers/ReturnWarningHandler.cs | 4 ++-- 3 files changed, 13 insertions(+), 16 deletions(-) diff --git a/src/SJZY.Track.Application/Services/Warning/Handlers/CompleteWarningHandler.cs b/src/SJZY.Track.Application/Services/Warning/Handlers/CompleteWarningHandler.cs index 5e5d26c0..f78c7346 100644 --- a/src/SJZY.Track.Application/Services/Warning/Handlers/CompleteWarningHandler.cs +++ b/src/SJZY.Track.Application/Services/Warning/Handlers/CompleteWarningHandler.cs @@ -32,12 +32,9 @@ public sealed class CompleteWarningHandler : ICompleteWarningHandler, ITransient public async Task TrackDeletedHandleAsync(List deletedSignals) { - // 1.验证订单可行性 + // 1.只处理未删除的订单 var orderIdSet = deletedSignals.Select(x => x.OrderId).ToHashSet(); - var orders = await _orderRepository.GetListAsync(x => - orderIdSet.Contains(x.Id) - && x.IsCompleted == false - ); + var orders = await _orderRepository.GetListAsync(x => orderIdSet.Contains(x.Id)); if (orders.Count == 0) return; //不存在符合条件的订单，直接提交信号丢弃 // 2.查出订单指定状态的轨迹（tips:为了指定状态的轨迹是真的被清空了） @@ -105,11 +102,9 @@ public sealed class CompleteWarningHandler : ICompleteWarningHandler, ITransient public async Task TrackAddedHandleAsync(List addedSignals) { - // 1.验证订单可行性 + // 1.只处理未删除的订单 var orderIdSet = addedSignals.Select(x => x.OrderId).ToHashSet(); - var orders = await _orderRepository.GetListAsync(x => - orderIdSet.Contains(x.Id) - ); + var orders = await _orderRepository.GetListAsync(x => orderIdSet.Contains(x.Id)); if (orders.Count == 0) return; //不存在符合条件的订单，直接提交信号丢弃 var orderIds = orders.Select(x => x.Id).ToHashSet(); diff --git a/src/SJZY.Track.Application/Services/Warning/Handlers/OrderWarningHandler.cs b/src/SJZY.Track.Application/Services/Warning/Handlers/OrderWarningHandler.cs index 88978567..b3f12c31 100644 --- a/src/SJZY.Track.Application/Services/Warning/Handlers/OrderWarningHandler.cs +++ b/src/SJZY.Track.Application/Services/Warning/Handlers/OrderWarningHandler.cs @@ -25,6 +25,7 @@ public class OrderWarningHandler : IOrderWarningHandler, ITransientDependency }); } + // tips:要区分完结还是删除 public async Task HandleOrderDeletedOrCompletedAsync(List orders) { // 选出符合条件的订单 @@ -36,7 +37,7 @@ public class OrderWarningHandler : IOrderWarningHandler, ITransientDependency await _warningTaskRepository.CloseWarningNotifyTaskAsync(x => !x.IsClosed && orderIds.Contains(x.OrderId) - && x.WarningType != (int) WarningRuleType.完整预警 // tips:不要移除完整预警 + && x.WarningType == (int) WarningRuleType.运输时效预警 // tips:不要移除完整预警 ); // 2.移除关闭【回传重试推送任务】，【运输预警明细生成任务】tips:无法关闭回传重试任务 @@ -54,10 +55,11 @@ public class OrderWarningHandler : IOrderWarningHandler, ITransientDependency { OrderIds = orderIds, }); - await _warningDetailsEsRepository.BulkCloseReturnWarningDetailsAsync(new BulkCloseReturnWarningDetailsVO - { - OrderIds = orderIds, - }); + // tips:不要移除回传预警 + // await _warningDetailsEsRepository.BulkCloseReturnWarningDetailsAsync(new BulkCloseReturnWarningDetailsVO + // { + // OrderIds = orderIds, + // }); // tips:不要移除完整预警 // await _warningDetailsEsRepository.BulkCloseCompleteWarningDetailsAsync(new BulkCloseCompleteWarningDetailsVO // { diff --git a/src/SJZY.Track.Application/Services/Warning/Handlers/ReturnWarningHandler.cs b/src/SJZY.Track.Application/Services/Warning/Handlers/ReturnWarningHandler.cs index 23ba25d0..26242871 100644 --- a/src/SJZY.Track.Application/Services/Warning/Handlers/ReturnWarningHandler.cs +++ b/src/SJZY.Track.Application/Services/Warning/Handlers/ReturnWarningHandler.cs @@ -406,8 +406,8 @@ public sealed class ReturnWarningHandler : IReturnWarningHandler, ITransientDepe { // 1.查询订单 var orderIdSet = updateOrDeleteSignals.Select(x => x.OrderId).ToHashSet(); - // 只处理未完结并且未删除的订单 - var orders = await _orderRepository.GetListAsync(x => orderIdSet.Contains(x.Id) && x.IsCompleted == false); + // 只处理未删除的订单 + var orders = await _orderRepository.GetListAsync(x => orderIdSet.Contains(x.Id)); if (orders.Count == 0) return; //无任何订单需要处理，直接提交信号丢弃 var orderIds = orders.Select(x => x.Id).ToHashSet();