ideship/track
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'S07' into test

Browse Source
This commit is contained in:
hardstylewyl 2025-03-21 16:17:58 +08:00
commit b75f21bc9d
3 changed files with 13 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/SJZY.Track.Application/Services/Warning/Handlers/CompleteWarningHandler.cs
View File

@ -32,12 +32,9 @@ public sealed class CompleteWarningHandler : ICompleteWarningHandler, ITransient
public async Task TrackDeletedHandleAsync(List<TrackDeletedSignal> deletedSignals) public async Task TrackDeletedHandleAsync(List<TrackDeletedSignal> deletedSignals)
{ {
// 1.验证订单可行性 // 1.只处理未删除的订单
var orderIdSet = deletedSignals.Select(x => x.OrderId).ToHashSet(); var orderIdSet = deletedSignals.Select(x => x.OrderId).ToHashSet();
var orders = await _orderRepository.GetListAsync(x => var orders = await _orderRepository.GetListAsync(x => orderIdSet.Contains(x.Id));
orderIdSet.Contains(x.Id)
&& x.IsCompleted == false
);
if (orders.Count == 0) return; //不存在符合条件的订单，直接提交信号丢弃 if (orders.Count == 0) return; //不存在符合条件的订单，直接提交信号丢弃
// 2.查出订单指定状态的轨迹（tips:为了指定状态的轨迹是真的被清空了） // 2.查出订单指定状态的轨迹（tips:为了指定状态的轨迹是真的被清空了）
@ -105,11 +102,9 @@ public sealed class CompleteWarningHandler : ICompleteWarningHandler, ITransient
public async Task TrackAddedHandleAsync(List<TrackAddedSignal> addedSignals) public async Task TrackAddedHandleAsync(List<TrackAddedSignal> addedSignals)
{ {
// 1.验证订单可行性 // 1.只处理未删除的订单
var orderIdSet = addedSignals.Select(x => x.OrderId).ToHashSet(); var orderIdSet = addedSignals.Select(x => x.OrderId).ToHashSet();
var orders = await _orderRepository.GetListAsync(x => var orders = await _orderRepository.GetListAsync(x => orderIdSet.Contains(x.Id));
orderIdSet.Contains(x.Id)
);
if (orders.Count == 0) return; //不存在符合条件的订单，直接提交信号丢弃 if (orders.Count == 0) return; //不存在符合条件的订单，直接提交信号丢弃
var orderIds = orders.Select(x => x.Id).ToHashSet(); var orderIds = orders.Select(x => x.Id).ToHashSet();

12
src/SJZY.Track.Application/Services/Warning/Handlers/OrderWarningHandler.cs
View File

@ -25,6 +25,7 @@ public class OrderWarningHandler : IOrderWarningHandler, ITransientDependency
}); });
} }
// tips:要区分完结还是删除
public async Task HandleOrderDeletedOrCompletedAsync(List<OrderEntity> orders) public async Task HandleOrderDeletedOrCompletedAsync(List<OrderEntity> orders)
{ {
// 选出符合条件的订单 // 选出符合条件的订单
@ -36,7 +37,7 @@ public class OrderWarningHandler : IOrderWarningHandler, ITransientDependency
await _warningTaskRepository.CloseWarningNotifyTaskAsync(x => await _warningTaskRepository.CloseWarningNotifyTaskAsync(x =>
!x.IsClosed !x.IsClosed
&& orderIds.Contains(x.OrderId) && orderIds.Contains(x.OrderId)
&& x.WarningType != (int) WarningRuleType.完整预警 // tips:不要移除完整预警 && x.WarningType == (int) WarningRuleType.运输时效预警 // tips:不要移除完整预警
); );
// 2.移除关闭【回传重试推送任务】，【运输预警明细生成任务】tips:无法关闭回传重试任务 // 2.移除关闭【回传重试推送任务】，【运输预警明细生成任务】tips:无法关闭回传重试任务
@ -54,10 +55,11 @@ public class OrderWarningHandler : IOrderWarningHandler, ITransientDependency
{ {
OrderIds = orderIds, OrderIds = orderIds,
}); });
await _warningDetailsEsRepository.BulkCloseReturnWarningDetailsAsync(new BulkCloseReturnWarningDetailsVO // tips:不要移除回传预警
{ // await _warningDetailsEsRepository.BulkCloseReturnWarningDetailsAsync(new BulkCloseReturnWarningDetailsVO
OrderIds = orderIds, // {
}); // OrderIds = orderIds,
// });
// tips:不要移除完整预警 // tips:不要移除完整预警
// await _warningDetailsEsRepository.BulkCloseCompleteWarningDetailsAsync(new BulkCloseCompleteWarningDetailsVO // await _warningDetailsEsRepository.BulkCloseCompleteWarningDetailsAsync(new BulkCloseCompleteWarningDetailsVO
// { // {

4
src/SJZY.Track.Application/Services/Warning/Handlers/ReturnWarningHandler.cs
View File

@ -406,8 +406,8 @@ public sealed class ReturnWarningHandler : IReturnWarningHandler, ITransientDepe
{ {
// 1.查询订单 // 1.查询订单
var orderIdSet = updateOrDeleteSignals.Select(x => x.OrderId).ToHashSet(); 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; //无任何订单需要处理，直接提交信号丢弃 if (orders.Count == 0) return; //无任何订单需要处理，直接提交信号丢弃
var orderIds = orders.Select(x => x.Id).ToHashSet(); var orderIds = orders.Select(x => x.Id).ToHashSet();