From 7199398dd7e62151ca48c545476c4eeb995918bc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=8E=E9=B9=8F=E5=86=9B?= <2357729423@qq.com>
Date: Tue, 16 Apr 2024 19:20:40 +0800
Subject: [PATCH] =?UTF-8?q?fix=EF=BC=9A=E6=9B=B4=E6=96=B0=E7=9A=84?=
 =?UTF-8?q?=E5=8D=B3=E6=98=AF=E6=9C=80=E6=96=B0=E8=BD=A8=E8=BF=B9=E6=97=B6?=
 =?UTF-8?q?=EF=BC=8C=E7=9B=B4=E6=8E=A5=E8=A6=86=E7=9B=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Events/TrackChangeAfterUpdateOrderEvent.cs        |  5 -----
 .../TrackChangeAfterUpdateOrderEventHandler.cs        | 11 +++++++----
 .../EventHandlers/TrackUpsertEventHandler.cs          |  1 -
 3 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/src/SJZY.Track.Application.Contract/Events/TrackChangeAfterUpdateOrderEvent.cs b/src/SJZY.Track.Application.Contract/Events/TrackChangeAfterUpdateOrderEvent.cs
index 3fd35deb..a59c31c8 100644
--- a/src/SJZY.Track.Application.Contract/Events/TrackChangeAfterUpdateOrderEvent.cs
+++ b/src/SJZY.Track.Application.Contract/Events/TrackChangeAfterUpdateOrderEvent.cs
@@ -12,11 +12,6 @@ public class TrackChangeAfterUpdateOrderEvent
     /// </summary>
     public bool IsCompleted { get; set; }
 
-    /// <summary>
-    /// 轨迹代码
-    /// </summary>
-    public string TrackCode { get; set; } = null!;
-
     /// <summary>
     /// 轨迹内容
     /// </summary>
diff --git a/src/SJZY.Track.Application/EventHandlers/TrackChangeAfterUpdateOrderEventHandler.cs b/src/SJZY.Track.Application/EventHandlers/TrackChangeAfterUpdateOrderEventHandler.cs
index 3f586b15..3e3b1d07 100644
--- a/src/SJZY.Track.Application/EventHandlers/TrackChangeAfterUpdateOrderEventHandler.cs
+++ b/src/SJZY.Track.Application/EventHandlers/TrackChangeAfterUpdateOrderEventHandler.cs
@@ -38,11 +38,14 @@ public class TrackChangeAfterUpdateOrderEventHandler : ITransientDependency, ICa
 
         foreach (var order in orders)
         {
-            if (order.LatestTrackTime != null &&
-                @event.TrackTime.Subtract(TimeSpan.FromHours(@event.TrackTimeZone)) <
-                order.LatestTrackTime.Value.Subtract(TimeSpan.FromHours(order.LatestTrackTimeZone ?? 0)))
+            if (order.LatestTrackContent != @event.TrackContent)
             {
-                continue;
+                if (order.LatestTrackTime != null &&
+                    @event.TrackTime.Subtract(TimeSpan.FromHours(@event.TrackTimeZone)) <
+                    order.LatestTrackTime.Value.Subtract(TimeSpan.FromHours(order.LatestTrackTimeZone ?? 0)))
+                {
+                    continue;
+                }
             }
 
             if (!order.IsCompleted)
diff --git a/src/SJZY.Track.Application/EventHandlers/TrackUpsertEventHandler.cs b/src/SJZY.Track.Application/EventHandlers/TrackUpsertEventHandler.cs
index 65dba149..c4073332 100644
--- a/src/SJZY.Track.Application/EventHandlers/TrackUpsertEventHandler.cs
+++ b/src/SJZY.Track.Application/EventHandlers/TrackUpsertEventHandler.cs
@@ -187,7 +187,6 @@ public class TrackUpsertEventHandler : ITransientDependency, ICapSubscribe
             {
                 OrderIds = orderIds,
                 IsCompleted = @event.TrackRefreshData.IsCompleted,
-                TrackCode = @event.TrackCode,
                 TrackContent = firstTrack.TrackContent,
                 TrackEnContent = firstTrack.TrackEnContent,
                 TrackPlace = @event.TrackPlace,