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

自测bug

Browse Source
This commit is contained in:
eli 2024-11-19 15:27:39 +08:00
parent 9c24b15c41
commit a8862a9104
1 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/SJZY.Track.Application/Services/TrackOrders/TrackOrderService.cs
View File

@ -192,9 +192,15 @@ public class TrackOrderService : ApplicationService
var system = await _orderRepository.GetSystemInfoById(input.CurrenUserSystemId); var system = await _orderRepository.GetSystemInfoById(input.CurrenUserSystemId);
if (system == null) if (system == null)
return new UnifyResultDto<List<GetDetailTimelineOutput>>(false, "未找到制定id的子系统"); return new UnifyResultDto<List<GetDetailTimelineOutput>>(false, "未找到指定id的子系统");
var trackStatus = await _trackStatusRepository.GetListAsync(m => m.SubSystemId == input.SystemId); var trackStatus = await _trackStatusRepository.GetListAsync(m => m.SubSystemId == input.SystemId);
if (trackStatus == null)
return new UnifyResultDto<List<GetDetailTimelineOutput>>(false, "未找到子系统下的任何轨迹状态");
var trackContent = await _trackContentRepository.GetListAsync(m => m.SubSystemId == input.SystemId);
if (trackContent == null)
return new UnifyResultDto<List<GetDetailTimelineOutput>>(false, "未找到子系统下的任何轨迹内容");
var trackDetails = await _trackDetailsEsRepository.GetListAsync(order.Id); var trackDetails = await _trackDetailsEsRepository.GetListAsync(order.Id);
res.Data = new List<GetDetailTimelineOutput>(); res.Data = new List<GetDetailTimelineOutput>();
@ -202,16 +208,16 @@ public class TrackOrderService : ApplicationService
foreach (var item in trackDetails) foreach (var item in trackDetails)
{ {
var currentTrackStatus = trackStatus.FirstOrDefault(m => m.Code == item.TrackStatusCode); var currentTrackStatus = trackStatus.FirstOrDefault(m => m.Code == item.TrackStatusCode);
var currentTrackContet = trackContent.FirstOrDefault(m => m.Code == item.TrackCode);
//如果是外部系统，且轨迹内容不对外则跳过这条轨迹内容
if (system.SystemProperty == 2 && !item.IsVisibility)
continue;
//是否完结 //是否完结
if (!isCompleted) if (!isCompleted)
isCompleted = currentTrackStatus is { IsCompleted: true }; isCompleted = currentTrackStatus is { IsCompleted: true };
//如果是外部系统，且轨迹内容不对外则跳过这条轨迹内容
if (system.SystemProperty == 2 && currentTrackContet != null && !currentTrackContet.IsExternal)
continue;
res.Data.Add(new GetDetailTimelineOutput() res.Data.Add(new GetDetailTimelineOutput()
{ {
IsHighlight = true, IsHighlight = true,