diff --git a/src/SJZY.Track.Application.Contract/SJZY.Track.Application.Contract.csproj b/src/SJZY.Track.Application.Contract/SJZY.Track.Application.Contract.csproj
index 7645500b..1912b1d1 100644
--- a/src/SJZY.Track.Application.Contract/SJZY.Track.Application.Contract.csproj
+++ b/src/SJZY.Track.Application.Contract/SJZY.Track.Application.Contract.csproj
@@ -5,7 +5,7 @@
net7.0
True
- 7.0.8
+ 7.0.9
True
diff --git a/src/SJZY.Track.Application.Contract/Services/ProvideServices/ITrackPushService.cs b/src/SJZY.Track.Application.Contract/Services/ProvideServices/ITrackPushService.cs
index 4ddeb81d..b7029aa6 100644
--- a/src/SJZY.Track.Application.Contract/Services/ProvideServices/ITrackPushService.cs
+++ b/src/SJZY.Track.Application.Contract/Services/ProvideServices/ITrackPushService.cs
@@ -12,7 +12,7 @@ public interface ITrackPushService : IRemoteService
///
///
///
- public Task PushTrackAsync(PushTrackInput input);
+ public Task PushTrackAsync(PushTrackInput input);
///
/// 获取轨迹推送内容
@@ -20,12 +20,12 @@ public interface ITrackPushService : IRemoteService
///
/// 子系统id
/// 客户id
- public Task> GetTrackPushContentListAsync(int subSystemId, int customerId);
+ public Task>> GetTrackPushContentListAsync(int subSystemId, int customerId);
///
/// 获取轨迹推送记录
///
///
///
- public Task> GetTrackPushRecordsAsync(OrderNoInfo input);
+ public Task>> GetTrackPushRecordsAsync(OrderNoInfo input);
}
diff --git a/src/SJZY.Track.Application/Services/ProvideServices/TrackPushService.cs b/src/SJZY.Track.Application/Services/ProvideServices/TrackPushService.cs
index 49000107..ce902649 100644
--- a/src/SJZY.Track.Application/Services/ProvideServices/TrackPushService.cs
+++ b/src/SJZY.Track.Application/Services/ProvideServices/TrackPushService.cs
@@ -49,7 +49,7 @@ public class TrackPushService : ApplicationService, ITrackPushService
///
[HttpPost("Track/Push")]
[CustomerResult]
- public async Task PushTrackAsync(PushTrackInput input)
+ public async Task PushTrackAsync(PushTrackInput input)
{
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);
}
- return $"即将推送轨迹代码{input.TrackCode}给{orders.Length}个订单";
+ return new UnifyResultDto(true,$"即将推送轨迹代码{input.TrackCode}给{orders.Length}个订单");
}
@@ -104,13 +104,13 @@ public class TrackPushService : ApplicationService, ITrackPushService
///
[HttpGet("Track/GetTrackPushContentList")]
[CustomerResult]
- public async Task> GetTrackPushContentListAsync(int subSystemId, int customerId)
+ public async Task>> GetTrackPushContentListAsync(int subSystemId, int customerId)
{
var list = await _trackPushConfigRepository.GetTrackPushContentListAsync(subSystemId, customerId);
var result = ObjectMapper.Map, List>(list);
- return result;
+ return new UnifyResultDto>(true, result, "操作成功");
}
///
@@ -120,7 +120,7 @@ public class TrackPushService : ApplicationService, ITrackPushService
///
[HttpGet("Track/GetTrackPushRecords")]
[CustomerResult]
- public async Task> GetTrackPushRecordsAsync([FromQuery] OrderNoInfo input)
+ public async Task>> GetTrackPushRecordsAsync([FromQuery] OrderNoInfo input)
{
var orderId = await _orderRepository.GetFirstAsync(x =>
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);
- return ObjectMapper.Map, List>(records);
+ var res = ObjectMapper.Map, List>(records);
+ return new UnifyResultDto>(true, res, "操作成功");
}
}