Merge branch 'S07' into test
This commit is contained in:
commit
f29471e2b7
@ -51,20 +51,6 @@ public sealed class CompleteWarningRuleItemEntity : IFullAuditedBasicEntitys, IE
|
|||||||
.ToList();
|
.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)
|
public bool CanHitRule(int orderType, HashSet<int> trackStatusIds)
|
||||||
{
|
{
|
||||||
@ -73,6 +59,10 @@ public sealed class CompleteWarningRuleItemEntity : IFullAuditedBasicEntitys, IE
|
|||||||
if (!orderTypes.Contains(orderType))
|
if (!orderTypes.Contains(orderType))
|
||||||
return false;
|
return false;
|
||||||
|
|
||||||
|
// 没有命中检查点
|
||||||
|
if (!trackStatusIds.Contains(CheckPointTrackStatusId))
|
||||||
|
return false;
|
||||||
|
|
||||||
//缺失轨迹状态?
|
//缺失轨迹状态?
|
||||||
return ExistsMissingTrackStatus(trackStatusIds);
|
return ExistsMissingTrackStatus(trackStatusIds);
|
||||||
}
|
}
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user