Merge branch 'S03-轨迹中台优化项' into dev
This commit is contained in:
commit
c5b534593c
@ -12,11 +12,6 @@ public class TrackChangeAfterUpdateOrderEvent
|
|||||||
/// </summary>
|
/// </summary>
|
||||||
public bool IsCompleted { get; set; }
|
public bool IsCompleted { get; set; }
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// 轨迹代码
|
|
||||||
/// </summary>
|
|
||||||
public string TrackCode { get; set; } = null!;
|
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// 轨迹内容
|
/// 轨迹内容
|
||||||
/// </summary>
|
/// </summary>
|
||||||
|
|||||||
@ -37,6 +37,8 @@ public class TrackChangeAfterUpdateOrderEventHandler : ITransientDependency, ICa
|
|||||||
if (orders.Count == 0) return;
|
if (orders.Count == 0) return;
|
||||||
|
|
||||||
foreach (var order in orders)
|
foreach (var order in orders)
|
||||||
|
{
|
||||||
|
if (order.LatestTrackContent != @event.TrackContent)
|
||||||
{
|
{
|
||||||
if (order.LatestTrackTime != null &&
|
if (order.LatestTrackTime != null &&
|
||||||
@event.TrackTime.Subtract(TimeSpan.FromHours(@event.TrackTimeZone)) <
|
@event.TrackTime.Subtract(TimeSpan.FromHours(@event.TrackTimeZone)) <
|
||||||
@ -44,6 +46,7 @@ public class TrackChangeAfterUpdateOrderEventHandler : ITransientDependency, ICa
|
|||||||
{
|
{
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
if (!order.IsCompleted)
|
if (!order.IsCompleted)
|
||||||
{
|
{
|
||||||
|
|||||||
@ -187,7 +187,6 @@ public class TrackUpsertEventHandler : ITransientDependency, ICapSubscribe
|
|||||||
{
|
{
|
||||||
OrderIds = orderIds,
|
OrderIds = orderIds,
|
||||||
IsCompleted = @event.TrackRefreshData.IsCompleted,
|
IsCompleted = @event.TrackRefreshData.IsCompleted,
|
||||||
TrackCode = @event.TrackCode,
|
|
||||||
TrackContent = firstTrack.TrackContent,
|
TrackContent = firstTrack.TrackContent,
|
||||||
TrackEnContent = firstTrack.TrackEnContent,
|
TrackEnContent = firstTrack.TrackEnContent,
|
||||||
TrackPlace = @event.TrackPlace,
|
TrackPlace = @event.TrackPlace,
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user