ideship/track
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update: 【修改轨迹】增加新轨迹发生时间字段，原轨迹发生时间用于匹配具体明细记录

Browse Source
This commit is contained in:
云龙 王 2024-11-21 17:36:07 +08:00
parent d4c5c84779
commit e17e9fae38
4 changed files with 19 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/SJZY.Track.Application.Contract/Dtos/ProvideServices/BatchUpsertTrackInput.cs
View File

@ -29,6 +29,11 @@ public class BatchUpsertTrackInput : OrderNosInfo
[Required]
public DateTime TrackTime { get; set; }
/// <summary>
/// 更改后的轨迹发生时间，无需更改保持为空
/// </summary>
public DateTime? NewTrackTime { get; set; }
/// <summary>
/// 轨迹发生时区
/// </summary>

5
src/SJZY.Track.Application.Contract/Dtos/ProvideServices/UpsertTrackInput.cs
View File

@ -29,6 +29,11 @@ public class UpsertTrackInput : OrderNoInfo
[Required]
public DateTime? TrackTime { get; set; }
/// <summary>
/// 更改后的轨迹发生时间，无需更改保持为空
/// </summary>
public DateTime? NewTrackTime { get; set; }
/// <summary>
/// 轨迹发生时区
/// </summary>

5
src/SJZY.Track.Application.Contract/Events/TrackUpsertEvent.cs
View File

@ -49,6 +49,11 @@ public class TrackUpsertEvent
/// </summary>
public DateTime TrackTime { get; set; }
/// <summary>
/// 更改后的轨迹发生时间，无需更改保持为空
/// </summary>
public DateTime? NewTrackTime { get; set; }
/// <summary>
/// 轨迹发生时区
/// </summary>

8
src/SJZY.Track.Application/CAP/EventHandlers/TrackUpsertEventHandler.cs
View File

@ -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