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

update: 使用UnifyResultDto包装，更新契约包至7.0.9

Browse Source
This commit is contained in:
hardstylewyl 2024-12-26 11:27:13 +08:00
parent 988ab384f9
commit 801b58bdee
3 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/SJZY.Track.Application.Contract/SJZY.Track.Application.Contract.csproj
View File

@ -5,7 +5,7 @@
<PropertyGroup> <PropertyGroup>
<TargetFramework>net7.0</TargetFramework> <TargetFramework>net7.0</TargetFramework>
<GenerateDocumentationFile>True</GenerateDocumentationFile> <GenerateDocumentationFile>True</GenerateDocumentationFile>
<Version>7.0.8</Version> <Version>7.0.9</Version>
<GenerateDocumentationFile>True</GenerateDocumentationFile> <GenerateDocumentationFile>True</GenerateDocumentationFile>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>

6
src/SJZY.Track.Application.Contract/Services/ProvideServices/ITrackPushService.cs
View File

@ -12,7 +12,7 @@ public interface ITrackPushService : IRemoteService
/// </summary> /// </summary>
/// <param name="input"></param> /// <param name="input"></param>
/// <returns></returns> /// <returns></returns>
public Task<string> PushTrackAsync(PushTrackInput input); public Task<UnifyResultDto> PushTrackAsync(PushTrackInput input);
/// <summary> /// <summary>
/// 获取轨迹推送内容 /// 获取轨迹推送内容
@ -20,12 +20,12 @@ public interface ITrackPushService : IRemoteService
/// <returns></returns> /// <returns></returns>
/// <param name="subSystemId">子系统id</param> /// <param name="subSystemId">子系统id</param>
/// <param name="customerId">客户id</param> /// <param name="customerId">客户id</param>
public Task<List<TrackPushContentDto>> GetTrackPushContentListAsync(int subSystemId, int customerId); public Task<UnifyResultDto<List<TrackPushContentDto>>> GetTrackPushContentListAsync(int subSystemId, int customerId);
/// <summary> /// <summary>
/// 获取轨迹推送记录 /// 获取轨迹推送记录
/// </summary> /// </summary>
/// <param name="input"></param> /// <param name="input"></param>
/// <returns></returns> /// <returns></returns>
public Task<List<TrackPushRecordOutput>> GetTrackPushRecordsAsync(OrderNoInfo input); public Task<UnifyResultDto<List<TrackPushRecordOutput>>> GetTrackPushRecordsAsync(OrderNoInfo input);
} }

13
src/SJZY.Track.Application/Services/ProvideServices/TrackPushService.cs
View File

@ -49,7 +49,7 @@ public class TrackPushService : ApplicationService, ITrackPushService
/// <returns></returns> /// <returns></returns>
[HttpPost("Track/Push")] [HttpPost("Track/Push")]
[CustomerResult] [CustomerResult]
public async Task<string> PushTrackAsync(PushTrackInput input) public async Task<UnifyResultDto> PushTrackAsync(PushTrackInput input)
{ {
input.OrderNos = input.OrderNos.Where(x => !x.IsNullOrWhiteSpace()).Distinct().ToList(); // 单号去重、去空 input.OrderNos = input.OrderNos.Where(x => !x.IsNullOrWhiteSpace()).Distinct().ToList(); // 单号去重、去空
@ -92,7 +92,7 @@ public class TrackPushService : ApplicationService, ITrackPushService
await _capPublisher.PublishAsync(GlobalConst.TrackManualPushSubscribe, trackPushEvent); await _capPublisher.PublishAsync(GlobalConst.TrackManualPushSubscribe, trackPushEvent);
} }
return $"即将推送轨迹代码{input.TrackCode}给{orders.Length}个订单"; return new UnifyResultDto(true,$"即将推送轨迹代码{input.TrackCode}给{orders.Length}个订单");
} }
@ -104,13 +104,13 @@ public class TrackPushService : ApplicationService, ITrackPushService
/// <returns></returns> /// <returns></returns>
[HttpGet("Track/GetTrackPushContentList")] [HttpGet("Track/GetTrackPushContentList")]
[CustomerResult] [CustomerResult]
public async Task<List<TrackPushContentDto>> GetTrackPushContentListAsync(int subSystemId, int customerId) public async Task<UnifyResultDto<List<TrackPushContentDto>>> GetTrackPushContentListAsync(int subSystemId, int customerId)
{ {
var list = await _trackPushConfigRepository.GetTrackPushContentListAsync(subSystemId, customerId); var list = await _trackPushConfigRepository.GetTrackPushContentListAsync(subSystemId, customerId);
var result = ObjectMapper.Map<List<GetTrackPushContentListVo>, List<TrackPushContentDto>>(list); var result = ObjectMapper.Map<List<GetTrackPushContentListVo>, List<TrackPushContentDto>>(list);
return result; return new UnifyResultDto<List<TrackPushContentDto>>(true, result, "操作成功");
} }
/// <summary> /// <summary>
@ -120,7 +120,7 @@ public class TrackPushService : ApplicationService, ITrackPushService
/// <param name="input"></param> /// <param name="input"></param>
[HttpGet("Track/GetTrackPushRecords")] [HttpGet("Track/GetTrackPushRecords")]
[CustomerResult] [CustomerResult]
public async Task<List<TrackPushRecordOutput>> GetTrackPushRecordsAsync([FromQuery] OrderNoInfo input) public async Task<UnifyResultDto<List<TrackPushRecordOutput>>> GetTrackPushRecordsAsync([FromQuery] OrderNoInfo input)
{ {
var orderId = await _orderRepository.GetFirstAsync(x => var orderId = await _orderRepository.GetFirstAsync(x =>
x.SubSystemId == input.SubSystemId && x.OrderType == input.OrderType && input.OrderNo == x.OrderNo, x.SubSystemId == input.SubSystemId && x.OrderType == input.OrderType && input.OrderNo == x.OrderNo,
@ -132,6 +132,7 @@ public class TrackPushService : ApplicationService, ITrackPushService
var records = await _trackPushRecordEsRepository.GetTrackPushRecordsAsync(orderId); var records = await _trackPushRecordEsRepository.GetTrackPushRecordsAsync(orderId);
return ObjectMapper.Map<List<TrackPushRecordIndex>, List<TrackPushRecordOutput>>(records); var res = ObjectMapper.Map<List<TrackPushRecordIndex>, List<TrackPushRecordOutput>>(records);
return new UnifyResultDto<List<TrackPushRecordOutput>>(true, res, "操作成功");
} }
} }