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

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

Browse Source
This commit is contained in:
李鹏军 2024-03-19 14:59:40 +08:00
commit 0d3581a6e1
3 changed files with 22 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/SJZY.Track.Application/Services/TrackContents/TrackContentService.cs
View File

@ -64,7 +64,7 @@ namespace SJZY.Track.Application.Services.TrackContents
var detailInfo = await _trackContentRepository.GetDetailAsync(id); var detailInfo = await _trackContentRepository.GetDetailAsync(id);
if (detailInfo == null) if (detailInfo == null)
{ {
return new UnifyResultDto<GetTrackContentDetailDto>(false, null, "未查询到轨迹状态"); return new UnifyResultDto<GetTrackContentDetailDto>(false, null!, "未查询到轨迹状态");
} }
var dto = ObjectMapper.Map<GetTrackContentDetailVO, GetTrackContentDetailDto>(detailInfo); var dto = ObjectMapper.Map<GetTrackContentDetailVO, GetTrackContentDetailDto>(detailInfo);
@ -101,18 +101,18 @@ namespace SJZY.Track.Application.Services.TrackContents
if (trackContentEntitys.Any()) if (trackContentEntitys.Any())
{ {
//throw new BusinessException(message: _stringLocalizer["TrackContentExist"]); //throw new BusinessException(message: _stringLocalizer["TrackContentExist"]);
var codes = trackContentEntitys.FirstOrDefault(a => a.Code==input.Code); var codes = trackContentEntitys.FirstOrDefault(a => a.Code == input.Code);
if (codes!=null) if (codes != null)
{ {
throw new BusinessException(message: "该子系统下轨迹代码已存在"); throw new BusinessException(message: "该子系统下轨迹代码已存在");
} }
var contents = trackContentEntitys.FirstOrDefault(a => a.Content==input.Content); var contents = trackContentEntitys.FirstOrDefault(a => a.Content == input.Content);
if (contents!=null) if (contents != null)
{ {
throw new BusinessException(message: "该子系统下轨迹内容已存在"); throw new BusinessException(message: "该子系统下轨迹内容已存在");
} }
var contentEns = trackContentEntitys.FirstOrDefault(a => a.EnContent==input.EnContent); var contentEns = trackContentEntitys.FirstOrDefault(a => a.EnContent == input.EnContent);
if (contentEns!=null) if (contentEns != null)
{ {
throw new BusinessException(message: "该子系统下轨迹内容英文已存在"); throw new BusinessException(message: "该子系统下轨迹内容英文已存在");
} }
@ -138,18 +138,18 @@ namespace SJZY.Track.Application.Services.TrackContents
{ {
//throw new BusinessException(message: _stringLocalizer["TrackContentExist"]); //throw new BusinessException(message: _stringLocalizer["TrackContentExist"]);
//throw new BusinessException(message: "当前子系统下，轨迹代码或轨迹内容或轨迹内容英文存在"); //throw new BusinessException(message: "当前子系统下，轨迹代码或轨迹内容或轨迹内容英文存在");
var codes = trackContentEntitys.FirstOrDefault(a => a.Code==input.Code); var codes = trackContentEntitys.FirstOrDefault(a => a.Code == input.Code);
if (codes!=null) if (codes != null)
{ {
throw new BusinessException(message: "该子系统下轨迹代码已存在"); throw new BusinessException(message: "该子系统下轨迹代码已存在");
} }
var contents = trackContentEntitys.FirstOrDefault(a => a.Content==input.Content); var contents = trackContentEntitys.FirstOrDefault(a => a.Content == input.Content);
if (contents!=null) if (contents != null)
{ {
throw new BusinessException(message: "该子系统下轨迹内容已存在"); throw new BusinessException(message: "该子系统下轨迹内容已存在");
} }
var contentEns = trackContentEntitys.FirstOrDefault(a => a.EnContent==input.EnContent); var contentEns = trackContentEntitys.FirstOrDefault(a => a.EnContent == input.EnContent);
if (contentEns!=null) if (contentEns != null)
{ {
throw new BusinessException(message: "该子系统下轨迹内容英文已存在"); throw new BusinessException(message: "该子系统下轨迹内容英文已存在");
} }

4
src/SJZY.Track.Domain/Consts/GlobalConst.MQ.cs
View File

@ -23,9 +23,9 @@ public partial class GlobalConst
public const string TrackPushSubscribe = "SJZY.Track.TrackPush"; public const string TrackPushSubscribe = "SJZY.Track.TrackPush";
/// <summary> /// <summary>
/// 轨迹新增/更新后触发更新订单主表 /// 轨迹新增/更新/删除后触发更新订单主表
/// </summary> /// </summary>
public const string TrackChangeAfterUpdateOrderSubscribe = "SJZY.Track.TrackUpsertAfterUpdateOrder"; public const string TrackChangeAfterUpdateOrderSubscribe = "SJZY.Track.TrackChangeAfterUpdateOrder";
/// <summary> /// <summary>
/// 轨迹推送后触发更新订单主表 /// 轨迹推送后触发更新订单主表

3
src/SJZY.Track.Repository/Repositories/TrackDetailsRepository.cs
View File

@ -165,7 +165,8 @@ internal class TrackDetailsRepository : ElasticSearchContextAbstract<TrackDetail
q.Term(t => t.OrderId, orderId) q.Term(t => t.OrderId, orderId)
&& q.Term(t => t.IsCanDelete, true) && q.Term(t => t.IsCanDelete, true)
&& q.Terms(t => t.Field(f => f.TrackCode.Suffix("keyword")).Terms(trackCodes))) && q.Terms(t => t.Field(f => f.TrackCode.Suffix("keyword")).Terms(trackCodes)))
.WaitForCompletion() .WaitForActiveShards("all")
//.Refresh(Refresh.True) // 可选：立即刷新索引使更改立即可见
); );
if (!r.IsValid) if (!r.IsValid)