From 9da44f8712671b98fac1e69e6a7d89c6807440e8 Mon Sep 17 00:00:00 2001
From: gdlcf88 <47396430@qq.com>
Date: Sat, 9 May 2020 20:35:23 +0800
Subject: [PATCH] Fix ReducedInventoryAfterPlacingTime

---
 modules/EasyAbp.EShop.Baskets/common.props                   | 2 +-
 modules/EasyAbp.EShop.Orders/common.props                    | 2 +-
 .../Orders/OrderProductInventoryReductionEventHandler.cs     | 2 +-
 modules/EasyAbp.EShop.Payments.WeChatPay/common.props        | 2 +-
 modules/EasyAbp.EShop.Payments/common.props                  | 2 +-
 .../EShop/Payments/Payments/EShopOrderPaymentAuthorizer.cs   | 5 +++++
 modules/EasyAbp.EShop.Products/common.props                  | 2 +-
 modules/EasyAbp.EShop.Stores/common.props                    | 2 +-
 8 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/modules/EasyAbp.EShop.Baskets/common.props b/modules/EasyAbp.EShop.Baskets/common.props
index 5a056c65..9945f6a0 100644
--- a/modules/EasyAbp.EShop.Baskets/common.props
+++ b/modules/EasyAbp.EShop.Baskets/common.props
@@ -1,7 +1,7 @@
 <Project>
   <PropertyGroup>
     <LangVersion>latest</LangVersion>
-    <Version>0.1.3</Version>
+    <Version>0.1.4</Version>
     <NoWarn>$(NoWarn);CS1591</NoWarn>
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
     <Authors>EasyAbp Team</Authors>
diff --git a/modules/EasyAbp.EShop.Orders/common.props b/modules/EasyAbp.EShop.Orders/common.props
index 5a056c65..9945f6a0 100644
--- a/modules/EasyAbp.EShop.Orders/common.props
+++ b/modules/EasyAbp.EShop.Orders/common.props
@@ -1,7 +1,7 @@
 <Project>
   <PropertyGroup>
     <LangVersion>latest</LangVersion>
-    <Version>0.1.3</Version>
+    <Version>0.1.4</Version>
     <NoWarn>$(NoWarn);CS1591</NoWarn>
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
     <Authors>EasyAbp Team</Authors>
diff --git a/modules/EasyAbp.EShop.Orders/src/EasyAbp.EShop.Orders.Domain/EasyAbp/EShop/Orders/Orders/OrderProductInventoryReductionEventHandler.cs b/modules/EasyAbp.EShop.Orders/src/EasyAbp.EShop.Orders.Domain/EasyAbp/EShop/Orders/Orders/OrderProductInventoryReductionEventHandler.cs
index 349771af..a736fd0e 100644
--- a/modules/EasyAbp.EShop.Orders/src/EasyAbp.EShop.Orders.Domain/EasyAbp/EShop/Orders/Orders/OrderProductInventoryReductionEventHandler.cs
+++ b/modules/EasyAbp.EShop.Orders/src/EasyAbp.EShop.Orders.Domain/EasyAbp/EShop/Orders/Orders/OrderProductInventoryReductionEventHandler.cs
@@ -41,7 +41,7 @@ namespace EasyAbp.EShop.Orders.Orders
                     return;
                 }
             
-                order.SetReducedInventoryAfterPaymentTime(_clock.Now);
+                order.SetReducedInventoryAfterPlacingTime(_clock.Now);
 
                 await _orderRepository.UpdateAsync(order, true);
             }
diff --git a/modules/EasyAbp.EShop.Payments.WeChatPay/common.props b/modules/EasyAbp.EShop.Payments.WeChatPay/common.props
index 850b730b..3289849a 100644
--- a/modules/EasyAbp.EShop.Payments.WeChatPay/common.props
+++ b/modules/EasyAbp.EShop.Payments.WeChatPay/common.props
@@ -1,7 +1,7 @@
 <Project>
   <PropertyGroup>
     <LangVersion>latest</LangVersion>
-    <Version>0.1.3</Version>
+    <Version>0.1.4</Version>
     <NoWarn>$(NoWarn);CS1591</NoWarn>
   </PropertyGroup>
 
diff --git a/modules/EasyAbp.EShop.Payments/common.props b/modules/EasyAbp.EShop.Payments/common.props
index 5a056c65..9945f6a0 100644
--- a/modules/EasyAbp.EShop.Payments/common.props
+++ b/modules/EasyAbp.EShop.Payments/common.props
@@ -1,7 +1,7 @@
 <Project>
   <PropertyGroup>
     <LangVersion>latest</LangVersion>
-    <Version>0.1.3</Version>
+    <Version>0.1.4</Version>
     <NoWarn>$(NoWarn);CS1591</NoWarn>
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
     <Authors>EasyAbp Team</Authors>
diff --git a/modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.Application/EasyAbp/EShop/Payments/Payments/EShopOrderPaymentAuthorizer.cs b/modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.Application/EasyAbp/EShop/Payments/Payments/EShopOrderPaymentAuthorizer.cs
index a14f7474..41f9d88b 100644
--- a/modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.Application/EasyAbp/EShop/Payments/Payments/EShopOrderPaymentAuthorizer.cs
+++ b/modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.Application/EasyAbp/EShop/Payments/Payments/EShopOrderPaymentAuthorizer.cs
@@ -40,6 +40,11 @@ namespace EasyAbp.EShop.Payments.Payments
                 return false;
             }
 
+            if (!order.ReducedInventoryAfterPlacingTime.HasValue)
+            {
+                return false;
+            }
+
             var inputStoreIdString = inputExtraProperties.GetOrDefault("StoreId") as string;
             
             if (order.StoreId.ToString() != inputStoreIdString)
diff --git a/modules/EasyAbp.EShop.Products/common.props b/modules/EasyAbp.EShop.Products/common.props
index 5a056c65..9945f6a0 100644
--- a/modules/EasyAbp.EShop.Products/common.props
+++ b/modules/EasyAbp.EShop.Products/common.props
@@ -1,7 +1,7 @@
 <Project>
   <PropertyGroup>
     <LangVersion>latest</LangVersion>
-    <Version>0.1.3</Version>
+    <Version>0.1.4</Version>
     <NoWarn>$(NoWarn);CS1591</NoWarn>
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
     <Authors>EasyAbp Team</Authors>
diff --git a/modules/EasyAbp.EShop.Stores/common.props b/modules/EasyAbp.EShop.Stores/common.props
index 5a056c65..9945f6a0 100644
--- a/modules/EasyAbp.EShop.Stores/common.props
+++ b/modules/EasyAbp.EShop.Stores/common.props
@@ -1,7 +1,7 @@
 <Project>
   <PropertyGroup>
     <LangVersion>latest</LangVersion>
-    <Version>0.1.3</Version>
+    <Version>0.1.4</Version>
     <NoWarn>$(NoWarn);CS1591</NoWarn>
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
     <Authors>EasyAbp Team</Authors>