From 693741e46d920ca4c0b3be3b3e4d78a6cca7adc0 Mon Sep 17 00:00:00 2001 From: hardstylewyl <827778732@qq.com> Date: Mon, 24 Mar 2025 15:32:25 +0800 Subject: [PATCH 1/2] =?UTF-8?q?fix:=E4=BF=AE=E5=A4=8D=E8=BF=90=E8=BE=93?= =?UTF-8?q?=E6=97=B6=E6=95=88=E9=A2=84=E8=AD=A6=E6=94=B6=E5=88=B0=E6=88=AA?= =?UTF-8?q?=E6=AD=A2=E8=BD=A8=E8=BF=B9=E6=97=B6=E5=88=A4=E6=96=AD=E7=8A=B6?= =?UTF-8?q?=E6=80=81=E9=A1=BA=E5=BA=8F=E6=9C=89=E8=AF=AF=EF=BC=8C=E5=AF=BC?= =?UTF-8?q?=E8=87=B4=E6=9C=80=E7=BB=88=E7=8A=B6=E6=80=81=E5=BC=82=E5=B8=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Services/Warning/Handlers/TransportWarningHandler.cs | 4 ++-- .../Transport/TransportWarningDetailsIndex.cs | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/SJZY.Track.Application/Services/Warning/Handlers/TransportWarningHandler.cs b/src/SJZY.Track.Application/Services/Warning/Handlers/TransportWarningHandler.cs index e89dad64..06b046f2 100644 --- a/src/SJZY.Track.Application/Services/Warning/Handlers/TransportWarningHandler.cs +++ b/src/SJZY.Track.Application/Services/Warning/Handlers/TransportWarningHandler.cs @@ -376,10 +376,10 @@ public class TransportWarningHandler : ITransportWarningHandler, ITransientDepen var earliestTrack = trackStatusIdEarliestTrackDict[detail.EndTrackStatusId]; // 修改为完成态 - if (detail.Status == TransportWarningStatus.即将超时.GetHashCode()) - detail.Status = TransportWarningStatus.已完成.GetHashCode(); if (detail.CalcStatus() == TransportWarningStatus.已超时.GetHashCode()) detail.Status = TransportWarningStatus.超时完成.GetHashCode(); + if (detail.Status == TransportWarningStatus.即将超时.GetHashCode()) + detail.Status = TransportWarningStatus.已完成.GetHashCode(); // 填充终止状态轨迹信息 detail.EndTrackContentId = earliestTrack.TrackContentId; diff --git a/src/SJZY.Track.Domain/Aggregates/WarningAggregate/Transport/TransportWarningDetailsIndex.cs b/src/SJZY.Track.Domain/Aggregates/WarningAggregate/Transport/TransportWarningDetailsIndex.cs index 38d221c6..adb66af4 100644 --- a/src/SJZY.Track.Domain/Aggregates/WarningAggregate/Transport/TransportWarningDetailsIndex.cs +++ b/src/SJZY.Track.Domain/Aggregates/WarningAggregate/Transport/TransportWarningDetailsIndex.cs @@ -100,11 +100,11 @@ public sealed class TransportWarningDetailsIndex : IdBaseIndex //时效>累计运输时间>=预警时效 状态调整为【即将超时】 if (transportTimeSpan > cumulativeTimeSpan && cumulativeTimeSpan >= startTrackWarningTimeSpan) - return Status = 1; + return Status = (int) TransportWarningStatus.即将超时; //时效<累计运输时间 状态调整为【已超时】 if (transportTimeSpan < cumulativeTimeSpan) - return Status = 2; + return Status = (int) TransportWarningStatus.已超时; return Status; } From d9751ecb34d7dce6709260bc7101dbc3285390b8 Mon Sep 17 00:00:00 2001 From: hardstylewyl <827778732@qq.com> Date: Mon, 24 Mar 2025 15:51:45 +0800 Subject: [PATCH 2/2] =?UTF-8?q?fix:=E4=BF=AE=E5=A4=8D=E7=BC=96=E8=BE=91?= =?UTF-8?q?=E8=BF=90=E8=BE=93=E9=A2=84=E8=AD=A6=E9=85=8D=E7=BD=AE=E9=A1=B9?= =?UTF-8?q?=E7=9B=AE=E6=97=B6=E5=87=BA=E9=94=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Services/Warning/Handlers/TransportWarningHandler.cs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/SJZY.Track.Application/Services/Warning/Handlers/TransportWarningHandler.cs b/src/SJZY.Track.Application/Services/Warning/Handlers/TransportWarningHandler.cs index 06b046f2..58a73efa 100644 --- a/src/SJZY.Track.Application/Services/Warning/Handlers/TransportWarningHandler.cs +++ b/src/SJZY.Track.Application/Services/Warning/Handlers/TransportWarningHandler.cs @@ -834,7 +834,8 @@ public class TransportWarningHandler : ITransportWarningHandler, ITransientDepen { var key = group.Key; var ruleItem = updateRuleItemIdDict[key.RuleItemId]; - var orderTracks = orderTrackStatusIdsDict[key.OrderId]; + var orderTracks = orderTrackStatusIdsDict.GetValueOrDefault(key.OrderId); + if (orderTracks == null) continue; // tips:该订单不存在任何轨迹 var orderStatusIds = orderTracks .Select(x => x.TrackStatusId) .ToHashSet();