From 1805cc5b76ce1e00caf7ee4ff2ce07c950bd744e 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, 6 Aug 2024 11:35:52 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20IsTriggerPull=20=E5=A4=9A=E6=AC=A1?=
 =?UTF-8?q?=E5=88=B7=E8=BD=A8=E8=BF=B9=E8=A2=AB=E7=BD=AE=E4=B8=BAnull?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ...TrackChangeAfterUpdateOrderEventHandler.cs | 33 +++++++++++--------
 1 file changed, 19 insertions(+), 14 deletions(-)

diff --git a/src/SJZY.Track.Application/CAP/EventHandlers/TrackChangeAfterUpdateOrderEventHandler.cs b/src/SJZY.Track.Application/CAP/EventHandlers/TrackChangeAfterUpdateOrderEventHandler.cs
index 85d0ef57..1cbff4a3 100644
--- a/src/SJZY.Track.Application/CAP/EventHandlers/TrackChangeAfterUpdateOrderEventHandler.cs
+++ b/src/SJZY.Track.Application/CAP/EventHandlers/TrackChangeAfterUpdateOrderEventHandler.cs
@@ -12,13 +12,14 @@ namespace SJZY.Track.Application.CAP.EventHandlers;
 
 public class TrackChangeAfterUpdateOrderEventHandler : ITransientDependency, ICapSubscribe
 {
-    private readonly IOrderRepository _orderRepository;
     private readonly IForewarningNotifyService _forewarningNotifyService;
-    private readonly ITrackPullCacheService _trackPullCacheService;
+    private readonly IOrderRepository _orderRepository;
     private readonly IProvideQueries _provideQueries;
-    
+    private readonly ITrackPullCacheService _trackPullCacheService;
+
     public TrackChangeAfterUpdateOrderEventHandler(IOrderRepository orderRepository,
-        IForewarningNotifyService forewarningNotifyService, ITrackPullCacheService trackPullCacheService, IProvideQueries provideQueries)
+        IForewarningNotifyService forewarningNotifyService, ITrackPullCacheService trackPullCacheService,
+        IProvideQueries provideQueries)
     {
         _orderRepository = orderRepository;
         _forewarningNotifyService = forewarningNotifyService;
@@ -34,7 +35,7 @@ public class TrackChangeAfterUpdateOrderEventHandler : ITransientDependency, ICa
         if (orders.Count == 0) return;
 
         var updateOrders = new List<OrderEntity>();
-        var providerDic= await GetProviderDic(@event.OrderIds);
+        var providerDic = await GetProviderDic(@event.OrderIds);
         foreach (var order in orders)
         {
             if (order.LatestTrackContent != @event.TrackContent)
@@ -48,11 +49,11 @@ public class TrackChangeAfterUpdateOrderEventHandler : ITransientDependency, ICa
             }
 
             // 执行轨迹兜底时 时区缺失和发生地缺失标记，1表示时区，2表示发生地，3表示两种
-            if (@event.DeficiencyTagValue > 0 && @event.DeficiencyTagValue<=3)
+            if (@event.DeficiencyTagValue > 0 && @event.DeficiencyTagValue <= 3)
             {
                 order.DeficiencyTag = @event.DeficiencyTagValue;
             }
-            
+
             if (!order.IsCompleted)
             {
                 order.IsCompleted = @event.IsCompleted;
@@ -60,15 +61,18 @@ public class TrackChangeAfterUpdateOrderEventHandler : ITransientDependency, ICa
 
             if (!string.IsNullOrEmpty(@event.TrackCode) && providerDic.TryGetValue(order.Id, out var provider))
             {
-                var config = await _trackPullCacheService.GetPullParamWithContentConfigAsync(provider.SubSystemId, provider.ServiceProviderId);
-                
-                if (!string.IsNullOrEmpty(config?.ParamConfig.TrackContentCode) && config.ParamConfig.TrackContentCode!.ToLower() == @event.TrackCode.ToLower())
+                var config =
+                    await _trackPullCacheService.GetPullParamWithContentConfigAsync(provider.SubSystemId,
+                        provider.ServiceProviderId);
+
+                if (!string.IsNullOrEmpty(config?.ParamConfig.TrackContentCode) &&
+                    config.ParamConfig.TrackContentCode!.ToLower() == @event.TrackCode.ToLower())
                 {
                     // 触发拉取节点
                     order.IsTriggerPull = 1;
                 }
             }
-            
+
             order.LatestTrackContent = @event.TrackContent;
             order.LatestTrackEnContent = @event.TrackEnContent;
             order.LatestTrackPlace = @event.TrackPlace;
@@ -80,7 +84,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.IsTriggerPull,x.DeficiencyTag
+            x.LatestTrackTimeZone, x.IsTriggerPull, x.DeficiencyTag
         });
 
         // 预警计算
@@ -110,7 +114,8 @@ public class TrackChangeAfterUpdateOrderEventHandler : ITransientDependency, ICa
             ArrivalPostCode = order.ArrivalPostCode,
             IsTransit = order.IsTransit,
             LeavePort = order.LeavePort,
-            ProductCode = order.ProductCode
+            ProductCode = order.ProductCode,
+            IsTriggerPull = order.IsTriggerPull
         });
     }
 
@@ -139,7 +144,7 @@ public class TrackChangeAfterUpdateOrderEventHandler : ITransientDependency, ICa
             }).ToList()
         };
     }
-    
+
     /// <summary>
     /// 获取服务商字典
     /// </summary>