From e17e9fae38f233f187733044429195444e8fab2f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BA=91=E9=BE=99=20=E7=8E=8B?= Date: Thu, 21 Nov 2024 17:36:07 +0800 Subject: [PATCH] =?UTF-8?q?update:=20=E3=80=90=E4=BF=AE=E6=94=B9=E8=BD=A8?= =?UTF-8?q?=E8=BF=B9=E3=80=91=E5=A2=9E=E5=8A=A0=E6=96=B0=E8=BD=A8=E8=BF=B9?= =?UTF-8?q?=E5=8F=91=E7=94=9F=E6=97=B6=E9=97=B4=E5=AD=97=E6=AE=B5=EF=BC=8C?= =?UTF-8?q?=E5=8E=9F=E8=BD=A8=E8=BF=B9=E5=8F=91=E7=94=9F=E6=97=B6=E9=97=B4?= =?UTF-8?q?=E7=94=A8=E4=BA=8E=E5=8C=B9=E9=85=8D=E5=85=B7=E4=BD=93=E6=98=8E?= =?UTF-8?q?=E7=BB=86=E8=AE=B0=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Dtos/ProvideServices/BatchUpsertTrackInput.cs | 5 +++++ .../Dtos/ProvideServices/UpsertTrackInput.cs | 5 +++++ .../Events/TrackUpsertEvent.cs | 5 +++++ .../CAP/EventHandlers/TrackUpsertEventHandler.cs | 8 ++++---- 4 files changed, 19 insertions(+), 4 deletions(-) diff --git a/src/SJZY.Track.Application.Contract/Dtos/ProvideServices/BatchUpsertTrackInput.cs b/src/SJZY.Track.Application.Contract/Dtos/ProvideServices/BatchUpsertTrackInput.cs index 3992554f..baaeb7bb 100644 --- a/src/SJZY.Track.Application.Contract/Dtos/ProvideServices/BatchUpsertTrackInput.cs +++ b/src/SJZY.Track.Application.Contract/Dtos/ProvideServices/BatchUpsertTrackInput.cs @@ -29,6 +29,11 @@ public class BatchUpsertTrackInput : OrderNosInfo [Required] public DateTime TrackTime { get; set; } + /// + /// 更改后的轨迹发生时间，无需更改保持为空 + /// + public DateTime? NewTrackTime { get; set; } + /// /// 轨迹发生时区 /// diff --git a/src/SJZY.Track.Application.Contract/Dtos/ProvideServices/UpsertTrackInput.cs b/src/SJZY.Track.Application.Contract/Dtos/ProvideServices/UpsertTrackInput.cs index 309d652e..b4cf72ae 100644 --- a/src/SJZY.Track.Application.Contract/Dtos/ProvideServices/UpsertTrackInput.cs +++ b/src/SJZY.Track.Application.Contract/Dtos/ProvideServices/UpsertTrackInput.cs @@ -29,6 +29,11 @@ public class UpsertTrackInput : OrderNoInfo [Required] public DateTime? TrackTime { get; set; } + /// + /// 更改后的轨迹发生时间，无需更改保持为空 + /// + public DateTime? NewTrackTime { get; set; } + /// /// 轨迹发生时区 /// diff --git a/src/SJZY.Track.Application.Contract/Events/TrackUpsertEvent.cs b/src/SJZY.Track.Application.Contract/Events/TrackUpsertEvent.cs index 483c929b..4102df32 100644 --- a/src/SJZY.Track.Application.Contract/Events/TrackUpsertEvent.cs +++ b/src/SJZY.Track.Application.Contract/Events/TrackUpsertEvent.cs @@ -49,6 +49,11 @@ public class TrackUpsertEvent /// public DateTime TrackTime { get; set; } + /// + /// 更改后的轨迹发生时间，无需更改保持为空 + /// + public DateTime? NewTrackTime { get; set; } + /// /// 轨迹发生时区 /// diff --git a/src/SJZY.Track.Application/CAP/EventHandlers/TrackUpsertEventHandler.cs b/src/SJZY.Track.Application/CAP/EventHandlers/TrackUpsertEventHandler.cs index 30feeffa..58b1cd4f 100644 --- a/src/SJZY.Track.Application/CAP/EventHandlers/TrackUpsertEventHandler.cs +++ b/src/SJZY.Track.Application/CAP/EventHandlers/TrackUpsertEventHandler.cs @@ -347,7 +347,7 @@ public class TrackUpsertEventHandler : ITransientDependency, ICapSubscribe OrderType = order.OrderType, TrackCode = @event.TrackCode, TrackPlace = @event.TrackPlace, - TrackTime = @event.TrackTime, + TrackTime = @event.NewTrackTime ?? @event.TrackTime, TrackTimeZone = @event.TrackTimeZone, ServiceProviderCode = @event.TrackRefreshData.ServiceProviderCode ?? GlobalConst.EmptyString, OriginTrackContent = @event.TrackRefreshData.OriginTrackContent ?? GlobalConst.EmptyString, @@ -357,8 +357,8 @@ public class TrackUpsertEventHandler : ITransientDependency, ICapSubscribe //来源轨迹内容,第一次新增的时候使用轨迹内容表提供的 TrackStatus = trackContent.TrackStatus, TrackStatusCode = trackContent.TrackStatusCode, - TrackContent = @event.Content?? trackContent.TrackContent, - TrackEnContent = @event.EnStatus?? trackContent.TrackEnContent, + TrackContent = @event.Content ?? trackContent.TrackContent, + TrackEnContent = @event.EnStatus ?? trackContent.TrackEnContent, //S06新增轨迹明细字段 IsVisibility = @event.IsVisibility, Source = @event.Source, @@ -399,7 +399,7 @@ public class TrackUpsertEventHandler : ITransientDependency, ICapSubscribe else { track.TrackPlace = @event.TrackPlace; - track.TrackTime = @event.TrackTime; + track.TrackTime = @event.NewTrackTime ?? @event.TrackTime; track.TrackTimeZone = @event.TrackTimeZone; track.ZeroTrackTime = Math.Abs(track.TrackTimeZone - GlobalConst.NoneTrackTimeZone) < 1 ? track.TrackTime