Fix BasicOrderCancellationAuthorizationHandler

Resolve #105

common.props

@@ -1,7 +1,7 @@
 <Project>
   <PropertyGroup>
     <LangVersion>latest</LangVersion>
-    <Version>1.6.1</Version>
+    <Version>1.6.2</Version>
     <NoWarn>$(NoWarn);CS1591</NoWarn>
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
     <Authors>EasyAbp Team</Authors>

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;
+            }
         }
     }
 }