From 554236af3017c66a65db437e3f589b8d89347643 Mon Sep 17 00:00:00 2001 From: hardstylewyl <827778732@qq.com> Date: Thu, 20 Mar 2025 09:07:16 +0800 Subject: [PATCH] =?UTF-8?q?fix:=E8=BD=A8=E8=BF=B9=E8=AE=A2=E5=8D=95?= =?UTF-8?q?=E5=88=A0=E9=99=A4=E6=88=96=E5=AE=8C=E7=BB=93=E4=B8=8D=E8=A6=81?= =?UTF-8?q?=E7=A7=BB=E9=99=A4=E4=BB=A5=E4=B8=8B=E5=86=85=E5=AE=B9=20=20-?= =?UTF-8?q?=20=E9=A2=84=E8=AD=A6=E9=80=9A=E7=9F=A5=E4=BB=BB=E5=8A=A1=20=20?= =?UTF-8?q?-=20=E5=AE=8C=E6=95=B4=E9=A2=84=E8=AD=A6=E6=98=8E=E7=BB=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Warning/Handlers/OrderWarningHandler.cs | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/src/SJZY.Track.Application/Services/Warning/Handlers/OrderWarningHandler.cs b/src/SJZY.Track.Application/Services/Warning/Handlers/OrderWarningHandler.cs index 535fb27b..88978567 100644 --- a/src/SJZY.Track.Application/Services/Warning/Handlers/OrderWarningHandler.cs +++ b/src/SJZY.Track.Application/Services/Warning/Handlers/OrderWarningHandler.cs @@ -1,6 +1,7 @@ using SJZY.Track.Domain.Aggregates.OrderAggregate; using SJZY.Track.Domain.Aggregates.WarningAggregate; using SJZY.Track.Domain.Dtos.Warning; +using SJZY.Track.Domain.Enums; using Volo.Abp.DependencyInjection; namespace SJZY.Track.Application.Services.Warning.Handlers; @@ -33,8 +34,9 @@ public class OrderWarningHandler : IOrderWarningHandler, ITransientDependency var orderIds = filteredOrders.Select(x => x.Id).ToHashSet(); // 1.移除关闭预警通知任务 await _warningTaskRepository.CloseWarningNotifyTaskAsync(x => - !x.IsClosed - && orderIds.Contains(x.OrderId) + !x.IsClosed + && orderIds.Contains(x.OrderId) + && x.WarningType != (int) WarningRuleType.完整预警 // tips:不要移除完整预警 ); // 2.移除关闭【回传重试推送任务】，【运输预警明细生成任务】tips:无法关闭回传重试任务 @@ -56,9 +58,10 @@ public class OrderWarningHandler : IOrderWarningHandler, ITransientDependency { OrderIds = orderIds, }); - await _warningDetailsEsRepository.BulkCloseCompleteWarningDetailsAsync(new BulkCloseCompleteWarningDetailsVO - { - OrderIds = orderIds, - }); + // tips:不要移除完整预警 + // await _warningDetailsEsRepository.BulkCloseCompleteWarningDetailsAsync(new BulkCloseCompleteWarningDetailsVO + // { + // OrderIds = orderIds, + // }); } }