From 683d56eb835d3550d79c83a9775ea293692b36d8 Mon Sep 17 00:00:00 2001
From: gdlcf88 <gdlcf88@outlook.com>
Date: Wed, 29 Sep 2021 17:17:54 +0800
Subject: [PATCH] Fix multi-tenant not supported bug in
 PaymentCanceledEventHandler.

---
 common.props                                             | 2 +-
 .../EShop/Orders/Orders/PaymentCanceledEventHandler.cs   | 9 ++++++++-
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/common.props b/common.props
index ec543020..ce343862 100644
--- a/common.props
+++ b/common.props
@@ -1,7 +1,7 @@
 <Project>
   <PropertyGroup>
     <LangVersion>latest</LangVersion>
-    <Version>2.2.5</Version>
+    <Version>2.2.6</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/PaymentCanceledEventHandler.cs b/modules/EasyAbp.EShop.Orders/src/EasyAbp.EShop.Orders.Domain/EasyAbp/EShop/Orders/Orders/PaymentCanceledEventHandler.cs
index c7963b14..01d9125a 100644
--- a/modules/EasyAbp.EShop.Orders/src/EasyAbp.EShop.Orders.Domain/EasyAbp/EShop/Orders/Orders/PaymentCanceledEventHandler.cs
+++ b/modules/EasyAbp.EShop.Orders/src/EasyAbp.EShop.Orders.Domain/EasyAbp/EShop/Orders/Orders/PaymentCanceledEventHandler.cs
@@ -5,22 +5,29 @@ using EasyAbp.EShop.Payments;
 using EasyAbp.EShop.Payments.Payments;
 using Volo.Abp.DependencyInjection;
 using Volo.Abp.EventBus.Distributed;
+using Volo.Abp.MultiTenancy;
 using Volo.Abp.Uow;
 
 namespace EasyAbp.EShop.Orders.Orders
 {
     public class PaymentCanceledEventHandler : IDistributedEventHandler<EShopPaymentCanceledEto>, ITransientDependency
     {
+        private readonly ICurrentTenant _currentTenant;
         private readonly IOrderRepository _orderRepository;
 
-        public PaymentCanceledEventHandler(IOrderRepository orderRepository)
+        public PaymentCanceledEventHandler(
+            ICurrentTenant currentTenant,
+            IOrderRepository orderRepository)
         {
+            _currentTenant = currentTenant;
             _orderRepository = orderRepository;
         }
 
         [UnitOfWork(true)]
         public virtual async Task HandleEventAsync(EShopPaymentCanceledEto eventData)
         {
+            using var currentTenant = _currentTenant.Change(eventData.TenantId);
+
             foreach (var paymentItem in eventData.Payment.PaymentItems.Where(item =>
                 item.ItemType == PaymentsConsts.PaymentItemType))
             {