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) 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)