From a663894bcc532f7a305dd7d4af8d7a6bbb4a123b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=8E=E9=B9=8F=E5=86=9B?= <2357729423@qq.com>
Date: Wed, 27 Mar 2024 09:19:45 +0800
Subject: [PATCH] =?UTF-8?q?fix=EF=BC=9A=E3=80=90=E3=80=90=E8=BD=A8?=
 =?UTF-8?q?=E8=BF=B9=E8=AE=A2=E5=8D=95=E3=80=91=E6=89=B9=E9=87=8F=E6=96=B0?=
 =?UTF-8?q?=E5=A2=9E=E8=BD=A8=E8=BF=B9=E6=98=8E=E7=BB=86=EF=BC=8C=E5=88=9B?=
 =?UTF-8?q?=E5=BB=BA=E4=BA=BA=E5=BC=82=E5=B8=B8=E4=B8=BA=E7=A9=BA=E3=80=91?=
 =?UTF-8?q?https://www.tapd.cn/60863849/bugtrace/bugs/view=3Fbug=5Fid=3D11?=
 =?UTF-8?q?60863849001031517?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Events/TrackDeleteEvent.cs                            | 5 +++++
 .../Services/ProvideServices/TrackService.cs              | 8 ++++++--
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/src/SJZY.Track.Application.Contract/Events/TrackDeleteEvent.cs b/src/SJZY.Track.Application.Contract/Events/TrackDeleteEvent.cs
index eccbe955..d5286726 100644
--- a/src/SJZY.Track.Application.Contract/Events/TrackDeleteEvent.cs
+++ b/src/SJZY.Track.Application.Contract/Events/TrackDeleteEvent.cs
@@ -22,6 +22,11 @@ public class TrackDeleteEvent
     /// </summary>
     public int UpSubSystemId { get; set; }
 
+    /// <summary>
+    /// 操作人
+    /// </summary>
+    public string? OperationMan { get; set; }
+
     /// <summary>
     /// 已经处理过的订单
     /// </summary>
diff --git a/src/SJZY.Track.Application/Services/ProvideServices/TrackService.cs b/src/SJZY.Track.Application/Services/ProvideServices/TrackService.cs
index 77199263..72fe2f20 100644
--- a/src/SJZY.Track.Application/Services/ProvideServices/TrackService.cs
+++ b/src/SJZY.Track.Application/Services/ProvideServices/TrackService.cs
@@ -80,7 +80,7 @@ public partial class TrackService : ApplicationService, ITrackService
         var orders = await _orderRepository.GetListAsync(x =>
             x.OrderType == input.OrderType && input.OrderNos.Contains(x.OrderNo), x => new
         {
-            x.Id, x.OrderNo, x.SubSystemId, x.LatestPushTrackContentId, x.CustomId
+            x.Id, x.OrderNo, x.SubSystemId, x.LatestPushTrackContentId, x.CustomId, x.IsCompleted
         });
 
         foreach (var order in orders)
@@ -98,7 +98,9 @@ public partial class TrackService : ApplicationService, ITrackService
                 OrderId = order.Id,
                 SubSystemId = order.SubSystemId,
                 LatestPushTrackContentId = order.LatestPushTrackContentId,
-                CustomId = order.CustomId
+                CustomId = order.CustomId,
+                IsCompleted = order.IsCompleted,
+                OperationMan = CurrentUserRequest.CurrentUser.Name
             };
             await _capPublisher.PublishAsync(GlobalConst.TrackUpsertSubscribe, @event);
         }
@@ -138,6 +140,7 @@ public partial class TrackService : ApplicationService, ITrackService
             OrderId = order.Id,
             TrackCodes = codes.Select(x => x.TrackCode).ToList(),
             SubSystemId = order.SubSystemId,
+            OperationMan = CurrentUserRequest.CurrentUser.Name
         };
         await _capPublisher.PublishAsync(GlobalConst.TrackDeleteSubscribe, @event);
 
@@ -177,6 +180,7 @@ public partial class TrackService : ApplicationService, ITrackService
                 OrderId = group.Key,
                 TrackCodes = codes.Select(x => x.TrackCode).ToList(),
                 SubSystemId = orders.First(x => x.Id == group.Key).SubSystemId,
+                OperationMan = CurrentUserRequest.CurrentUser.Name
             };
             await _capPublisher.PublishAsync(GlobalConst.TrackDeleteSubscribe, @event);
         }