From eef228752d0c6bdcee0f04d5a1d8644e78c1cab6 Mon Sep 17 00:00:00 2001 From: hardstylewyl <827778732@qq.com> Date: Wed, 23 Apr 2025 14:57:45 +0800 Subject: [PATCH 1/2] =?UTF-8?q?option:=E8=A1=A5=E5=85=85=E5=AF=B9FBA?= =?UTF-8?q?=E5=85=BC=E5=AE=B9=E6=80=A7=E7=9A=84=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Services/ProvideServices/TrackService.cs | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/src/SJZY.Track.Application/Services/ProvideServices/TrackService.cs b/src/SJZY.Track.Application/Services/ProvideServices/TrackService.cs index ec936e98..19955a17 100644 --- a/src/SJZY.Track.Application/Services/ProvideServices/TrackService.cs +++ b/src/SJZY.Track.Application/Services/ProvideServices/TrackService.cs @@ -570,9 +570,20 @@ public partial class TrackService : ApplicationService, ITrackService } var track = tracks.First(); - if (DateTimeHelper.ConvertUtc0Compare(track.TrackTime, track.TrackTimeZone, trackTime, trackTimezone) != 0) + // todo-remove:为了照顾FBA老逻辑,暂时特殊处理一下 + if (track.SubSystemId == 9517) { - throw new BusinessException(message: $"订单:[{orderNo}],轨迹代码:[{trackCode}]找不到要更新的记录,不允许修改,请检查轨迹TrackTime"); + if (track.TrackTime == trackTime) + { + throw new BusinessException(message: $"订单:[{orderNo}],轨迹代码:[{trackCode}]找不到要更新的记录,不允许修改,请检查轨迹TrackTime"); + } + } + else + { + if (DateTimeHelper.ConvertUtc0Compare(track.TrackTime, track.TrackTimeZone, trackTime, trackTimezone) != 0) + { + throw new BusinessException(message: $"订单:[{orderNo}],轨迹代码:[{trackCode}]找不到要更新的记录,不允许修改,请检查轨迹TrackTime"); + } } if (!string.Equals(track.Extra, extra)) From 67b7c75d4ad73e8e37bdd8130863d1a21811a5d7 Mon Sep 17 00:00:00 2001 From: hardstylewyl <827778732@qq.com> Date: Wed, 23 Apr 2025 14:59:09 +0800 Subject: [PATCH 2/2] =?UTF-8?q?option:=E8=A1=A5=E5=85=85=E5=AF=B9FBA?= =?UTF-8?q?=E5=85=BC=E5=AE=B9=E6=80=A7=E7=9A=84=E5=A4=84=E7=90=862?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Services/ProvideServices/TrackService.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/SJZY.Track.Application/Services/ProvideServices/TrackService.cs b/src/SJZY.Track.Application/Services/ProvideServices/TrackService.cs index 19955a17..8e1de010 100644 --- a/src/SJZY.Track.Application/Services/ProvideServices/TrackService.cs +++ b/src/SJZY.Track.Application/Services/ProvideServices/TrackService.cs @@ -573,7 +573,7 @@ public partial class TrackService : ApplicationService, ITrackService // todo-remove:为了照顾FBA老逻辑,暂时特殊处理一下 if (track.SubSystemId == 9517) { - if (track.TrackTime == trackTime) + if (track.TrackTime != trackTime) { throw new BusinessException(message: $"订单:[{orderNo}],轨迹代码:[{trackCode}]找不到要更新的记录,不允许修改,请检查轨迹TrackTime"); }