From 8ac126917d0280df169ab59557e52d5dec1866d2 Mon Sep 17 00:00:00 2001 From: hardstylewyl <827778732@qq.com> Date: Mon, 16 Dec 2024 14:46:19 +0800 Subject: [PATCH] =?UTF-8?q?update:=20=E8=BD=A8=E8=BF=B9=E6=98=8E=E7=BB=86?= =?UTF-8?q?=EF=BC=8C=E6=96=B0=E5=A2=9E/=E4=BF=AE=E6=94=B9=E8=BD=A8?= =?UTF-8?q?=E8=BF=B9=E5=A2=9E=E5=8A=A0=E5=AD=97=E6=AE=B5=E3=80=90Extra?= =?UTF-8?q?=E3=80=91=E7=94=A8=E4=BA=8E=E5=AD=98=E5=82=A8=E9=9C=80=E8=A6=81?= =?UTF-8?q?=E6=8E=A8=E9=80=81=E7=9A=84=E6=89=A9=E5=B1=95=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=20update:=E8=BD=A8=E8=BF=B9=E6=98=8E=E7=BB=86=EF=BC=8C?= =?UTF-8?q?=E5=86=97=E4=BD=99=E8=BD=A8=E8=BF=B9=E7=8A=B6=E6=80=81Id?= =?UTF-8?q?=EF=BC=8C=E8=BD=A8=E8=BF=B9=E5=86=85=E5=AE=B9Id=EF=BC=8C?= =?UTF-8?q?=E4=BE=BF=E4=BA=8E=E5=90=8E=E7=BB=AD=E5=BF=AB=E9=80=9F=E7=B4=A2?= =?UTF-8?q?=E5=BC=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Dtos/ProvideServices/BatchUpsertTrackInput.cs | 5 +++++ .../Dtos/ProvideServices/GetTrackOutput.cs | 5 +++++ .../Dtos/ProvideServices/UpsertTrackInput.cs | 5 +++++ .../Events/TrackUpsertEvent.cs | 5 +++++ .../CAP/EventHandlers/TrackUpsertEventHandler.cs | 6 +++++- .../Rabbit/TrackRefreshEventHandler.cs | 3 +++ .../ProvideServices/TrackService.Query.cs | 3 ++- .../Services/ProvideServices/TrackService.cs | 7 ++++--- .../TrackDetailsAggregate/TrackDetailsIndex.cs | 15 +++++++++++++++ .../Dtos/TrackContents/TrackContentVO.cs | 5 +++++ .../Repositories/TrackContentRepository.cs | 1 + .../Repositories/TrackDetailsEsRepository.cs | 12 ++++++++---- 12 files changed, 63 insertions(+), 9 deletions(-) diff --git a/src/SJZY.Track.Application.Contract/Dtos/ProvideServices/BatchUpsertTrackInput.cs b/src/SJZY.Track.Application.Contract/Dtos/ProvideServices/BatchUpsertTrackInput.cs index b5a73ed3..a8ced808 100644 --- a/src/SJZY.Track.Application.Contract/Dtos/ProvideServices/BatchUpsertTrackInput.cs +++ b/src/SJZY.Track.Application.Contract/Dtos/ProvideServices/BatchUpsertTrackInput.cs @@ -119,4 +119,9 @@ public class BatchUpsertTrackInput : OrderNosInfo /// [Range(-12, 12)] public float? DestinationTimeZone { get; set; } + + /// + /// 扩展信息字段，用与轨迹推送的附加字段 + /// + public Dictionary? Extra { get; set; } } diff --git a/src/SJZY.Track.Application.Contract/Dtos/ProvideServices/GetTrackOutput.cs b/src/SJZY.Track.Application.Contract/Dtos/ProvideServices/GetTrackOutput.cs index 84c1ed15..7af8aabd 100644 --- a/src/SJZY.Track.Application.Contract/Dtos/ProvideServices/GetTrackOutput.cs +++ b/src/SJZY.Track.Application.Contract/Dtos/ProvideServices/GetTrackOutput.cs @@ -101,4 +101,9 @@ public class TrackDetail /// 目的地时区 /// public float? DestinationTimeZone { get; set; } + + /// + /// 扩展信息字段，用与轨迹推送的附加字段 + /// + public Dictionary? Extra { 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 2b34f832..22762d6c 100644 --- a/src/SJZY.Track.Application.Contract/Dtos/ProvideServices/UpsertTrackInput.cs +++ b/src/SJZY.Track.Application.Contract/Dtos/ProvideServices/UpsertTrackInput.cs @@ -123,4 +123,9 @@ public class UpsertTrackInput : OrderNoInfo /// 当前操作人 /// public int OptionUserId { get; set; } + + /// + /// 扩展信息字段，用与轨迹推送的附加字段 + /// + public Dictionary? Extra { get; set; } } diff --git a/src/SJZY.Track.Application.Contract/Events/TrackUpsertEvent.cs b/src/SJZY.Track.Application.Contract/Events/TrackUpsertEvent.cs index 4102df32..d08a1171 100644 --- a/src/SJZY.Track.Application.Contract/Events/TrackUpsertEvent.cs +++ b/src/SJZY.Track.Application.Contract/Events/TrackUpsertEvent.cs @@ -141,6 +141,11 @@ public class TrackUpsertEvent /// public float? DestinationTimeZone { get; set; } + /// + /// 扩展信息字段，用与轨迹推送的附加字段 + /// + public Dictionary? Extra { get; set; } + public override string ToString() { return diff --git a/src/SJZY.Track.Application/CAP/EventHandlers/TrackUpsertEventHandler.cs b/src/SJZY.Track.Application/CAP/EventHandlers/TrackUpsertEventHandler.cs index d2c39cd4..1b6ee76f 100644 --- a/src/SJZY.Track.Application/CAP/EventHandlers/TrackUpsertEventHandler.cs +++ b/src/SJZY.Track.Application/CAP/EventHandlers/TrackUpsertEventHandler.cs @@ -199,7 +199,7 @@ public class TrackUpsertEventHandler : ITransientDependency, ICapSubscribe return default; } - //#7001:未来潜在需求，当轨迹内容匹配预设，记录一个标记，保证下刷过程都是使用预设内衣 + //#7001:未来潜在需求，当轨迹内容匹配预设，记录一个标记，保证下刷过程都是使用预设内容 //虽然在引发事件之前做了判断，引发之后并不一定立即处理，在此过程中轨迹内容仍然可能被修改，所以要二次进行判断。 //通过来源指示是否为手动操作 var manualOperation = @event.Source == (int) TrackSourceEnum.Artificial; @@ -353,9 +353,11 @@ public class TrackUpsertEventHandler : ITransientDependency, ICapSubscribe CreateUser = @event.OperationMan ?? GlobalConst.SystemUser, CreateTime = DateTime.Now, //来源轨迹内容,第一次新增的时候使用轨迹内容表提供的 + TrackStatusId = trackContent.TrackStatusId, TrackStatus = trackContent.TrackStatus, TrackStatusCode = trackContent.TrackStatusCode, //跨子系统? + TrackContentId = trackContent.TrackContentId, TrackContent = @event.Content ?? trackContent.TrackContent, TrackEnContent = @event.EnStatus ?? trackContent.TrackEnContent, //S06新增轨迹明细字段 @@ -376,6 +378,7 @@ public class TrackUpsertEventHandler : ITransientDependency, ICapSubscribe TrackPlacePostcode = @event.TrackPlacePostcode ?? GlobalConst.EmptyString, DestinationTimeZone = @event.DestinationTimeZone, EstimatedDeliveryDate = @event.EstimatedDeliveryDate, + Extra = @event.Extra }; track.ZeroTrackTime = Math.Abs(track.TrackTimeZone - GlobalConst.NoneTrackTimeZone) < 1 @@ -432,6 +435,7 @@ public class TrackUpsertEventHandler : ITransientDependency, ICapSubscribe track.TrackPlacePostcode = @event.TrackPlacePostcode ?? GlobalConst.EmptyString; track.DestinationTimeZone = @event.DestinationTimeZone; track.EstimatedDeliveryDate = @event.EstimatedDeliveryDate; + track.Extra = @event.Extra; updateTracks.Add(track); diff --git a/src/SJZY.Track.Application/Rabbit/TrackRefreshEventHandler.cs b/src/SJZY.Track.Application/Rabbit/TrackRefreshEventHandler.cs index 36baaec7..14e80f79 100644 --- a/src/SJZY.Track.Application/Rabbit/TrackRefreshEventHandler.cs +++ b/src/SJZY.Track.Application/Rabbit/TrackRefreshEventHandler.cs @@ -300,8 +300,10 @@ public class TrackRefreshEventHandler : ITransientDependency, IRabbitHandler CreateUser = GlobalConst.SystemUser, CreateTime = DateTime.Now, //来源轨迹内容,第一次新增的时候使用轨迹内容表提供的 + TrackStatusId = GlobalConst.NotExistId, TrackStatus = GlobalConst.EmptyString, TrackStatusCode = GlobalConst.EmptyString, + TrackContentId = GlobalConst.NotExistId, TrackContent = GlobalConst.EmptyString, TrackEnContent = GlobalConst.EmptyString, //S06新增轨迹明细字段 @@ -318,6 +320,7 @@ public class TrackRefreshEventHandler : ITransientDependency, IRabbitHandler TrackPlacePostcode = null, DestinationTimeZone = null, EstimatedDeliveryDate = null, + Extra = null }; track.ZeroTrackTime = Math.Abs(track.TrackTimeZone - GlobalConst.NoneTrackTimeZone) < 1 diff --git a/src/SJZY.Track.Application/Services/ProvideServices/TrackService.Query.cs b/src/SJZY.Track.Application/Services/ProvideServices/TrackService.Query.cs index ab0bd27d..6e36fae2 100644 --- a/src/SJZY.Track.Application/Services/ProvideServices/TrackService.Query.cs +++ b/src/SJZY.Track.Application/Services/ProvideServices/TrackService.Query.cs @@ -79,7 +79,8 @@ public partial class TrackService TrackPlaceNationId = x.TrackPlaceNationId, TrackPlacePostcode = x.TrackPlacePostcode, DestinationTimeZone = x.DestinationTimeZone, - EstimatedDeliveryDate = x.EstimatedDeliveryDate + EstimatedDeliveryDate = x.EstimatedDeliveryDate, + Extra = x.Extra }).ToList(); res.Add(item); diff --git a/src/SJZY.Track.Application/Services/ProvideServices/TrackService.cs b/src/SJZY.Track.Application/Services/ProvideServices/TrackService.cs index ce81abd6..73fd6582 100644 --- a/src/SJZY.Track.Application/Services/ProvideServices/TrackService.cs +++ b/src/SJZY.Track.Application/Services/ProvideServices/TrackService.cs @@ -443,10 +443,10 @@ public partial class TrackService : ApplicationService, ITrackService { SubSystemId = input.SubSystemId, CustomId = group.Key, - OrderIdentifiers = group.Select(order => new OrderIdentifier + OrderIdentifiers = group.Select(o => new OrderIdentifier { - OrderId = order.Id, - OrderNo = order.OrderNo, + OrderId = o.Id, + OrderNo = o.OrderNo, OrderType = input.OrderType, }).ToArray(), IsAdd = input.IsAdd, @@ -472,6 +472,7 @@ public partial class TrackService : ApplicationService, ITrackService TrackPlacePostcode = input.TrackPlacePostcode, EstimatedDeliveryDate = input.EstimatedDeliveryDate, DestinationTimeZone = input.DestinationTimeZone, + Extra = input.Extra }; await _capPublisher.PublishAsync(GlobalConst.TrackUpsertSubscribe, @event); } diff --git a/src/SJZY.Track.Domain/Aggregates/TrackDetailsAggregate/TrackDetailsIndex.cs b/src/SJZY.Track.Domain/Aggregates/TrackDetailsAggregate/TrackDetailsIndex.cs index c842786b..60eed6a3 100644 --- a/src/SJZY.Track.Domain/Aggregates/TrackDetailsAggregate/TrackDetailsIndex.cs +++ b/src/SJZY.Track.Domain/Aggregates/TrackDetailsAggregate/TrackDetailsIndex.cs @@ -32,6 +32,11 @@ public class TrackDetailsIndex : IdBaseIndex /// public int OrderType { get; set; } + /// + /// 轨迹状态Id + /// + public int TrackStatusId { get; set; } = GlobalConst.NotExistId; + /// /// 轨迹状态 /// @@ -42,6 +47,11 @@ public class TrackDetailsIndex : IdBaseIndex /// public string TrackStatusCode { get; set; } = GlobalConst.EmptyString; + /// + /// 轨迹内容Id + /// + public int TrackContentId { get; set; } = GlobalConst.NotExistId; + /// /// 轨迹内容代码 /// @@ -176,4 +186,9 @@ public class TrackDetailsIndex : IdBaseIndex /// 签收地时区 /// public float? DestinationTimeZone { get; set; } + + /// + /// 扩展信息字段，用与轨迹推送的附加字段 + /// + public Dictionary? Extra { get; set; } } diff --git a/src/SJZY.Track.Domain/Dtos/TrackContents/TrackContentVO.cs b/src/SJZY.Track.Domain/Dtos/TrackContents/TrackContentVO.cs index 8b7cdf3f..07982ec1 100644 --- a/src/SJZY.Track.Domain/Dtos/TrackContents/TrackContentVO.cs +++ b/src/SJZY.Track.Domain/Dtos/TrackContents/TrackContentVO.cs @@ -17,6 +17,11 @@ public class TrackContentVO /// public string TrackStatus { get; set; } = null!; + /// + /// 轨迹内容Id + /// + public int TrackContentId { get; set; } + /// /// 轨迹内容 /// diff --git a/src/SJZY.Track.Repository/Repositories/TrackContentRepository.cs b/src/SJZY.Track.Repository/Repositories/TrackContentRepository.cs index d619613b..7db9435d 100644 --- a/src/SJZY.Track.Repository/Repositories/TrackContentRepository.cs +++ b/src/SJZY.Track.Repository/Repositories/TrackContentRepository.cs @@ -261,6 +261,7 @@ public class TrackContentRepository : BasicRepository, ITrac TrackStatusId = x.TrackStatusId, TrackStatus = y.Status, TrackStatusCode = y.Code, + TrackContentId = x.Id, TrackContent = x.Content, TrackContentCode = x.Code, TrackEnContent = x.EnContent, diff --git a/src/SJZY.Track.Repository/Repositories/TrackDetailsEsRepository.cs b/src/SJZY.Track.Repository/Repositories/TrackDetailsEsRepository.cs index 246cfa7e..e25c9b89 100644 --- a/src/SJZY.Track.Repository/Repositories/TrackDetailsEsRepository.cs +++ b/src/SJZY.Track.Repository/Repositories/TrackDetailsEsRepository.cs @@ -173,7 +173,8 @@ public class TrackDetailsEsRepository : ElasticSearchContextAbstract p .Add("trackPlace", track.TrackPlace) @@ -241,6 +242,7 @@ public class TrackDetailsEsRepository : ElasticSearchContextAbstract p .Add("trackPlace", track.TrackPlace) .Add("trackTime", track.TrackTime) @@ -314,8 +317,9 @@ public class TrackDetailsEsRepository : ElasticSearchContextAbstract