From 6abe9608713321ad78b102370e0f1118e3b0a417 Mon Sep 17 00:00:00 2001
From: eli <xumengen_eli@online.com>
Date: Tue, 19 Nov 2024 11:36:29 +0800
Subject: [PATCH] =?UTF-8?q?=E8=87=AA=E6=B5=8Bbug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../EventHandlers/TrackUpsertEventHandler.cs  | 49 +++++++++----------
 1 file changed, 24 insertions(+), 25 deletions(-)

diff --git a/src/SJZY.Track.Application/CAP/EventHandlers/TrackUpsertEventHandler.cs b/src/SJZY.Track.Application/CAP/EventHandlers/TrackUpsertEventHandler.cs
index ee9ca7d7..c807dab6 100644
--- a/src/SJZY.Track.Application/CAP/EventHandlers/TrackUpsertEventHandler.cs
+++ b/src/SJZY.Track.Application/CAP/EventHandlers/TrackUpsertEventHandler.cs
@@ -299,19 +299,6 @@ public class TrackUpsertEventHandler : ITransientDependency, ICapSubscribe
 
                 //来源与外部服务商不允许修改
                 if (track.Source == (int) TrackSourceEnum.ExternalServiceProvide) continue;
-
-
-                // 写入操作日志
-                _ = _orderOperationRecordEsRepository.AddAsync(new OrderOperationRecordIndex
-                {
-                    OrderId = order.OrderId,
-                    OrderNo = order.OrderNo,
-                    OptionType = OrderOperationType.创建轨迹.ToString(),
-                    Content = track.ToJson(),
-                    CreateUserId = @event.OperationManId,
-                    CreateUserName = @event.OperationMan ?? "",
-                    CreateTime = DateTime.Now
-                });
             }
             else
             {
@@ -347,18 +334,6 @@ public class TrackUpsertEventHandler : ITransientDependency, ICapSubscribe
                 }
 
                 //其余情况：A,D都为新增操作，无需检查数量，track为null执行新增操作
-
-                // 写入操作日志
-                _ = _orderOperationRecordEsRepository.AddAsync(new OrderOperationRecordIndex
-                {
-                    OrderId = order.OrderId,
-                    OrderNo = order.OrderNo,
-                    OptionType = OrderOperationType.修改轨迹.ToString(),
-                    Content = track.ToJson(),
-                    CreateUserId = @event.OperationManId,
-                    CreateUserName = @event.OperationMan ?? "",
-                    CreateTime = DateTime.Now
-                });
             }
 
             if (track == default)
@@ -407,6 +382,18 @@ public class TrackUpsertEventHandler : ITransientDependency, ICapSubscribe
                     ? track.TrackTime
                     : track.TrackTime.Subtract(TimeSpan.FromHours(track.TrackTimeZone));
                 insertTracks.Add(track);
+
+                // 写入操作日志
+                _ = _orderOperationRecordEsRepository.AddAsync(new OrderOperationRecordIndex
+                {
+                    OrderId = order.OrderId,
+                    OrderNo = order.OrderNo,
+                    OptionType = OrderOperationType.创建轨迹.ToString(),
+                    Content = track.ToJson(),
+                    CreateUserId = @event.OperationManId,
+                    CreateUserName = @event.OperationMan ?? "",
+                    CreateTime = DateTime.Now
+                });
             }
             else
             {
@@ -441,6 +428,18 @@ public class TrackUpsertEventHandler : ITransientDependency, ICapSubscribe
                 track.EstimatedDeliveryDate = @event.EstimatedDeliveryDate;
 
                 updateTracks.Add(track);
+
+                // 写入操作日志
+                _ = _orderOperationRecordEsRepository.AddAsync(new OrderOperationRecordIndex
+                {
+                    OrderId = order.OrderId,
+                    OrderNo = order.OrderNo,
+                    OptionType = OrderOperationType.修改轨迹.ToString(),
+                    Content = track.ToJson(),
+                    CreateUserId = @event.OperationManId,
+                    CreateUserName = @event.OperationMan ?? "",
+                    CreateTime = DateTime.Now
+                });
             }
 
             canNextOrderIds.Add(order.OrderId);