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-04-21 14:05:59 +08:00
commit 8e85392721
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/SJZY.Track.Application/CAP/EventHandlers/TrackPushEventHandler.cs
View File

@ -243,7 +243,7 @@ public class TrackPushEventHandler : ITransientDependency, ICapSubscribe
// 推送新增，需要根据上一次的推送 推断 本次推送 是否可行，为了约束顺序 // 推送新增，需要根据上一次的推送 推断 本次推送 是否可行，为了约束顺序
// 如果当前推送code与订单上的最后的code不一致，则考虑推送映射顺序 // 如果当前推送code与订单上的最后的code不一致，则考虑推送映射顺序
if (!string.Equals(order.LatestPushTrackCode, @event.TrackCode)) if (!@event.ForcedPush && !string.Equals(order.LatestPushTrackCode, @event.TrackCode))
{ {
config = GetValidPushConfigAsync(sortedConfigs, order.LatestPushTrackCode, @event); config = GetValidPushConfigAsync(sortedConfigs, order.LatestPushTrackCode, @event);
if (config == null) if (config == null)

2
src/SJZY.Track.Application/CAP/EventHandlers/TrackUpsertEventHandler.cs
View File

@ -247,7 +247,7 @@ public class TrackUpsertEventHandler : ITransientDependency, ICapSubscribe
TrackTime = @event.NewTrackTime ?? @event.TrackTime, TrackTime = @event.NewTrackTime ?? @event.TrackTime,
TrackTimeZone = @event.TrackTimeZone, TrackTimeZone = @event.TrackTimeZone,
CompareFields = @event.CompareFields, CompareFields = @event.CompareFields,
Extra = @event.Extra Extra = @event.NewExtra ?? @event.Extra
}, },
ForcedPush = @event.ForcedPush, ForcedPush = @event.ForcedPush,
IsToMq = (trackContent.IsToMq || @event.IsToMq) IsToMq = (trackContent.IsToMq || @event.IsToMq)

2
src/SJZY.Track.Application/Services/Broadcasting/BroadcastingService.cs
View File

@ -56,7 +56,7 @@ public class BroadcastingService : IBroadcastingService
OrderIdentifiers = eto.OrderIdentifiers, OrderIdentifiers = eto.OrderIdentifiers,
CustomId = eto.CustomId, CustomId = eto.CustomId,
SubSystemId = eto.SubSystemId, SubSystemId = eto.SubSystemId,
Extra = eto.Extra Extra = eto.NewExtra ?? eto.Extra
}; };
if (eto.IsAdd) if (eto.IsAdd)