From f1d15c34df24b8709cddbdaddfa1130d67a9d87f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=92=9F=E5=96=9C=E6=97=BA?= <zhongxiwnag@foxmail.com>
Date: Tue, 30 Jul 2024 16:47:47 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E6=96=B0=E5=A2=9E=E6=8B=89=E5=8F=96?=
 =?UTF-8?q?=E7=95=8C=E9=9D=A2=E5=A2=9E=E5=8A=A0=E5=AD=97=E6=AE=B5=EF=BC=9A?=
 =?UTF-8?q?=E8=A7=A6=E5=8F=91=E6=8B=89=E5=8F=96=E8=8A=82=E7=82=B9=20?=
 =?UTF-8?q?=E4=BA=8C=E6=AC=A1=E8=87=AA=E6=B5=8B=E5=AE=8C=E6=88=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../TrackChangeAfterUpdateOrderEventHandler.cs              | 6 +++---
 .../Aggregates/TrackPullAggregate/TrackPullConfigEntity.cs  | 5 -----
 2 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/src/SJZY.Track.Application/CAP/EventHandlers/TrackChangeAfterUpdateOrderEventHandler.cs b/src/SJZY.Track.Application/CAP/EventHandlers/TrackChangeAfterUpdateOrderEventHandler.cs
index 00925079..eef4d26a 100644
--- a/src/SJZY.Track.Application/CAP/EventHandlers/TrackChangeAfterUpdateOrderEventHandler.cs
+++ b/src/SJZY.Track.Application/CAP/EventHandlers/TrackChangeAfterUpdateOrderEventHandler.cs
@@ -53,11 +53,11 @@ public class TrackChangeAfterUpdateOrderEventHandler : ITransientDependency, ICa
                 order.IsCompleted = @event.IsCompleted;
             }
 
-            if (providerDic.TryGetValue(order.Id, out var provider))
+            if (!string.IsNullOrEmpty(@event.TrackCode) && providerDic.TryGetValue(order.Id, out var provider))
             {
                 var config = await _trackPullCacheService.GetPullParamWithContentConfigAsync(provider.SubSystemId, provider.ServiceProviderId);
                 
-                if (config!=null && config.ParamConfig!=null && config.ParamConfig.TrackContentCode == @event.TrackCode)
+                if (!string.IsNullOrEmpty(config?.ParamConfig?.TrackContentCode) && config.ParamConfig.TrackContentCode!.ToLower() == @event.TrackCode.ToLower())
                 {
                     // 触发拉取节点
                     order.IsTriggerPull = 1;
@@ -75,7 +75,7 @@ public class TrackChangeAfterUpdateOrderEventHandler : ITransientDependency, ICa
         await _orderRepository.UpdateRangeAsync(updateOrders, x => new
         {
             x.IsCompleted, x.LatestTrackContent, x.LatestTrackEnContent, x.LatestTrackPlace, x.LatestTrackTime,
-            x.LatestTrackTimeZone
+            x.LatestTrackTimeZone,x.IsTriggerPull
         });
 
         // 预警计算
diff --git a/src/SJZY.Track.Domain/Aggregates/TrackPullAggregate/TrackPullConfigEntity.cs b/src/SJZY.Track.Domain/Aggregates/TrackPullAggregate/TrackPullConfigEntity.cs
index 4e016b17..4c6d7ed7 100644
--- a/src/SJZY.Track.Domain/Aggregates/TrackPullAggregate/TrackPullConfigEntity.cs
+++ b/src/SJZY.Track.Domain/Aggregates/TrackPullAggregate/TrackPullConfigEntity.cs
@@ -35,9 +35,4 @@ public class TrackPullConfigEntity : IFullAuditedBasicEntitys, IAggregateRoot
     /// </summary>
     [SugarColumn(ColumnName = "SubSystemId")]
     public int SubSystemId { get; set; }
-    
-    /// <summary>
-    /// 轨迹内容code
-    /// </summary>
-    public string? TrackContentCode { get; set; }
 }
\ No newline at end of file