Merge branch 'S07' into test

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<int> trackStatusIds)
     {
         var orderTypes = GetRuleOrderTypes();
-        //没有命中订单类型
+        // 没有命中订单类型
         if (!orderTypes.Contains(orderType))
             return false;
 
+        // 没有命中检查点
+        if (!trackStatusIds.Contains(CheckPointTrackStatusId))
+            return false;
+
         //缺失轨迹状态?
         return ExistsMissingTrackStatus(trackStatusIds);
     }