From 63c9bc39c7a5ba53fe557c7be74fe66bc5cacdd9 Mon Sep 17 00:00:00 2001 From: gdlcf88 Date: Tue, 25 Aug 2020 20:34:56 +0800 Subject: [PATCH] Improve the param of IOrderAppService.CompleteAsync() --- .../EasyAbp/EShop/Orders/Orders/IOrderAppService.cs | 2 +- .../EasyAbp/EShop/Orders/Orders/OrderAppService.cs | 4 ++-- .../EasyAbp/EShop/Orders/Orders/OrderController.cs | 6 +++--- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/modules/EasyAbp.EShop.Orders/src/EasyAbp.EShop.Orders.Application.Contracts/EasyAbp/EShop/Orders/Orders/IOrderAppService.cs b/modules/EasyAbp.EShop.Orders/src/EasyAbp.EShop.Orders.Application.Contracts/EasyAbp/EShop/Orders/Orders/IOrderAppService.cs index ee071165..a7f49fa7 100644 --- a/modules/EasyAbp.EShop.Orders/src/EasyAbp.EShop.Orders.Application.Contracts/EasyAbp/EShop/Orders/Orders/IOrderAppService.cs +++ b/modules/EasyAbp.EShop.Orders/src/EasyAbp.EShop.Orders.Application.Contracts/EasyAbp/EShop/Orders/Orders/IOrderAppService.cs @@ -14,6 +14,6 @@ namespace EasyAbp.EShop.Orders.Orders { Task GetByOrderNumberAsync(string orderNumber); - Task CompleteAsync(CompleteOrderInput input); + Task CompleteAsync(Guid id); } } \ No newline at end of file diff --git a/modules/EasyAbp.EShop.Orders/src/EasyAbp.EShop.Orders.Application/EasyAbp/EShop/Orders/Orders/OrderAppService.cs b/modules/EasyAbp.EShop.Orders/src/EasyAbp.EShop.Orders.Application/EasyAbp/EShop/Orders/Orders/OrderAppService.cs index 5906299c..caf97c8b 100644 --- a/modules/EasyAbp.EShop.Orders/src/EasyAbp.EShop.Orders.Application/EasyAbp/EShop/Orders/Orders/OrderAppService.cs +++ b/modules/EasyAbp.EShop.Orders/src/EasyAbp.EShop.Orders.Application/EasyAbp/EShop/Orders/Orders/OrderAppService.cs @@ -158,9 +158,9 @@ namespace EasyAbp.EShop.Orders.Orders } [Authorize(OrdersPermissions.Orders.Complete)] - public virtual async Task CompleteAsync(CompleteOrderInput input) + public virtual async Task CompleteAsync(Guid id) { - var order = await GetEntityByIdAsync(input.OrderId); + var order = await GetEntityByIdAsync(id); if (order.CustomerUserId != CurrentUser.GetId()) { diff --git a/modules/EasyAbp.EShop.Orders/src/EasyAbp.EShop.Orders.HttpApi/EasyAbp/EShop/Orders/Orders/OrderController.cs b/modules/EasyAbp.EShop.Orders/src/EasyAbp.EShop.Orders.HttpApi/EasyAbp/EShop/Orders/Orders/OrderController.cs index 56e29545..9c8f2f5c 100644 --- a/modules/EasyAbp.EShop.Orders/src/EasyAbp.EShop.Orders.HttpApi/EasyAbp/EShop/Orders/Orders/OrderController.cs +++ b/modules/EasyAbp.EShop.Orders/src/EasyAbp.EShop.Orders.HttpApi/EasyAbp/EShop/Orders/Orders/OrderController.cs @@ -61,10 +61,10 @@ namespace EasyAbp.EShop.Orders.Orders } [HttpPost] - [Route("complete")] - public Task CompleteAsync(CompleteOrderInput input) + [Route("{id}/complete")] + public Task CompleteAsync(Guid id) { - return _service.CompleteAsync(input); + return _service.CompleteAsync(id); } } }