From 0e88bd23fb5e44e038dd068921b56b6e48afad37 Mon Sep 17 00:00:00 2001 From: hardstylewyl <827778732@qq.com> Date: Wed, 26 Mar 2025 10:58:08 +0800 Subject: [PATCH] =?UTF-8?q?fix:=E4=BF=AE=E5=A4=8D=E5=AE=8C=E6=95=B4?= =?UTF-8?q?=E9=A2=84=E8=AD=A6=E5=91=BD=E4=B8=AD=E8=A7=84=E5=88=99=E9=80=BB?= =?UTF-8?q?=E8=BE=91=E7=BC=BA=E5=A4=B1=E9=AA=8C=E8=AF=81=E6=A3=80=E6=9F=A5?= =?UTF-8?q?=E7=82=B9=E7=8A=B6=E6=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Complete/CompleteWarningRuleItemEntity.cs | 20 +++++-------------- 1 file changed, 5 insertions(+), 15 deletions(-) diff --git a/src/SJZY.Track.Domain/Aggregates/WarningAggregate/Complete/CompleteWarningRuleItemEntity.cs b/src/SJZY.Track.Domain/Aggregates/WarningAggregate/Complete/CompleteWarningRuleItemEntity.cs index 2c09e7fe..d42877c3 100644 --- a/src/SJZY.Track.Domain/Aggregates/WarningAggregate/Complete/CompleteWarningRuleItemEntity.cs +++ b/src/SJZY.Track.Domain/Aggregates/WarningAggregate/Complete/CompleteWarningRuleItemEntity.cs @@ -51,28 +51,18 @@ public sealed class CompleteWarningRuleItemEntity : IFullAuditedBasicEntitys, IE .ToList(); } - // 查看是否能命中这个规则 - public bool CanHitRule(int orderType, int trackStatusId) - { - var orderTypes = GetRuleOrderTypes(); - //没有命中订单类型 - if (!orderTypes.Contains(orderType)) - return false; - //没有命中状态检查点 - if (trackStatusId != CheckPointTrackStatusId) - return false; - - return true; - } - // 查看是否能命中这个规则 public bool CanHitRule(int orderType, HashSet trackStatusIds) { var orderTypes = GetRuleOrderTypes(); - //没有命中订单类型 + // 没有命中订单类型 if (!orderTypes.Contains(orderType)) return false; + // 没有命中检查点 + if (!trackStatusIds.Contains(CheckPointTrackStatusId)) + return false; + //缺失轨迹状态? return ExistsMissingTrackStatus(trackStatusIds); }