From 1457172a931c2b7e6b45724f82121d450fb2188e Mon Sep 17 00:00:00 2001 From: hardstylewyl <827778732@qq.com> Date: Fri, 18 Apr 2025 15:36:32 +0800 Subject: [PATCH 1/2] =?UTF-8?q?fix:=E4=BF=AE=E5=A4=8D=E5=BC=BA=E5=88=B6?= =?UTF-8?q?=E6=8E=A8=E9=80=81=E5=8F=82=E6=95=B0=E5=A4=B1=E6=95=88=E7=9A=84?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../CAP/EventHandlers/TrackPushEventHandler.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/SJZY.Track.Application/CAP/EventHandlers/TrackPushEventHandler.cs b/src/SJZY.Track.Application/CAP/EventHandlers/TrackPushEventHandler.cs index f96dd8dc..619add38 100644 --- a/src/SJZY.Track.Application/CAP/EventHandlers/TrackPushEventHandler.cs +++ b/src/SJZY.Track.Application/CAP/EventHandlers/TrackPushEventHandler.cs @@ -243,7 +243,7 @@ public class TrackPushEventHandler : ITransientDependency, ICapSubscribe // 推送新增，需要根据上一次的推送 推断 本次推送 是否可行，为了约束顺序 // 如果当前推送code与订单上的最后的code不一致，则考虑推送映射顺序 - if (!string.Equals(order.LatestPushTrackCode, @event.TrackCode)) + if (!@event.ForcedPush && !string.Equals(order.LatestPushTrackCode, @event.TrackCode)) { config = GetValidPushConfigAsync(sortedConfigs, order.LatestPushTrackCode, @event); if (config == null) From 1d854ba16dc89f75d61e9a990159cb549a506c51 Mon Sep 17 00:00:00 2001 From: hardstylewyl <827778732@qq.com> Date: Mon, 21 Apr 2025 13:05:53 +0800 Subject: [PATCH 2/2] =?UTF-8?q?fix:=E8=A1=A5=E5=85=85=E8=BD=A8=E8=BF=B9?= =?UTF-8?q?=E5=B9=BF=E6=92=ADNewExtra=E5=8F=82=E6=95=B0=E7=BC=BA=E5=A4=B1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../CAP/EventHandlers/TrackUpsertEventHandler.cs | 2 +- .../Services/Broadcasting/BroadcastingService.cs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/SJZY.Track.Application/CAP/EventHandlers/TrackUpsertEventHandler.cs b/src/SJZY.Track.Application/CAP/EventHandlers/TrackUpsertEventHandler.cs index 17702a1a..65a7fc31 100644 --- a/src/SJZY.Track.Application/CAP/EventHandlers/TrackUpsertEventHandler.cs +++ b/src/SJZY.Track.Application/CAP/EventHandlers/TrackUpsertEventHandler.cs @@ -247,7 +247,7 @@ public class TrackUpsertEventHandler : ITransientDependency, ICapSubscribe TrackTime = @event.NewTrackTime ?? @event.TrackTime, TrackTimeZone = @event.TrackTimeZone, CompareFields = @event.CompareFields, - Extra = @event.Extra + Extra = @event.NewExtra ?? @event.Extra }, ForcedPush = @event.ForcedPush, IsToMq = (trackContent.IsToMq || @event.IsToMq) diff --git a/src/SJZY.Track.Application/Services/Broadcasting/BroadcastingService.cs b/src/SJZY.Track.Application/Services/Broadcasting/BroadcastingService.cs index 9b790e89..0b772567 100644 --- a/src/SJZY.Track.Application/Services/Broadcasting/BroadcastingService.cs +++ b/src/SJZY.Track.Application/Services/Broadcasting/BroadcastingService.cs @@ -56,7 +56,7 @@ public class BroadcastingService : IBroadcastingService OrderIdentifiers = eto.OrderIdentifiers, CustomId = eto.CustomId, SubSystemId = eto.SubSystemId, - Extra = eto.Extra + Extra = eto.NewExtra ?? eto.Extra }; if (eto.IsAdd)