From ba78ba46ae8e921b64e1d9e44177ae9ed3ac0bac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E9=B9=8F=E5=86=9B?= <2357729423@qq.com> Date: Mon, 11 Mar 2024 10:19:06 +0800 Subject: [PATCH] =?UTF-8?q?change=20=E6=95=B4=E5=90=88=E8=BD=A8=E8=BF=B9?= =?UTF-8?q?=E6=9C=8D=E5=8A=A1=E3=80=81=E8=AE=A2=E5=8D=95=E6=9C=8D=E5=8A=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Services/IOrderService.cs | 14 ++++++++ .../Services/ITrackService.cs | 35 +++++++++++++++++++ ...derLinkService.cs => OrderService.Link.cs} | 18 +--------- .../Services/ProvideServices/OrderService.cs | 23 +++++------- ...PullService.cs => TrackPushPullService.cs} | 7 ++-- .../ProvideServices/TrackPushService.cs | 11 ------ ...kQueryService.cs => TrackService.Query.cs} | 23 +----------- .../Services/ProvideServices/TrackService.cs | 23 +++++------- 8 files changed, 71 insertions(+), 83 deletions(-) create mode 100644 src/SJZY.Track.Application.Contract/Services/ITrackService.cs rename src/SJZY.Track.Application/Services/ProvideServices/{OrderLinkService.cs => OrderService.Link.cs} (85%) rename src/SJZY.Track.Application/Services/ProvideServices/{TrackPullService.cs => TrackPushPullService.cs} (90%) delete mode 100644 src/SJZY.Track.Application/Services/ProvideServices/TrackPushService.cs rename src/SJZY.Track.Application/Services/ProvideServices/{TrackQueryService.cs => TrackService.Query.cs} (80%) diff --git a/src/SJZY.Track.Application.Contract/Services/IOrderService.cs b/src/SJZY.Track.Application.Contract/Services/IOrderService.cs index eb14b092..0dd34413 100644 --- a/src/SJZY.Track.Application.Contract/Services/IOrderService.cs +++ b/src/SJZY.Track.Application.Contract/Services/IOrderService.cs @@ -11,4 +11,18 @@ public interface IOrderService : IRemoteService /// /// Task UpsertAsync(UpsertOrderInput input); + + /// + /// 删除订单 + /// + /// + /// + Task DeleteOrderAsync(DeleteOrderInput input); + + /// + /// 关联订单 + /// + /// + /// + Task LinkOrderAsync(LinkOrderInput input); } \ No newline at end of file diff --git a/src/SJZY.Track.Application.Contract/Services/ITrackService.cs b/src/SJZY.Track.Application.Contract/Services/ITrackService.cs new file mode 100644 index 00000000..1b0ec5b5 --- /dev/null +++ b/src/SJZY.Track.Application.Contract/Services/ITrackService.cs @@ -0,0 +1,35 @@ +using SJZY.Track.Application.Contract.Dtos.ProvideServices; +using Volo.Abp; + +namespace SJZY.Track.Application.Contract.Services; + +public interface ITrackService : IRemoteService +{ + /// + /// 新增/更新订单轨迹接口 + /// + /// + /// + Task UpsertTrackAsync(UpsertTrackInput input); + + /// + /// 删除轨迹 + /// + /// + /// + Task DeleteTrackAsync(DeleteTrackInput input); + + /// + /// 批量删除轨迹 + /// + /// + /// + Task BatchDeleteTrackAsync(BatchDeleteTrackInput input); + + /// + /// 根据订单号获取轨迹 + /// + /// + /// + Task> QueryAsync(GetTrackInput input); +} \ No newline at end of file diff --git a/src/SJZY.Track.Application/Services/ProvideServices/OrderLinkService.cs b/src/SJZY.Track.Application/Services/ProvideServices/OrderService.Link.cs similarity index 85% rename from src/SJZY.Track.Application/Services/ProvideServices/OrderLinkService.cs rename to src/SJZY.Track.Application/Services/ProvideServices/OrderService.Link.cs index 56741efe..5c35b728 100644 --- a/src/SJZY.Track.Application/Services/ProvideServices/OrderLinkService.cs +++ b/src/SJZY.Track.Application/Services/ProvideServices/OrderService.Link.cs @@ -9,27 +9,11 @@ namespace SJZY.Track.Application.Services.ProvideServices; /// /// 订单关联服务 /// -[ApiExplorerSettings(GroupName = "提供接口")] -[Route("/ProviderService")] -public class OrderLinkService : ApplicationService +public partial class OrderService { - private readonly IOrderRepository _orderRepository; private readonly IBasicQuery _orderLinkQuery; private readonly ICapPublisher _capPublisher; - public OrderLinkService(IBasicQuery orderLinkQuery, IOrderRepository orderRepository, - ICapPublisher capPublisher) - { - _orderLinkQuery = orderLinkQuery; - _orderRepository = orderRepository; - _capPublisher = capPublisher; - } - - /// - /// 关联订单 - /// - /// - /// [HttpPost("Order/Link")] public async Task LinkOrderAsync(LinkOrderInput input) { diff --git a/src/SJZY.Track.Application/Services/ProvideServices/OrderService.cs b/src/SJZY.Track.Application/Services/ProvideServices/OrderService.cs index 3d639bb0..5c56337d 100644 --- a/src/SJZY.Track.Application/Services/ProvideServices/OrderService.cs +++ b/src/SJZY.Track.Application/Services/ProvideServices/OrderService.cs @@ -1,6 +1,8 @@ -using SJZY.Track.Application.Contract.Dtos.ProvideServices; +using DotNetCore.CAP; +using SJZY.Track.Application.Contract.Dtos.ProvideServices; using SJZY.Track.Application.Contract.Services; using SJZY.Track.Domain.Aggregates.OrderAggregate; +using SJZY.Track.Domain.Queries; using SJZY.UserCenter.HttpApi.Services; namespace SJZY.Track.Application.Services.ProvideServices; @@ -10,21 +12,18 @@ namespace SJZY.Track.Application.Services.ProvideServices; /// [ApiExplorerSettings(GroupName = "提供接口")] [Route("/ProviderService")] -public class OrderService : ApplicationService, IOrderService +public partial class OrderService : ApplicationService, IOrderService { private readonly IOrderRepository _orderRepository; - public OrderService(IOrderRepository orderRepository) + public OrderService(IOrderRepository orderRepository, IBasicQuery orderLinkQuery, + ICapPublisher capPublisher) { _orderRepository = orderRepository; + _capPublisher = capPublisher; + _orderLinkQuery = orderLinkQuery; } - /// - /// 创建订单，订单已存在则视为更新 - /// - /// - /// - /// [HttpPost("Order/Upsert")] public async Task UpsertAsync(UpsertOrderInput input) { @@ -46,12 +45,6 @@ public class OrderService : ApplicationService, IOrderService return "创建成功"; } - /// - /// 删除订单 - /// - /// - /// - /// [HttpPost("Order/Delete")] public async Task DeleteOrderAsync(DeleteOrderInput input) { diff --git a/src/SJZY.Track.Application/Services/ProvideServices/TrackPullService.cs b/src/SJZY.Track.Application/Services/ProvideServices/TrackPushPullService.cs similarity index 90% rename from src/SJZY.Track.Application/Services/ProvideServices/TrackPullService.cs rename to src/SJZY.Track.Application/Services/ProvideServices/TrackPushPullService.cs index 95a2d573..66625f36 100644 --- a/src/SJZY.Track.Application/Services/ProvideServices/TrackPullService.cs +++ b/src/SJZY.Track.Application/Services/ProvideServices/TrackPushPullService.cs @@ -8,16 +8,16 @@ using Volo.Abp.Http.Client.DynamicProxying; namespace SJZY.Track.Application.Services.ProvideServices; /// -/// 轨迹拉取服务 +/// 轨迹推送、拉取服务 /// [ApiExplorerSettings(GroupName = "提供接口")] [Route("/ProviderService")] -public class TrackPullService : ApplicationService +public class TrackPushPullService : ApplicationService { private readonly IOrderRepository _orderRepository; private readonly IHttpClientProxy _httpClientProxy; - public TrackPullService(IOrderRepository orderRepository, + public TrackPushPullService(IOrderRepository orderRepository, IHttpClientProxy httpClientProxy) { _orderRepository = orderRepository; @@ -49,6 +49,7 @@ public class TrackPullService : ApplicationService x.OrderNo }).ToList(); + // 批量获取轨迹 await _httpClientProxy.Service.BatchForwardThenPushToQueueAsync( "A012", group.Key.ServiceProviderCode, 42, data, GlobalConst.TrackRefreshSubscribe, JsonConvert.SerializeObject(group.Key)); diff --git a/src/SJZY.Track.Application/Services/ProvideServices/TrackPushService.cs b/src/SJZY.Track.Application/Services/ProvideServices/TrackPushService.cs deleted file mode 100644 index f2b5320f..00000000 --- a/src/SJZY.Track.Application/Services/ProvideServices/TrackPushService.cs +++ /dev/null @@ -1,11 +0,0 @@ -namespace SJZY.Track.Application.Services.ProvideServices; - -/// -/// 轨迹推送服务 -/// -[ApiExplorerSettings(GroupName = "提供接口")] -[Route("/ProviderService")] -public class TrackPushService: ApplicationService -{ - -} \ No newline at end of file diff --git a/src/SJZY.Track.Application/Services/ProvideServices/TrackQueryService.cs b/src/SJZY.Track.Application/Services/ProvideServices/TrackService.Query.cs similarity index 80% rename from src/SJZY.Track.Application/Services/ProvideServices/TrackQueryService.cs rename to src/SJZY.Track.Application/Services/ProvideServices/TrackService.Query.cs index 241d9030..372d3f01 100644 --- a/src/SJZY.Track.Application/Services/ProvideServices/TrackQueryService.cs +++ b/src/SJZY.Track.Application/Services/ProvideServices/TrackService.Query.cs @@ -1,36 +1,15 @@ using SJZY.Track.Application.Contract.Dtos.ProvideServices; -using SJZY.Track.Domain.Aggregates.OrderAggregate; using SJZY.Track.Domain.Aggregates.TrackDetailsAggregate; -using SJZY.Track.Domain.Queries; namespace SJZY.Track.Application.Services.ProvideServices; /// /// 轨迹查询服务 /// -[ApiExplorerSettings(GroupName = "提供接口")] -[Route("/ProviderService")] -public class TrackQueryService : ApplicationService +public partial class TrackService { private readonly ITrackDetailsRepository _trackDetailsRepository; - private readonly IOrderRepository _orderRepository; - private readonly IProvideQueries _provideQueries; - public TrackQueryService(ITrackDetailsRepository trackDetailsRepository, - IOrderRepository orderRepository, - IProvideQueries provideQueries) - { - _trackDetailsRepository = trackDetailsRepository; - _orderRepository = orderRepository; - _provideQueries = provideQueries; - } - - /// - /// 根据订单号获取轨迹 - /// - /// - /// - /// [HttpPost("Track/Query")] public async Task> QueryAsync(GetTrackInput input) { diff --git a/src/SJZY.Track.Application/Services/ProvideServices/TrackService.cs b/src/SJZY.Track.Application/Services/ProvideServices/TrackService.cs index 298cc2a4..7c84dbc3 100644 --- a/src/SJZY.Track.Application/Services/ProvideServices/TrackService.cs +++ b/src/SJZY.Track.Application/Services/ProvideServices/TrackService.cs @@ -1,7 +1,9 @@ using DotNetCore.CAP; using SJZY.Track.Application.Contract.Dtos.ProvideServices; using SJZY.Track.Application.Contract.Events; +using SJZY.Track.Application.Contract.Services; using SJZY.Track.Domain.Aggregates.OrderAggregate; +using SJZY.Track.Domain.Aggregates.TrackDetailsAggregate; using SJZY.Track.Domain.Queries; namespace SJZY.Track.Application.Services.ProvideServices; @@ -11,25 +13,22 @@ namespace SJZY.Track.Application.Services.ProvideServices; /// [ApiExplorerSettings(GroupName = "提供接口")] [Route("/ProviderService")] -public class TrackService : ApplicationService +public partial class TrackService : ApplicationService, ITrackService { private readonly IOrderRepository _orderRepository; private readonly IProvideQueries _provideQueries; private readonly ICapPublisher _capPublisher; - public TrackService(IOrderRepository orderRepository, IProvideQueries provideQueries, ICapPublisher capPublisher) + public TrackService(IOrderRepository orderRepository, IProvideQueries provideQueries, ICapPublisher capPublisher, + ITrackDetailsRepository trackDetailsRepository) { _orderRepository = orderRepository; _provideQueries = provideQueries; + _provideQueries = provideQueries; _capPublisher = capPublisher; + _trackDetailsRepository = trackDetailsRepository; } - /// - /// 新增/更新订单轨迹接口 - /// - /// - /// - /// [HttpPost("Track/Upsert")] public async Task UpsertTrackAsync(UpsertTrackInput input) { @@ -53,12 +52,6 @@ public class TrackService : ApplicationService return true; } - /// - /// 删除轨迹 - /// - /// - /// - /// [HttpPost("Track/Delete")] public async Task DeleteTrackAsync(DeleteTrackInput input) { @@ -97,7 +90,7 @@ public class TrackService : ApplicationService } [HttpPost("Track/BatchDelete")] - public async Task BatchTrackAsync(BatchDeleteTrackInput input) + public async Task BatchDeleteTrackAsync(BatchDeleteTrackInput input) { var orders = await _orderRepository.GetListAsync(x => x.OrderType == input.OrderType && input.OrderNos.Contains(x.OrderNo) && !x.IsPushCompleted