From c4917d66cca351828b3fc52668920532a8d8df11 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, 19 Mar 2024 15:51:15 +0800
Subject: [PATCH] =?UTF-8?q?fix=20=E5=BE=AA=E7=8E=AF=E4=BE=9D=E8=B5=96?=
 =?UTF-8?q?=E5=BC=82=E5=B8=B8case?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../EventHandlers/TrackDeleteEventHandler.cs      | 15 ++++++---------
 .../EventHandlers/TrackUpsertEventHandler.cs      |  3 +--
 2 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/src/SJZY.Track.Application/EventHandlers/TrackDeleteEventHandler.cs b/src/SJZY.Track.Application/EventHandlers/TrackDeleteEventHandler.cs
index 4f402731..28b38520 100644
--- a/src/SJZY.Track.Application/EventHandlers/TrackDeleteEventHandler.cs
+++ b/src/SJZY.Track.Application/EventHandlers/TrackDeleteEventHandler.cs
@@ -1,5 +1,6 @@
 using DotNetCore.CAP;
 using SJZY.Expand.ABP.Core.Logger;
+using SJZY.Expand.ABP.Core.PublicMethords;
 using SJZY.Track.Application.Contract.Events;
 using SJZY.Track.Domain.Aggregates.OrderAggregate;
 using SJZY.Track.Domain.Aggregates.TrackDetailsAggregate;
@@ -34,8 +35,6 @@ public class TrackDeleteEventHandler : ITransientDependency, ICapSubscribe
             return;
         }
 
-        @event.Visited.Add(@event.OrderId);
-
         // 不同子系统需要做内容映射
         if (@event.UpSubSystemId != 0 && @event.UpSubSystemId != @event.SubSystemId)
         {
@@ -75,13 +74,11 @@ public class TrackDeleteEventHandler : ITransientDependency, ICapSubscribe
         var linkedOrders = await _orderRepository.GetLinkedOrdersAsync(@event.OrderId);
         foreach (var linkedOrder in linkedOrders)
         {
-            var nextEvent = new TrackDeleteEvent
-            {
-                OrderId = linkedOrder.OrderId,
-                TrackCodes = @event.TrackCodes,
-                SubSystemId = linkedOrder.SubSystemId,
-                UpSubSystemId = @event.SubSystemId
-            };
+            var nextEvent = @event.DeepCopy();
+            nextEvent.Visited.Add(@event.OrderId);
+            nextEvent.TrackCodes = @event.TrackCodes;
+            nextEvent.SubSystemId = linkedOrder.SubSystemId;
+            nextEvent.UpSubSystemId = @event.SubSystemId;
 
             await _capPublisher.PublishAsync(GlobalConst.TrackDeleteSubscribe, nextEvent);
         }
diff --git a/src/SJZY.Track.Application/EventHandlers/TrackUpsertEventHandler.cs b/src/SJZY.Track.Application/EventHandlers/TrackUpsertEventHandler.cs
index 6de64141..208b3a85 100644
--- a/src/SJZY.Track.Application/EventHandlers/TrackUpsertEventHandler.cs
+++ b/src/SJZY.Track.Application/EventHandlers/TrackUpsertEventHandler.cs
@@ -42,8 +42,6 @@ public class TrackUpsertEventHandler : ITransientDependency, ICapSubscribe
             return;
         }
 
-        @event.Visited.Add(@event.OrderId);
-
         // 不同子系统需要做内容映射
         if (@event.UpSubSystemId != 0 && @event.UpSubSystemId != @event.SubSystemId)
         {
@@ -88,6 +86,7 @@ public class TrackUpsertEventHandler : ITransientDependency, ICapSubscribe
         foreach (var linkedOrder in linkedOrders)
         {
             var nextEvent = @event.DeepCopy();
+            nextEvent.Visited.Add(@event.OrderId);
             nextEvent.OrderId = linkedOrder.OrderId;
             nextEvent.OrderType = linkedOrder.OrderType;
             nextEvent.OrderNo = linkedOrder.OrderNo;