diff --git a/src/SJZY.Track.Application/ApplicationModule.cs b/src/SJZY.Track.Application/ApplicationModule.cs index 899bceee..ba3bc813 100644 --- a/src/SJZY.Track.Application/ApplicationModule.cs +++ b/src/SJZY.Track.Application/ApplicationModule.cs @@ -1,6 +1,5 @@ using SJZY.Expand.ABP.Core.Localization; using SJZY.Track.Application.Localization; -using SJZY.Track.Domain; using SJZY.UserCenter.Contracts; using SJZY.UserCenter.SharedModel; using Volo.Abp.AspNetCore.Mvc; @@ -26,14 +25,11 @@ namespace SJZY.Track.Application public override void ConfigureServices(ServiceConfigurationContext context) { var configuration = context.Services.GetConfiguration(); - Configure(options => - { - options.AddMaps(true); - }); + Configure(options => { options.AddMaps(true); }); Configure(options => { - options.ConventionalControllers.Create(typeof(ApplicationModule).Assembly);//创建动态api + options.ConventionalControllers.Create(typeof(ApplicationModule).Assembly); //创建动态api }); //添加虚拟文件系统 @@ -60,7 +56,6 @@ namespace SJZY.Track.Application var configuration = context.Services.GetConfiguration(); PreConfigure(options => { - options.ProxyClientActions.Add(async (remoteName, serviceProvider, httpClient) => { //如果设置Token,前端需要传入Token 否则引发异常 @@ -70,6 +65,5 @@ namespace SJZY.Track.Application }); }); } - } -} +} \ No newline at end of file diff --git a/src/SJZY.Track.Application/GlobalUsings.cs b/src/SJZY.Track.Application/GlobalUsings.cs new file mode 100644 index 00000000..63eef9f8 --- /dev/null +++ b/src/SJZY.Track.Application/GlobalUsings.cs @@ -0,0 +1,3 @@ +// Global using directives + +global using SJZY.Track.Domain; \ No newline at end of file diff --git a/src/SJZY.Track.Application/Services/ProvideServices/OrderLinkService.cs b/src/SJZY.Track.Application/Services/ProvideServices/OrderLinkService.cs new file mode 100644 index 00000000..f729f6b1 --- /dev/null +++ b/src/SJZY.Track.Application/Services/ProvideServices/OrderLinkService.cs @@ -0,0 +1,84 @@ +using SJZY.Track.Application.Dtos.ProvideServices; +using SJZY.Track.Domain.Aggregates.OrderAggregate; + +namespace SJZY.Track.Application.Services.ProvideServices; + +/// +/// 订单关联服务 +/// +[ApiExplorerSettings(GroupName = "提供接口")] +public class OrderLinkService +{ + private readonly IOrderRepository _orderRepository; + private readonly IBasicQuery _orderLinkQuery; + + public OrderLinkService(IBasicQuery orderLinkQuery, IOrderRepository orderRepository) + { + _orderLinkQuery = orderLinkQuery; + _orderRepository = orderRepository; + } + + /// + /// 关联订单 + /// + /// + /// + [HttpPost("Order/Link")] + public async Task LinkOrderAsync(LinkOrderInput input) + { + if (!await _orderRepository.IsAnyAsync(x => x.OrderType == input.OrderType && x.OrderNo == input.OrderNo)) + { + throw new BusinessException(message: $"单号:{input.OrderNo}不存在"); + } + + if (input.LinkOrderNos.Count < 1 || input.LinkOrderType == 0) return true; + + // 单号去重 + input.LinkOrderNos = input.LinkOrderNos.Distinct().ToList(); + + // 解绑 + if (!input.IsLink) return await UnLinkOrderAsync(input); + + // 关联订单 + return await DoLinkOrderAsync(input); + } + + private async Task DoLinkOrderAsync(LinkOrderInput input) + { + // 获取已关联的订单 + var linkOrderNos = await _orderLinkQuery.GetListAsync(x => + x.OrderType == input.OrderType && x.OrderNo == input.OrderNo && x.LinkOrderType == input.LinkOrderType, + x => x.LinkOrderNo); + + // 计算出未关联的订单 + var noLinkOrderNos = input.LinkOrderNos.Except(linkOrderNos); + + // 过滤掉不存在的订单 + var canLinkOrderNos = await _orderRepository.GetListAsync(x => + x.OrderType == input.LinkOrderType && noLinkOrderNos.Contains(x.OrderNo), + x => x.OrderNo); + + await _orderRepository.LinkOrderAsync(canLinkOrderNos.Select(x => new OrderLinkEntity + { + OrderNo = input.OrderNo, + OrderType = input.OrderType, + LinkOrderNo = x, + LinkOrderType = input.LinkOrderType + }).ToList()); + + return true; + } + + private async Task UnLinkOrderAsync(LinkOrderInput input) + { + var unLinkIds = await _orderLinkQuery.GetListAsync(x => + x.OrderType == input.OrderType && x.OrderNo == input.OrderNo && + x.LinkOrderType == input.LinkOrderType && input.LinkOrderNos.Contains(x.LinkOrderNo), + x => x.Id); + + // real del + await _orderRepository.UnLinkByIdsAsync(unLinkIds); + + return true; + } +} \ No newline at end of file diff --git a/src/SJZY.Track.Application/Services/ProvideServices/OrderService.cs b/src/SJZY.Track.Application/Services/ProvideServices/OrderService.cs index 4ebfcc66..e40ed43e 100644 --- a/src/SJZY.Track.Application/Services/ProvideServices/OrderService.cs +++ b/src/SJZY.Track.Application/Services/ProvideServices/OrderService.cs @@ -1,6 +1,5 @@ using Newtonsoft.Json; using SJZY.Track.Application.Dtos.ProvideServices; -using SJZY.Track.Domain; using SJZY.Track.Domain.Aggregates.OrderAggregate; using SJZY.UserCenter.HttpApi.Services; @@ -13,12 +12,10 @@ namespace SJZY.Track.Application.Services.ProvideServices; public class OrderService : ApplicationService { private readonly IOrderRepository _orderRepository; - private readonly IBasicQuery _orderLinkQuery; - public OrderService(IOrderRepository orderRepository, IBasicQuery orderLinkQuery) + public OrderService(IOrderRepository orderRepository) { _orderRepository = orderRepository; - _orderLinkQuery = orderLinkQuery; } /// @@ -62,68 +59,4 @@ public class OrderService : ApplicationService return true; } - - /// - /// 关联订单 - /// - /// - /// - [HttpPost("Order/Link")] - public async Task LinkOrderAsync(LinkOrderInput input) - { - if (!await _orderRepository.IsAnyAsync(x => x.OrderType == input.OrderType && x.OrderNo == input.OrderNo)) - { - throw new BusinessException(message: $"单号:{input.OrderNo}不存在"); - } - - if (input.LinkOrderNos.Count < 1 || input.LinkOrderType == 0) return true; - - // 单号去重 - input.LinkOrderNos = input.LinkOrderNos.Distinct().ToList(); - - // 解绑 - if (!input.IsLink) return await UnLinkOrderAsync(input); - - // 关联订单 - return await DoLinkOrderAsync(input); - } - - private async Task DoLinkOrderAsync(LinkOrderInput input) - { - // 获取已关联的订单 - var linkOrderNos = await _orderLinkQuery.GetListAsync(x => - x.OrderType == input.OrderType && x.OrderNo == input.OrderNo && x.LinkOrderType == input.LinkOrderType, - x => x.LinkOrderNo); - - // 计算出未关联的订单 - var noLinkOrderNos = input.LinkOrderNos.Except(linkOrderNos); - - // 过滤掉不存在的订单 - var canLinkOrderNos = await _orderRepository.GetListAsync(x => - x.OrderType == input.LinkOrderType && noLinkOrderNos.Contains(x.OrderNo), - x => x.OrderNo); - - await _orderRepository.LinkOrderAsync(canLinkOrderNos.Select(x => new OrderLinkEntity - { - OrderNo = input.OrderNo, - OrderType = input.OrderType, - LinkOrderNo = x, - LinkOrderType = input.LinkOrderType - }).ToList()); - - return true; - } - - private async Task UnLinkOrderAsync(LinkOrderInput input) - { - var unLinkIds = await _orderLinkQuery.GetListAsync(x => - x.OrderType == input.OrderType && x.OrderNo == input.OrderNo && - x.LinkOrderType == input.LinkOrderType && input.LinkOrderNos.Contains(x.LinkOrderNo), - x => x.Id); - - // real del - await _orderRepository.UnLinkByIdsAsync(unLinkIds); - - return true; - } } \ No newline at end of file