From f38115e4c014a8a74f57221a6488456efc9b587d Mon Sep 17 00:00:00 2001
From: gdlcf88 <47396430@qq.com>
Date: Sat, 9 May 2020 19:22:04 +0800
Subject: [PATCH] Fix unit of work

---
 modules/EasyAbp.EShop.Baskets/common.props                   | 2 +-
 modules/EasyAbp.EShop.Orders/common.props                    | 2 +-
 modules/EasyAbp.EShop.Payments.WeChatPay/common.props        | 2 +-
 modules/EasyAbp.EShop.Payments/common.props                  | 2 +-
 modules/EasyAbp.EShop.Products/common.props                  | 2 +-
 .../ProductDetailHistories/ProductDetailHistoryRecorder.cs   | 4 +++-
 .../Products/ProductHistories/ProductHistoryRecorder.cs      | 4 +++-
 .../EShop/Products/Products/OrderCreatedEventHandler.cs      | 5 ++---
 modules/EasyAbp.EShop.Stores/common.props                    | 2 +-
 9 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/modules/EasyAbp.EShop.Baskets/common.props b/modules/EasyAbp.EShop.Baskets/common.props
index 9843ae7e..0237d014 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.1</Version>
+    <Version>0.1.2</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 9843ae7e..0237d014 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.1</Version>
+    <Version>0.1.2</Version>
     <NoWarn>$(NoWarn);CS1591</NoWarn>
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
     <Authors>EasyAbp Team</Authors>
diff --git a/modules/EasyAbp.EShop.Payments.WeChatPay/common.props b/modules/EasyAbp.EShop.Payments.WeChatPay/common.props
index cbc11eeb..e69083db 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.1</Version>
+    <Version>0.1.2</Version>
     <NoWarn>$(NoWarn);CS1591</NoWarn>
   </PropertyGroup>
 
diff --git a/modules/EasyAbp.EShop.Payments/common.props b/modules/EasyAbp.EShop.Payments/common.props
index 9843ae7e..0237d014 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.1</Version>
+    <Version>0.1.2</Version>
     <NoWarn>$(NoWarn);CS1591</NoWarn>
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
     <Authors>EasyAbp Team</Authors>
diff --git a/modules/EasyAbp.EShop.Products/common.props b/modules/EasyAbp.EShop.Products/common.props
index 9843ae7e..0237d014 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.1</Version>
+    <Version>0.1.2</Version>
     <NoWarn>$(NoWarn);CS1591</NoWarn>
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
     <Authors>EasyAbp Team</Authors>
diff --git a/modules/EasyAbp.EShop.Products/src/EasyAbp.EShop.Products.Application/EasyAbp/EShop/Products/ProductDetailHistories/ProductDetailHistoryRecorder.cs b/modules/EasyAbp.EShop.Products/src/EasyAbp.EShop.Products.Application/EasyAbp/EShop/Products/ProductDetailHistories/ProductDetailHistoryRecorder.cs
index e25639f2..5e3c3ddf 100644
--- a/modules/EasyAbp.EShop.Products/src/EasyAbp.EShop.Products.Application/EasyAbp/EShop/Products/ProductDetailHistories/ProductDetailHistoryRecorder.cs
+++ b/modules/EasyAbp.EShop.Products/src/EasyAbp.EShop.Products.Application/EasyAbp/EShop/Products/ProductDetailHistories/ProductDetailHistoryRecorder.cs
@@ -8,6 +8,7 @@ using Volo.Abp.EventBus;
 using Volo.Abp.Guids;
 using Volo.Abp.Json;
 using Volo.Abp.ObjectMapping;
+using Volo.Abp.Uow;
 
 namespace EasyAbp.EShop.Products.ProductDetailHistories
 {
@@ -30,7 +31,8 @@ namespace EasyAbp.EShop.Products.ProductDetailHistories
             _productDetailHistoryRepository = productDetailHistoryRepository;
         }
         
