From 0b65128051e8685995a8a9f6d012a5ee0fd83024 Mon Sep 17 00:00:00 2001 From: xiaolipro <2357729423@qq.com> Date: Fri, 6 Sep 2024 15:28:08 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E4=BC=98=E5=8C=96=E8=AE=A2=E5=8D=95?= =?UTF-8?q?=E7=9A=84=E5=AE=8C=E7=BB=93=E5=88=A4=E6=96=AD=E9=80=BB=E8=BE=91?= =?UTF-8?q?=E3=80=91=20https://www.tapd.cn/60863849/prong/stories/view/116?= =?UTF-8?q?0863849001026850?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Dtos/TrackPull/TrackPullContentConfigDto.cs | 5 ----- .../Events/TrackChangeAfterUpdateOrderEvent.cs | 2 +- .../Events/TrackRefreshStruct.cs | 6 ------ .../CAP/EventHandlers/TrackUpsertEventHandler.cs | 4 +--- .../Rabbit/TrackRefreshEventHandler.cs | 1 - src/SJZY.Track.Domain/Dtos/TrackContents/TrackContentVO.cs | 5 +++++ src/SJZY.Track.Repository/Queries/ProvideQueries.cs | 3 ++- 7 files changed, 9 insertions(+), 17 deletions(-) diff --git a/src/SJZY.Track.Application.Contract/Dtos/TrackPull/TrackPullContentConfigDto.cs b/src/SJZY.Track.Application.Contract/Dtos/TrackPull/TrackPullContentConfigDto.cs index 23b35664..2dbdf4d2 100644 --- a/src/SJZY.Track.Application.Contract/Dtos/TrackPull/TrackPullContentConfigDto.cs +++ b/src/SJZY.Track.Application.Contract/Dtos/TrackPull/TrackPullContentConfigDto.cs @@ -7,11 +7,6 @@ public class TrackPullContentConfigDto /// public string TrackContentCode { get; set; } = null!; - /// - /// 是否完结 - /// - public bool IsCompleted { get; set; } - /// /// 服务商轨迹状态参数值 /// diff --git a/src/SJZY.Track.Application.Contract/Events/TrackChangeAfterUpdateOrderEvent.cs b/src/SJZY.Track.Application.Contract/Events/TrackChangeAfterUpdateOrderEvent.cs index 7c419440..0fa89c4b 100644 --- a/src/SJZY.Track.Application.Contract/Events/TrackChangeAfterUpdateOrderEvent.cs +++ b/src/SJZY.Track.Application.Contract/Events/TrackChangeAfterUpdateOrderEvent.cs @@ -18,7 +18,7 @@ public class TrackChangeAfterUpdateOrderEvent public int[] OrderIds { get; set; } = null!; /// - /// 这条轨迹是否意味着完成（只有刷新会设为true） + /// 这条轨迹是否意味着订单已完成 /// public bool IsCompleted { get; set; } diff --git a/src/SJZY.Track.Application.Contract/Events/TrackRefreshStruct.cs b/src/SJZY.Track.Application.Contract/Events/TrackRefreshStruct.cs index a03f117e..bc3ef03a 100644 --- a/src/SJZY.Track.Application.Contract/Events/TrackRefreshStruct.cs +++ b/src/SJZY.Track.Application.Contract/Events/TrackRefreshStruct.cs @@ -16,10 +16,4 @@ public struct TrackRefreshStruct /// 原轨迹报文hash（刷新轨迹重复性校验使用） /// public string? OriginTrackDataHash { get; set; } - - /// - /// 表示订单是否完成（只由轨迹刷新配置决定） - /// todo：能够使得IsCompleted为true的点，全局只有一个：轨迹刷新？？ - /// - public bool IsCompleted { get; set; } } diff --git a/src/SJZY.Track.Application/CAP/EventHandlers/TrackUpsertEventHandler.cs b/src/SJZY.Track.Application/CAP/EventHandlers/TrackUpsertEventHandler.cs index af36c318..7f360ea0 100644 --- a/src/SJZY.Track.Application/CAP/EventHandlers/TrackUpsertEventHandler.cs +++ b/src/SJZY.Track.Application/CAP/EventHandlers/TrackUpsertEventHandler.cs @@ -64,8 +64,6 @@ public class TrackUpsertEventHandler : ITransientDependency, ICapSubscribe ServiceProviderName = @event.TrackRefreshData.ServiceProviderName, OriginTrackContent = @event.TrackRefreshData.OriginTrackContent, OriginTrackDataHash = @event.TrackRefreshData.OriginTrackDataHash, - // tips：一定要重置为false，父级订单的完成不会使得关联订单完成，关联单也必须由刷新来完成或手动设置完成！！ - IsCompleted = false }; // 不同子系统需要做内容映射 @@ -187,7 +185,7 @@ public class TrackUpsertEventHandler : ITransientDependency, ICapSubscribe SubSystemId = @event.SubSystemId, CustomId = @event.CustomId, OrderIds = canNextOrderIds.ToArray(), - IsCompleted = @event.TrackRefreshData.IsCompleted, + IsCompleted = trackContent.IsCompleted, TrackContent = trackContent.TrackContent, TrackEnContent = trackContent.TrackEnContent, TrackStatusId = trackContent.TrackStatusId, diff --git a/src/SJZY.Track.Application/Rabbit/TrackRefreshEventHandler.cs b/src/SJZY.Track.Application/Rabbit/TrackRefreshEventHandler.cs index 1849e488..77ef8e6e 100644 --- a/src/SJZY.Track.Application/Rabbit/TrackRefreshEventHandler.cs +++ b/src/SJZY.Track.Application/Rabbit/TrackRefreshEventHandler.cs @@ -252,7 +252,6 @@ public class TrackRefreshEventHandler : ITransientDependency, IRabbitHandler { ServiceProviderName = context.ServiceProviderName, OriginTrackDataHash = originTrackDataHash, - IsCompleted = matchedContentConfig.IsCompleted, OriginTrackContent = paramConfig.TrackContentName != null ? trackToken[paramConfig.TrackContentName]?.Value() : GlobalConst.EmptyString diff --git a/src/SJZY.Track.Domain/Dtos/TrackContents/TrackContentVO.cs b/src/SJZY.Track.Domain/Dtos/TrackContents/TrackContentVO.cs index f91e7e7f..cbea2602 100644 --- a/src/SJZY.Track.Domain/Dtos/TrackContents/TrackContentVO.cs +++ b/src/SJZY.Track.Domain/Dtos/TrackContents/TrackContentVO.cs @@ -21,4 +21,9 @@ public class TrackContentVO /// 轨迹内容英文 /// public string TrackEnContent { get; set; } = null!; + + /// + /// 是否完成态 + /// + public bool IsCompleted { get; set; } } diff --git a/src/SJZY.Track.Repository/Queries/ProvideQueries.cs b/src/SJZY.Track.Repository/Queries/ProvideQueries.cs index a06b71e2..05d41256 100644 --- a/src/SJZY.Track.Repository/Queries/ProvideQueries.cs +++ b/src/SJZY.Track.Repository/Queries/ProvideQueries.cs @@ -83,7 +83,8 @@ public class ProvideQueries : ISugarRepository, IProvideQueries, TrackStatusId = x.TrackStatusId, TrackStatus = y.Status, TrackContent = x.Content, - TrackEnContent = x.EnContent + TrackEnContent = x.EnContent, + IsCompleted = y.IsCompleted }) .FirstAsync(); }