From 8acd07ec252d6845d5a489c28e63034aa061a037 Mon Sep 17 00:00:00 2001
From: gdlcf88 <gdlcf88@outlook.com>
Date: Wed, 11 Nov 2020 15:46:23 +0800
Subject: [PATCH] Fix BasicOrderCancellationAuthorizationHandler Resolve #105

---
 common.props                                  |  2 +-
 ...icOrderCancellationAuthorizationHandler.cs | 21 +++++++++----------
 2 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/common.props b/common.props
index 6aa53fdb..5d947988 100644
--- a/common.props
+++ b/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>
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