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

Merge branch 'S07' into test

Browse Source
This commit is contained in:
hardstylewyl 2025-04-24 10:07:58 +08:00
commit d2a02eaace
1 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -261,12 +261,20 @@ public class TrackContentService : ApplicationService
Data = ObjectMapper.Map<TrackDetailsIndex, GetContentDetailOutput>(content) Data = ObjectMapper.Map<TrackDetailsIndex, GetContentDetailOutput>(content)
}; };
if (res.Data != null && res.Data.Files?.Count > 0)
if (res.Data != default && res.Data.Files.Any())
{ {
var ossKeys = res.Data.Files
.Where(x => !string.IsNullOrWhiteSpace(x.OssKey))
.Select(x => x.OssKey)
.ToArray();
if (ossKeys.Length == 0) return res;
var ossKeyUrlDict = OSSHelper.GetUrlByKeys(ossKeys);
foreach (var item in res.Data.Files) foreach (var item in res.Data.Files)
{ {
item.Url = OSSHelper.GetUrlByKey(item.OssKey); if (string.IsNullOrWhiteSpace(item.OssKey)) continue;
item.Url = ossKeyUrlDict.GetValueOrDefault(item.OssKey)!;
} }
} }
@ -305,6 +313,7 @@ public class TrackContentService : ApplicationService
{ {
trackDetails = trackDetails.Where(m => m.Source != (int) TrackSourceEnum.ExternalServiceProvide).ToList(); trackDetails = trackDetails.Where(m => m.Source != (int) TrackSourceEnum.ExternalServiceProvide).ToList();
} }
//进行推送时，匹配订单类型一致的轨迹 //进行推送时，匹配订单类型一致的轨迹
if (input.TrackOptionType == TrackOptionType.推送) if (input.TrackOptionType == TrackOptionType.推送)
{ {
@ -312,8 +321,8 @@ public class TrackContentService : ApplicationService
//没有推送配置也不会展示任何下拉 //没有推送配置也不会展示任何下拉
if (pushConfigs == null || pushConfigs.Count == 0) return res; if (pushConfigs == null || pushConfigs.Count == 0) return res;
//选订单类型和配置订单类型一致的配置的轨迹代码 //选订单类型和配置订单类型一致的配置的轨迹代码
var trackCodes = pushConfigs.Where(m => m.OrderType == order.OrderType) var trackCodes = pushConfigs.Where(m => m.OrderType == order.OrderType)
.Select(x=>x.TrackCode) .Select(x => x.TrackCode)
.Distinct() .Distinct()
.ToHashSet(); .ToHashSet();
//根据配置过滤轨迹 //根据配置过滤轨迹