From d2de95a8039155fe1b9eff4d59a8cf95e27bac5e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=8E=E9=B9=8F=E5=86=9B?= <2357729423@qq.com>
Date: Sun, 7 Apr 2024 20:07:38 +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=E8=BD=A8=E8=BF=B9=E6=98=8E?=
 =?UTF-8?q?=E7=BB=86=EF=BC=88"=E6=9C=8D=E5=8A=A1=E5=95=86=E6=BA=90?=
 =?UTF-8?q?=E8=BD=A8=E8=BF=B9=E5=86=85=E5=AE=B9"=E4=B8=8E"=E8=BD=A8?=
 =?UTF-8?q?=E8=BF=B9=E5=86=85=E5=AE=B9"=E4=B8=8D=E5=8C=B9=E9=85=8D?=
 =?UTF-8?q?=EF=BC=89=E5=B7=B2=E9=85=8D=E7=BD=AE=E6=98=A0=E5=B0=84=E3=80=91?=
 =?UTF-8?q?https://www.tapd.cn/60863849/bugtrace/bugs/view=3Fbug=5Fid=3D11?=
 =?UTF-8?q?60863849001032624?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Events/TrackUpsertEvent.cs                         | 10 ++++++++++
 .../EventHandlers/TrackRefreshEventHandler.cs          |  6 ++++++
 .../EventHandlers/TrackUpsertEventHandler.cs           |  2 ++
 3 files changed, 18 insertions(+)

diff --git a/src/SJZY.Track.Application.Contract/Events/TrackUpsertEvent.cs b/src/SJZY.Track.Application.Contract/Events/TrackUpsertEvent.cs
index 3533f2e6..53e0d856 100644
--- a/src/SJZY.Track.Application.Contract/Events/TrackUpsertEvent.cs
+++ b/src/SJZY.Track.Application.Contract/Events/TrackUpsertEvent.cs
@@ -22,6 +22,16 @@ public class TrackUpsertEvent
     /// </summary>
     public string? ServiceProviderName { get; set; }
 
+    /// <summary>
+    /// 原轨迹内容
+    /// </summary>
+    public string? OriginTrackContent { get; set; }
+
+    /// <summary>
+    /// 原轨迹报文
+    /// </summary>
+    public string? OriginTrackData { get; set; }
+
     /// <summary>
     /// 表示订单是否完成（只由轨迹刷新配置决定）
     /// tips：能够使得IsCompleted为true的点，全局只有一个：轨迹刷新
diff --git a/src/SJZY.Track.Application/EventHandlers/TrackRefreshEventHandler.cs b/src/SJZY.Track.Application/EventHandlers/TrackRefreshEventHandler.cs
index b4bfe207..61431b30 100644
--- a/src/SJZY.Track.Application/EventHandlers/TrackRefreshEventHandler.cs
+++ b/src/SJZY.Track.Application/EventHandlers/TrackRefreshEventHandler.cs
@@ -218,6 +218,7 @@ public class TrackRefreshEventHandler : ITransientDependency, ICapSubscribe
             OrderType = context.OrderType,
             OrderNo = context.OrderNo,
             ServiceProviderName = context.ServiceProviderName,
+            OriginTrackData = JsonConvert.SerializeObject(trackToken),
             IsCompleted = matchedContentConfig.IsCompleted,
             SubSystemId = context.SubSystemId,
             TrackCode = matchedContentConfig.TrackContentCode,
@@ -225,6 +226,11 @@ public class TrackRefreshEventHandler : ITransientDependency, ICapSubscribe
             TrackTime = trackTime ?? DateTime.Now,
             TrackTimeZone = trackTimeZone ?? matchedContentConfig.TrackTimeZoneValue ?? 8
         };
+        if (paramConfig.TrackContentName != null)
+        {
+            trackUpsertEvent.OriginTrackContent = trackToken[paramConfig.TrackContentName]?.Value<string>();
+        }
+
         await _capPublisher.PublishAsync(GlobalConst.TrackUpsertSubscribe, trackUpsertEvent);
     }
 }
\ No newline at end of file
diff --git a/src/SJZY.Track.Application/EventHandlers/TrackUpsertEventHandler.cs b/src/SJZY.Track.Application/EventHandlers/TrackUpsertEventHandler.cs
index 41ce263b..105ef588 100644
--- a/src/SJZY.Track.Application/EventHandlers/TrackUpsertEventHandler.cs
+++ b/src/SJZY.Track.Application/EventHandlers/TrackUpsertEventHandler.cs
@@ -131,6 +131,8 @@ public class TrackUpsertEventHandler : ITransientDependency, ICapSubscribe
                 TrackTime = @event.TrackTime,
                 TrackTimeZone = @event.TrackTimeZone,
                 ServiceProviderName = @event.ServiceProviderName,
+                OriginTrackContent = @event.OriginTrackContent,
+                OriginTrackData = @event.OriginTrackData,
                 IsCanDelete = false,
                 CreateUser = @event.OperationMan ?? GlobalConst.SystemUser,
                 CreateTime = DateTime.Now