Fix ReducedInventoryAfterPlacingTime

6 years ago · 9da44f8712
8 changed files with 12 additions and 7 deletions
--- 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>
--- 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>
--- 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);
            }
--- 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>

--- 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>
--- 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)
--- 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>
--- 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>