From 0a9bf47df3c0ab89b3f0b0960b1b73c62a892167 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=8E=E9=B9=8F=E5=86=9B?= <2357729423@qq.com>
Date: Thu, 21 Mar 2024 10:32:00 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E8=BD=A8=E8=BF=B9=E7=B4=A2=E5=BC=95?=
 =?UTF-8?q?=E5=A4=9A=E5=AD=98=E4=B8=80=E4=B8=AAzero=20track=20time?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../EventHandlers/TrackUpsertEventHandler.cs                 | 2 ++
 .../Aggregates/TrackDetailsAggregate/TrackDetailsIndex.cs    | 5 +++++
 2 files changed, 7 insertions(+)

diff --git a/src/SJZY.Track.Application/EventHandlers/TrackUpsertEventHandler.cs b/src/SJZY.Track.Application/EventHandlers/TrackUpsertEventHandler.cs
index 0e5da045..f5d542ef 100644
--- a/src/SJZY.Track.Application/EventHandlers/TrackUpsertEventHandler.cs
+++ b/src/SJZY.Track.Application/EventHandlers/TrackUpsertEventHandler.cs
@@ -137,6 +137,8 @@ public class TrackUpsertEventHandler : ITransientDependency, ICapSubscribe
                 CreateUser = CurrentUserRequest.CurrentUser.Name,
                 CreateTime = DateTime.Now
             };
+
+            track.ZeroTrackTime = track.TrackTime.Subtract(TimeSpan.FromHours(track.TrackTimeZone));
         }
         else
         {
diff --git a/src/SJZY.Track.Domain/Aggregates/TrackDetailsAggregate/TrackDetailsIndex.cs b/src/SJZY.Track.Domain/Aggregates/TrackDetailsAggregate/TrackDetailsIndex.cs
index b596c85a..b3319d35 100644
--- a/src/SJZY.Track.Domain/Aggregates/TrackDetailsAggregate/TrackDetailsIndex.cs
+++ b/src/SJZY.Track.Domain/Aggregates/TrackDetailsAggregate/TrackDetailsIndex.cs
@@ -82,6 +82,11 @@ public class TrackDetailsIndex : IdBaseIndex
     /// </summary>
     public float TrackTimeZone { get; set; }
 
+    /// <summary>
+    /// 转化后的轨迹发生时间
+    /// </summary>
+    public DateTime ZeroTrackTime { get; set; }
+
     /// <summary>是否可删</summary>
     public bool IsCanDelete { get; set; }
 

From 4166a36bf0995d7f9a8ddba5643b147a7692c970 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=8E=E9=B9=8F=E5=86=9B?= <2357729423@qq.com>
Date: Thu, 21 Mar 2024 10:52:53 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E8=BD=A8=E8=BF=B9=20=E4=B8=8D=E5=AD=98?=
 =?UTF-8?q?=E5=9C=A8=E6=96=B0=E5=A2=9E/=E5=AD=98=E5=9C=A8=E6=9B=B4?=
 =?UTF-8?q?=E6=96=B0=20=E5=88=86=E7=B1=BB=E8=AE=A8=E8=AE=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Dtos/ProvideServices/UpsertTrackInput.cs                 | 5 +++++
 .../EventHandlers/TrackUpsertEventHandler.cs                 | 5 +++--
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/SJZY.Track.Application.Contract/Dtos/ProvideServices/UpsertTrackInput.cs b/src/SJZY.Track.Application.Contract/Dtos/ProvideServices/UpsertTrackInput.cs
index 8248c8e0..ce97f715 100644
--- a/src/SJZY.Track.Application.Contract/Dtos/ProvideServices/UpsertTrackInput.cs
+++ b/src/SJZY.Track.Application.Contract/Dtos/ProvideServices/UpsertTrackInput.cs
@@ -4,6 +4,11 @@ namespace SJZY.Track.Application.Contract.Dtos.ProvideServices;
 
 public class UpsertTrackInput : OrderNoInfo
 {
+    /// <summary>
+    /// true新增，false更新
+    /// </summary>
+    public bool IsAdd { get; set; }
+
     /// <summary>
     /// 轨迹内容代码
     /// </summary>
diff --git a/src/SJZY.Track.Application/EventHandlers/TrackUpsertEventHandler.cs b/src/SJZY.Track.Application/EventHandlers/TrackUpsertEventHandler.cs
index f5d542ef..6c8fd767 100644
--- a/src/SJZY.Track.Application/EventHandlers/TrackUpsertEventHandler.cs
+++ b/src/SJZY.Track.Application/EventHandlers/TrackUpsertEventHandler.cs
@@ -105,7 +105,7 @@ public class TrackUpsertEventHandler : ITransientDependency, ICapSubscribe
     /// <param name="event"></param>
     private async Task<TrackDetailsIndex?> UpsertTrackAsync(TrackDetailsIndex? track, TrackUpsertEvent @event)
     {
-        if (track == default)
+        if (track == default && @event.IsAdd)
         {
             //todo：可以优化
             // 根据轨迹code在订单模板内容中寻找匹配的
@@ -140,7 +140,8 @@ public class TrackUpsertEventHandler : ITransientDependency, ICapSubscribe
 
             track.ZeroTrackTime = track.TrackTime.Subtract(TimeSpan.FromHours(track.TrackTimeZone));
         }
-        else
+
+        if (track != default && !@event.IsAdd)
         {
             track.TrackPlace = @event.TrackPlace;
             track.TrackTime = @event.TrackTime!.Value;