From 55d7115b384334fe0d0f8992bbd6738d3b386e10 Mon Sep 17 00:00:00 2001 From: moyongzhen <2534173414@qq.com> Date: Tue, 19 Mar 2024 14:52:09 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E5=8F=AF=E8=83=BD=E8=AD=A6=E5=91=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../TrackContents/TrackContentService.cs | 26 +++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/src/SJZY.Track.Application/Services/TrackContents/TrackContentService.cs b/src/SJZY.Track.Application/Services/TrackContents/TrackContentService.cs index f4946435..90795551 100644 --- a/src/SJZY.Track.Application/Services/TrackContents/TrackContentService.cs +++ b/src/SJZY.Track.Application/Services/TrackContents/TrackContentService.cs @@ -64,7 +64,7 @@ namespace SJZY.Track.Application.Services.TrackContents var detailInfo = await _trackContentRepository.GetDetailAsync(id); if (detailInfo == null) { - return new UnifyResultDto(false, null, "未查询到轨迹状态"); + return new UnifyResultDto(false, null!, "未查询到轨迹状态"); } var dto = ObjectMapper.Map(detailInfo); @@ -101,18 +101,18 @@ namespace SJZY.Track.Application.Services.TrackContents if (trackContentEntitys.Any()) { //throw new BusinessException(message: _stringLocalizer["TrackContentExist"]); - var codes = trackContentEntitys.FirstOrDefault(a => a.Code==input.Code); - if (codes!=null) + var codes = trackContentEntitys.FirstOrDefault(a => a.Code == input.Code); + if (codes != null) { throw new BusinessException(message: "该子系统下轨迹代码已存在"); } - var contents = trackContentEntitys.FirstOrDefault(a => a.Content==input.Content); - if (contents!=null) + var contents = trackContentEntitys.FirstOrDefault(a => a.Content == input.Content); + if (contents != null) { throw new BusinessException(message: "该子系统下轨迹内容已存在"); } - var contentEns = trackContentEntitys.FirstOrDefault(a => a.EnContent==input.EnContent); - if (contentEns!=null) + var contentEns = trackContentEntitys.FirstOrDefault(a => a.EnContent == input.EnContent); + if (contentEns != null) { throw new BusinessException(message: "该子系统下轨迹内容英文已存在"); } @@ -138,18 +138,18 @@ namespace SJZY.Track.Application.Services.TrackContents { //throw new BusinessException(message: _stringLocalizer["TrackContentExist"]); //throw new BusinessException(message: "当前子系统下，轨迹代码或轨迹内容或轨迹内容英文存在"); - var codes = trackContentEntitys.FirstOrDefault(a => a.Code==input.Code); - if (codes!=null) + var codes = trackContentEntitys.FirstOrDefault(a => a.Code == input.Code); + if (codes != null) { throw new BusinessException(message: "该子系统下轨迹代码已存在"); } - var contents = trackContentEntitys.FirstOrDefault(a => a.Content==input.Content); - if (contents!=null) + var contents = trackContentEntitys.FirstOrDefault(a => a.Content == input.Content); + if (contents != null) { throw new BusinessException(message: "该子系统下轨迹内容已存在"); } - var contentEns = trackContentEntitys.FirstOrDefault(a => a.EnContent==input.EnContent); - if (contentEns!=null) + var contentEns = trackContentEntitys.FirstOrDefault(a => a.EnContent == input.EnContent); + if (contentEns != null) { throw new BusinessException(message: "该子系统下轨迹内容英文已存在"); } From 8f1da65c5a684591c92357713f273a02af0f4d22 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E9=B9=8F=E5=86=9B?= <2357729423@qq.com> Date: Tue, 19 Mar 2024 14:58:53 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E6=B5=8B=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/SJZY.Track.Domain/Consts/GlobalConst.MQ.cs | 4 ++-- .../Repositories/TrackDetailsRepository.cs | 13 +++++++------ 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/src/SJZY.Track.Domain/Consts/GlobalConst.MQ.cs b/src/SJZY.Track.Domain/Consts/GlobalConst.MQ.cs index 2685b8b0..b6d27ceb 100644 --- a/src/SJZY.Track.Domain/Consts/GlobalConst.MQ.cs +++ b/src/SJZY.Track.Domain/Consts/GlobalConst.MQ.cs @@ -23,9 +23,9 @@ public partial class GlobalConst public const string TrackPushSubscribe = "SJZY.Track.TrackPush"; /// - /// 轨迹新增/更新后触发更新订单主表 + /// 轨迹新增/更新/删除后触发更新订单主表 /// - public const string TrackChangeAfterUpdateOrderSubscribe = "SJZY.Track.TrackUpsertAfterUpdateOrder"; + public const string TrackChangeAfterUpdateOrderSubscribe = "SJZY.Track.TrackChangeAfterUpdateOrder"; /// /// 轨迹推送后触发更新订单主表 diff --git a/src/SJZY.Track.Repository/Repositories/TrackDetailsRepository.cs b/src/SJZY.Track.Repository/Repositories/TrackDetailsRepository.cs index 06288928..b3a0b2c6 100644 --- a/src/SJZY.Track.Repository/Repositories/TrackDetailsRepository.cs +++ b/src/SJZY.Track.Repository/Repositories/TrackDetailsRepository.cs @@ -160,12 +160,13 @@ internal class TrackDetailsRepository : ElasticSearchContextAbstract DeleteTrackAsync(int orderId, List trackCodes) { var r = await Context.DeleteByQueryAsync(x => x - .Query( - q => - q.Term(t => t.OrderId, orderId) - && q.Term(t => t.IsCanDelete, true) - && q.Terms(t => t.Field(f => f.TrackCode.Suffix("keyword")).Terms(trackCodes))) - .WaitForCompletion() + .Query( + q => + q.Term(t => t.OrderId, orderId) + && q.Term(t => t.IsCanDelete, true) + && q.Terms(t => t.Field(f => f.TrackCode.Suffix("keyword")).Terms(trackCodes))) + .WaitForActiveShards("all") + //.Refresh(Refresh.True) // 可选：立即刷新索引使更改立即可见 ); if (!r.IsValid)