Merge branch 'S02-轨迹中台第二部分' into dev

This commit is contained in:
李鹏军 2024-03-21 10:53:44 +08:00
commit c795ab4f62
3 changed files with 15 additions and 2 deletions

View File

@ -4,6 +4,11 @@ namespace SJZY.Track.Application.Contract.Dtos.ProvideServices;
public class UpsertTrackInput : OrderNoInfo public class UpsertTrackInput : OrderNoInfo
{ {
/// <summary>
/// true新增,false更新
/// </summary>
public bool IsAdd { get; set; }
/// <summary> /// <summary>
/// 轨迹内容代码 /// 轨迹内容代码
/// </summary> /// </summary>

View File

@ -105,7 +105,7 @@ public class TrackUpsertEventHandler : ITransientDependency, ICapSubscribe
/// <param name="event"></param> /// <param name="event"></param>
private async Task<TrackDetailsIndex?> UpsertTrackAsync(TrackDetailsIndex? track, TrackUpsertEvent @event) private async Task<TrackDetailsIndex?> UpsertTrackAsync(TrackDetailsIndex? track, TrackUpsertEvent @event)
{ {
if (track == default) if (track == default && @event.IsAdd)
{ {
//todo:可以优化 //todo:可以优化
// 根据轨迹code在订单模板内容中寻找匹配的 // 根据轨迹code在订单模板内容中寻找匹配的
@ -137,8 +137,11 @@ public class TrackUpsertEventHandler : ITransientDependency, ICapSubscribe
CreateUser = CurrentUserRequest.CurrentUser.Name, CreateUser = CurrentUserRequest.CurrentUser.Name,
CreateTime = DateTime.Now CreateTime = DateTime.Now
}; };
track.ZeroTrackTime = track.TrackTime.Subtract(TimeSpan.FromHours(track.TrackTimeZone));
} }
else
if (track != default && !@event.IsAdd)
{ {
track.TrackPlace = @event.TrackPlace; track.TrackPlace = @event.TrackPlace;
track.TrackTime = @event.TrackTime!.Value; track.TrackTime = @event.TrackTime!.Value;

View File

@ -82,6 +82,11 @@ public class TrackDetailsIndex : IdBaseIndex
/// </summary> /// </summary>
public float TrackTimeZone { get; set; } public float TrackTimeZone { get; set; }
/// <summary>
/// 转化后的轨迹发生时间
/// </summary>
public DateTime ZeroTrackTime { get; set; }
/// <summary>是否可删</summary> /// <summary>是否可删</summary>
public bool IsCanDelete { get; set; } public bool IsCanDelete { get; set; }