Merge pull request #212 from EasyAbp/revert-211-fix-oncompleted-usage

Revert "Fix UOW OnCompleted usage"

plugins/FlashSales/src/EasyAbp.EShop.Plugins.FlashSales.Application/EasyAbp/EShop/Plugins/FlashSales/FlashSalePlans/FlashSaleOrderCreationResultEventHandler.cs

@@ -2,7 +2,6 @@
 using EasyAbp.EShop.Plugins.FlashSales.FlashSaleResults;
 using EasyAbp.EShop.Plugins.FlashSales.FlashSaleResults.Dtos;
 using EasyAbp.Eshop.Products.Products;
-using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
 using Volo.Abp.DependencyInjection;
 using Volo.Abp.EventBus.Distributed;
@@ -17,7 +16,7 @@ public class FlashSaleOrderCreationResultEventHandler : IDistributedEventHandler
     protected ILogger<FlashSaleOrderCreationResultEventHandler> Logger { get; }
     protected IFlashSaleInventoryManager FlashSaleInventoryManager { get; }
     protected IUnitOfWorkManager UnitOfWorkManager { get; }
-    protected IServiceScopeFactory ServiceScopeFactory { get; }
+    protected IObjectMapper ObjectMapper { get; }
     protected IFlashSaleCurrentResultCache FlashSaleCurrentResultCache { get; }
     protected IFlashSaleResultRepository FlashSaleResultRepository { get; }
 
@@ -25,14 +24,14 @@ public class FlashSaleOrderCreationResultEventHandler : IDistributedEventHandler
         ILogger<FlashSaleOrderCreationResultEventHandler> logger,
         IFlashSaleInventoryManager flashSaleInventoryManager,
         IUnitOfWorkManager unitOfWorkManager,
-        IServiceScopeFactory serviceScopeFactory,
+        IObjectMapper objectMapper,
         IFlashSaleCurrentResultCache flashSaleCurrentResultCache,
         IFlashSaleResultRepository flashSaleResultRepository)
     {
         Logger = logger;
         FlashSaleInventoryManager = flashSaleInventoryManager;
         UnitOfWorkManager = unitOfWorkManager;
-        ServiceScopeFactory = serviceScopeFactory;
+        ObjectMapper = objectMapper;
         FlashSaleCurrentResultCache = flashSaleCurrentResultCache;
         FlashSaleResultRepository = flashSaleResultRepository;
     }
@@ -87,16 +86,11 @@ public class FlashSaleOrderCreationResultEventHandler : IDistributedEventHandler
 
     protected virtual async Task ResetFlashSaleCurrentResultCacheAsync(FlashSaleResult flashSaleResult)
     {
-        using var scope = ServiceScopeFactory.CreateScope();
-
-        var objectMapper = scope.ServiceProvider.GetRequiredService<IObjectMapper>();
-        var flashSaleCurrentResultCache = scope.ServiceProvider.GetRequiredService<IFlashSaleCurrentResultCache>();
-
-        await flashSaleCurrentResultCache.SetAsync(flashSaleResult.PlanId, flashSaleResult.UserId,
+        await FlashSaleCurrentResultCache.SetAsync(flashSaleResult.PlanId, flashSaleResult.UserId,
             new FlashSaleCurrentResultCacheItem
             {
                 TenantId = flashSaleResult.TenantId,
-                ResultDto = objectMapper.Map<FlashSaleResult, FlashSaleResultDto>(flashSaleResult)
+                ResultDto = ObjectMapper.Map<FlashSaleResult, FlashSaleResultDto>(flashSaleResult)
             });
     }
 }

plugins/FlashSales/src/EasyAbp.EShop.Plugins.FlashSales.Application/EasyAbp/EShop/Plugins/FlashSales/FlashSaleResults/CreateFlashSaleResultEventHandler.cs

@@ -3,7 +3,6 @@ using EasyAbp.EShop.Plugins.FlashSales.FlashSalePlans;
 using EasyAbp.EShop.Plugins.FlashSales.FlashSaleResults.Dtos;
 using EasyAbp.Eshop.Products.Products;
 using EasyAbp.EShop.Products.Products;
-using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
 using Volo.Abp;
 using Volo.Abp.DependencyInjection;
@@ -23,7 +22,6 @@ public class CreateFlashSaleResultEventHandler : IDistributedEventHandler<Create
     protected IObjectMapper ObjectMapper { get; }
     protected ICurrentTenant CurrentTenant { get; }
     protected IUnitOfWorkManager UnitOfWorkManager { get; }
-    protected IServiceScopeFactory ServiceScopeFactory { get; }
     protected ILogger<CreateFlashSaleResultEventHandler> Logger { get; }
     protected IAbpDistributedLock AbpDistributedLock { get; }
     protected IDistributedEventBus DistributedEventBus { get; }
@@ -35,7 +33,6 @@ public class CreateFlashSaleResultEventHandler : IDistributedEventHandler<Create
         IObjectMapper objectMapper,
         ICurrentTenant currentTenant,
         IUnitOfWorkManager unitOfWorkManager,
-        IServiceScopeFactory serviceScopeFactory,
         ILogger<CreateFlashSaleResultEventHandler> logger,
         IAbpDistributedLock abpDistributedLock,
         IDistributedEventBus distributedEventBus,
@@ -46,7 +43,6 @@ public class CreateFlashSaleResultEventHandler : IDistributedEventHandler<Create
         ObjectMapper = objectMapper;
         CurrentTenant = currentTenant;
         UnitOfWorkManager = unitOfWorkManager;
-        ServiceScopeFactory = serviceScopeFactory;
         Logger = logger;
         AbpDistributedLock = abpDistributedLock;
         DistributedEventBus = distributedEventBus;
@@ -84,11 +80,7 @@ public class CreateFlashSaleResultEventHandler : IDistributedEventHandler<Create
             // try to roll back the inventory.
             UnitOfWorkManager.Current.OnCompleted(async () =>
             {
-                using var scope = ServiceScopeFactory.CreateScope();
-
-                var flashSaleInventoryManager = scope.ServiceProvider.GetRequiredService<IFlashSaleInventoryManager>();
-
-                if (!await flashSaleInventoryManager.TryRollBackInventoryAsync(eventData.TenantId,
+                if (!await FlashSaleInventoryManager.TryRollBackInventoryAsync(eventData.TenantId,
                         eventData.ProductInventoryProviderName, eventData.Plan.StoreId,
                         eventData.Plan.ProductId, eventData.Plan.ProductSkuId))
                 {