diff --git a/common.props b/common.props index 6aa53fdb..5d947988 100644 --- a/common.props +++ b/common.props @@ -1,7 +1,7 @@ latest - 1.6.1 + 1.6.2 $(NoWarn);CS1591 true EasyAbp Team diff --git a/modules/EasyAbp.EShop.Orders/src/EasyAbp.EShop.Orders.Application/EasyAbp/EShop/Orders/Orders/BasicOrderCancellationAuthorizationHandler.cs b/modules/EasyAbp.EShop.Orders/src/EasyAbp.EShop.Orders.Application/EasyAbp/EShop/Orders/Orders/BasicOrderCancellationAuthorizationHandler.cs index 00f1e556..668e9b7d 100644 --- a/modules/EasyAbp.EShop.Orders/src/EasyAbp.EShop.Orders.Application/EasyAbp/EShop/Orders/Orders/BasicOrderCancellationAuthorizationHandler.cs +++ b/modules/EasyAbp.EShop.Orders/src/EasyAbp.EShop.Orders.Application/EasyAbp/EShop/Orders/Orders/BasicOrderCancellationAuthorizationHandler.cs @@ -32,13 +32,7 @@ namespace EasyAbp.EShop.Orders.Orders context.Fail(); return; } - - if (!resource.IsPaid()) - { - context.Succeed(requirement); - return; - } - + if (resource.CustomerUserId != _currentUser.GetId()) { if (!await _permissionChecker.IsGrantedAsync(OrdersPermissions.Orders.Manage)) @@ -47,14 +41,19 @@ namespace EasyAbp.EShop.Orders.Orders return; } - - if (await _storeOwnerStore.IsStoreOwnerAsync(resource.StoreId, _currentUser.GetId()) || - await _permissionChecker.IsGrantedAsync(OrdersPermissions.Orders.CrossStore)) + if (!await _storeOwnerStore.IsStoreOwnerAsync(resource.StoreId, _currentUser.GetId()) && + !await _permissionChecker.IsGrantedAsync(OrdersPermissions.Orders.CrossStore)) { - context.Succeed(requirement); + context.Fail(); return; } } + + if (!resource.IsPaid()) + { + context.Succeed(requirement); + return; + } } } } \ No newline at end of file