-        public async Task HandleEventAsync(EntityChangedEventData<ProductDetail> eventData)
+        [UnitOfWork(true)]
+        public virtual async Task HandleEventAsync(EntityChangedEventData<ProductDetail> eventData)
         {
             var modificationTime = eventData.Entity.LastModificationTime ?? eventData.Entity.CreationTime;
 
diff --git a/modules/EasyAbp.EShop.Products/src/EasyAbp.EShop.Products.Application/EasyAbp/EShop/Products/ProductHistories/ProductHistoryRecorder.cs b/modules/EasyAbp.EShop.Products/src/EasyAbp.EShop.Products.Application/EasyAbp/EShop/Products/ProductHistories/ProductHistoryRecorder.cs
index eabfd3af..0dad0858 100644
--- a/modules/EasyAbp.EShop.Products/src/EasyAbp.EShop.Products.Application/EasyAbp/EShop/Products/ProductHistories/ProductHistoryRecorder.cs
+++ b/modules/EasyAbp.EShop.Products/src/EasyAbp.EShop.Products.Application/EasyAbp/EShop/Products/ProductHistories/ProductHistoryRecorder.cs
@@ -7,6 +7,7 @@ using Volo.Abp.EventBus;
 using Volo.Abp.Guids;
 using Volo.Abp.Json;
 using Volo.Abp.ObjectMapping;
+using Volo.Abp.Uow;
 
 namespace EasyAbp.EShop.Products.ProductHistories
 {
@@ -29,7 +30,8 @@ namespace EasyAbp.EShop.Products.ProductHistories
             _productHistoryRepository = productHistoryRepository;
         }
         
-        public async Task HandleEventAsync(EntityChangedEventData<Product> eventData)
+        [UnitOfWork(true)]
+        public virtual async Task HandleEventAsync(EntityChangedEventData<Product> eventData)
         {
             var modificationTime = eventData.Entity.LastModificationTime ?? eventData.Entity.CreationTime;
 
diff --git a/modules/EasyAbp.EShop.Products/src/EasyAbp.EShop.Products.Domain/EasyAbp/EShop/Products/Products/OrderCreatedEventHandler.cs b/modules/EasyAbp.EShop.Products/src/EasyAbp.EShop.Products.Domain/EasyAbp/EShop/Products/Products/OrderCreatedEventHandler.cs
index 4b49bf10..9af51b8a 100644
--- a/modules/EasyAbp.EShop.Products/src/EasyAbp.EShop.Products.Domain/EasyAbp/EShop/Products/Products/OrderCreatedEventHandler.cs
+++ b/modules/EasyAbp.EShop.Products/src/EasyAbp.EShop.Products.Domain/EasyAbp/EShop/Products/Products/OrderCreatedEventHandler.cs
@@ -31,12 +31,12 @@ namespace EasyAbp.EShop.Products.Products
             _productManager = productManager;
         }
         
+        [UnitOfWork(true)]
         public virtual async Task HandleEventAsync(EntityCreatedEto<OrderEto> eventData)
         {
+            var uow = _unitOfWorkManager.Current;
             using (_currentTenant.Change(eventData.Entity.TenantId))
             {
-                using var uow = _unitOfWorkManager.Begin(true, true);
-            
                 foreach (var orderLine in eventData.Entity.OrderLines)
                 {
                     var product = await _productRepository.FindAsync(orderLine.ProductId);
@@ -69,7 +69,6 @@ namespace EasyAbp.EShop.Products.Products
                     }
                 }
             
-                await uow.CompleteAsync();
                 await _distributedEventBus.PublishAsync(new ProductInventoryReductionAfterOrderPlacedResultEto
                     {OrderId = eventData.Entity.Id, IsSuccess = true});
             }
diff --git a/modules/EasyAbp.EShop.Stores/common.props b/modules/EasyAbp.EShop.Stores/common.props
index 9843ae7e..0237d014 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.1</Version>
+    <Version>0.1.2</Version>
     <NoWarn>$(NoWarn);CS1591</NoWarn>
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
     <Authors>EasyAbp Team</Authors>