From 923d7a2e917f2dce077e7d6d7fb36739e1612176 Mon Sep 17 00:00:00 2001
From: hardstylewyl <827778732@qq.com>
Date: Thu, 2 Jan 2025 09:19:27 +0800
Subject: [PATCH] =?UTF-8?q?refactor:=E4=BC=98=E5=8C=96=E8=BD=A8=E8=BF=B9?=
 =?UTF-8?q?=E6=9B=B4=E6=96=B0=E5=90=8E=E6=9B=B4=E6=96=B0=E8=AE=A2=E5=8D=95?=
 =?UTF-8?q?=E4=B8=BB=E8=A1=A8=E4=BA=8B=E4=BB=B6=E5=A4=84=E7=90=86=E5=99=A8?=
 =?UTF-8?q?=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ...TrackChangeAfterUpdateOrderEventHandler.cs | 42 +++++++------------
 1 file changed, 14 insertions(+), 28 deletions(-)

diff --git a/src/SJZY.Track.Application/CAP/EventHandlers/TrackChangeAfterUpdateOrderEventHandler.cs b/src/SJZY.Track.Application/CAP/EventHandlers/TrackChangeAfterUpdateOrderEventHandler.cs
index 1f32a4e3..e3a98037 100644
--- a/src/SJZY.Track.Application/CAP/EventHandlers/TrackChangeAfterUpdateOrderEventHandler.cs
+++ b/src/SJZY.Track.Application/CAP/EventHandlers/TrackChangeAfterUpdateOrderEventHandler.cs
@@ -26,8 +26,6 @@ public class TrackChangeAfterUpdateOrderEventHandler : ITransientDependency, ICa
             return;
         }
 
-        //指示是否需要更新【预计签收时间】【签收地时区】
-        var isNeedUpdate = false;
         var updateOrders = new List<OrderEntity>();
         foreach (var order in orders)
         {
@@ -62,37 +60,23 @@ public class TrackChangeAfterUpdateOrderEventHandler : ITransientDependency, ICa
             {
                 order.EstimatedDeliveryDate = @event.EstimatedDeliveryDate.Value;
                 order.DestinationTimeZone = @event.DestinationTimeZone.Value;
-                isNeedUpdate = true;
             }
 
             updateOrders.Add(order);
         }
 
-        await _orderRepository.UpdateRangeAsync(updateOrders,
-            isNeedUpdate
-                ? x => new
-                {
-                    x.IsCompleted,
-                    x.LatestTrackContent,
-                    x.LatestTrackEnContent,
-                    x.LatestTrackPlace,
-                    x.LatestTrackTime,
-                    x.LatestTrackTimeZone,
-                    x.DeficiencyTag,
-                    //当标识指示需要更新时添加更新列
-                    x.EstimatedDeliveryDate,
-                    x.DestinationTimeZone
-                }
-                : x => new
-                {
-                    x.IsCompleted,
-                    x.LatestTrackContent,
-                    x.LatestTrackEnContent,
-                    x.LatestTrackPlace,
-                    x.LatestTrackTime,
-                    x.LatestTrackTimeZone,
-                    x.DeficiencyTag,
-                }
+        await _orderRepository.UpdateRangeAsync(updateOrders, x => new
+            {
+                x.IsCompleted,
+                x.LatestTrackContent,
+                x.LatestTrackEnContent,
+                x.LatestTrackPlace,
+                x.LatestTrackTime,
+                x.LatestTrackTimeZone,
+                x.DeficiencyTag,
+                x.EstimatedDeliveryDate,
+                x.DestinationTimeZone
+            }
         );
     }
 
@@ -109,6 +93,8 @@ public class TrackChangeAfterUpdateOrderEventHandler : ITransientDependency, ICa
             LatestTrackPlace = order.LatestTrackPlace,
             LatestTrackTime = order.LatestTrackTime,
             LatestTrackTimeZone = order.LatestTrackTimeZone,
+            DestinationTimeZone = order.DestinationTimeZone,
+            EstimatedDeliveryDate = order.EstimatedDeliveryDate,
         });
     }
 }