Rename files and classes

modules/EasyAbp.EShop.Orders/src/EasyAbp.EShop.Orders.Domain/EasyAbp/EShop/Orders/Orders/BasicCompletableCheckProvider.cs → modules/EasyAbp.EShop.Orders/src/EasyAbp.EShop.Orders.Domain/EasyAbp/EShop/Orders/Orders/BasicOrderCompletableCheckProvider.cs

@@ -3,7 +3,7 @@ using Volo.Abp.DependencyInjection;
 
 namespace EasyAbp.EShop.Orders.Orders
 {
-    public class BasicCompletableCheckProvider : ICompletableCheckProvider, ITransientDependency
+    public class BasicOrderCompletableCheckProvider : IOrderCompletableCheckProvider, ITransientDependency
     {
         public virtual Task CheckAsync(Order order)
         {

modules/EasyAbp.EShop.Orders/src/EasyAbp.EShop.Orders.Domain/EasyAbp/EShop/Orders/Orders/ICompletableCheckProvider.cs → modules/EasyAbp.EShop.Orders/src/EasyAbp.EShop.Orders.Domain/EasyAbp/EShop/Orders/Orders/IOrderCompletableCheckProvider.cs

@@ -2,7 +2,7 @@
 
 namespace EasyAbp.EShop.Orders.Orders
 {
-    public interface ICompletableCheckProvider
+    public interface IOrderCompletableCheckProvider
     {
         Task CheckAsync(Order order);
     }

modules/EasyAbp.EShop.Orders/src/EasyAbp.EShop.Orders.Domain/EasyAbp/EShop/Orders/Orders/IOrderPaymentChecker.cs

@@ -3,7 +3,7 @@ using EasyAbp.EShop.Payments.Payments;
 
 namespace EasyAbp.EShop.Orders.Orders
 {
-    public interface IEShopPaymentChecker
+    public interface IOrderPaymentChecker
     {
         Task<bool> IsValidPaymentAsync(Order order, EShopPaymentEto payment, EShopPaymentItemEto paymentItem);
     }

modules/EasyAbp.EShop.Orders/src/EasyAbp.EShop.Orders.Domain/EasyAbp/EShop/Orders/Orders/IOrderPaymentCompletedEventHandler.cs → modules/EasyAbp.EShop.Orders/src/EasyAbp.EShop.Orders.Domain/EasyAbp/EShop/Orders/Orders/IPaymentCompletedEventHandler.cs

@@ -3,7 +3,7 @@ using Volo.Abp.EventBus.Distributed;
 
 namespace EasyAbp.EShop.Orders.Orders
 {
-    public interface IEShopPaymentCompletedEventHandler : IDistributedEventHandler<EShopPaymentCompletedEto>
+    public interface IPaymentCompletedEventHandler : IDistributedEventHandler<EShopPaymentCompletedEto>
     {
         
     }

modules/EasyAbp.EShop.Orders/src/EasyAbp.EShop.Orders.Domain/EasyAbp/EShop/Orders/Orders/IOrderPaymentCreatedEventHandler.cs → modules/EasyAbp.EShop.Orders/src/EasyAbp.EShop.Orders.Domain/EasyAbp/EShop/Orders/Orders/IPaymentCreatedEventHandler.cs

@@ -4,7 +4,7 @@ using Volo.Abp.EventBus.Distributed;
 
 namespace EasyAbp.EShop.Orders.Orders
 {
-    public interface IEShopPaymentCreatedEventHandler : IDistributedEventHandler<EntityCreatedEto<EShopPaymentEto>>
+    public interface IPaymentCreatedEventHandler : IDistributedEventHandler<EntityCreatedEto<EShopPaymentEto>>
     {
         
     }

modules/EasyAbp.EShop.Orders/src/EasyAbp.EShop.Orders.Domain/EasyAbp/EShop/Orders/Orders/IOrderProductInventoryReductionEventHandler.cs → modules/EasyAbp.EShop.Orders/src/EasyAbp.EShop.Orders.Domain/EasyAbp/EShop/Orders/Orders/IProductInventoryReductionEventHandler.cs

@@ -3,7 +3,7 @@ using Volo.Abp.EventBus.Distributed;
 
 namespace EasyAbp.EShop.Orders.Orders
 {
-    public interface IOrderProductInventoryReductionEventHandler :
+    public interface IProductInventoryReductionEventHandler :
         IDistributedEventHandler<ProductInventoryReductionAfterOrderPlacedResultEto>,
         IDistributedEventHandler<ProductInventoryReductionAfterOrderPaidResultEto>
     {

modules/EasyAbp.EShop.Orders/src/EasyAbp.EShop.Orders.Domain/EasyAbp/EShop/Orders/Orders/OrderPaymentInvalidException.cs → modules/EasyAbp.EShop.Orders/src/EasyAbp.EShop.Orders.Domain/EasyAbp/EShop/Orders/Orders/InvalidPaymentException.cs

@@ -3,9 +3,9 @@ using Volo.Abp;
 
 namespace EasyAbp.EShop.Orders.Orders
 {
-    public class EShopPaymentInvalidException : BusinessException
+    public class InvalidPaymentException : BusinessException
     {
-        public EShopPaymentInvalidException(Guid paymentId, Guid orderId)
+        public InvalidPaymentException(Guid paymentId, Guid orderId)
             : base(message: $"The payment {paymentId} has invalid configurations for the order {orderId}.")
         {
         }

modules/EasyAbp.EShop.Orders/src/EasyAbp.EShop.Orders.Domain/EasyAbp/EShop/Orders/Orders/OrderManager.cs

@@ -36,7 +36,7 @@ namespace EasyAbp.EShop.Orders.Orders
                 throw new OrderIsInWrongStageException(order.Id);
             }
             
-            var providers = ServiceProvider.GetServices<ICompletableCheckProvider>();
+            var providers = ServiceProvider.GetServices<IOrderCompletableCheckProvider>();
 
             foreach (var provider in providers)
             {

modules/EasyAbp.EShop.Orders/src/EasyAbp.EShop.Orders.Domain/EasyAbp/EShop/Orders/Orders/OrderPaymentChecker.cs

@@ -6,7 +6,7 @@ using Volo.Abp.DependencyInjection;
 
 namespace EasyAbp.EShop.Orders.Orders
 {
-    public class EShopPaymentChecker : IEShopPaymentChecker, ITransientDependency
+    public class OrderPaymentChecker : IOrderPaymentChecker, ITransientDependency
     {
         public virtual async Task<bool> IsValidPaymentAsync(Order order, EShopPaymentEto payment, EShopPaymentItemEto paymentItem)
         {

modules/EasyAbp.EShop.Orders/src/EasyAbp.EShop.Orders.Domain/EasyAbp/EShop/Orders/Orders/OrderPaymentCompletedEventHandler.cs → modules/EasyAbp.EShop.Orders/src/EasyAbp.EShop.Orders.Domain/EasyAbp/EShop/Orders/Orders/PaymentCompletedEventHandler.cs

@@ -12,22 +12,22 @@ using Volo.Abp.Uow;
 
 namespace EasyAbp.EShop.Orders.Orders
 {
-    public class EShopPaymentCompletedEventHandler : IEShopPaymentCompletedEventHandler, ITransientDependency
+    public class PaymentCompletedEventHandler : IPaymentCompletedEventHandler, ITransientDependency
     {
         private readonly IClock _clock;
         private readonly ICurrentTenant _currentTenant;
         private readonly IObjectMapper _objectMapper;
         private readonly IUnitOfWorkManager _unitOfWorkManager;
-        private readonly IEShopPaymentChecker _eShopPaymentChecker;
+        private readonly IOrderPaymentChecker _orderPaymentChecker;
         private readonly IDistributedEventBus _distributedEventBus;
         private readonly IOrderRepository _orderRepository;
 
-        public EShopPaymentCompletedEventHandler(
+        public PaymentCompletedEventHandler(
             IClock clock,
             ICurrentTenant currentTenant,
             IObjectMapper objectMapper,
             IUnitOfWorkManager unitOfWorkManager,
-            IEShopPaymentChecker eShopPaymentChecker,
+            IOrderPaymentChecker orderPaymentChecker,
             IDistributedEventBus distributedEventBus,
             IOrderRepository orderRepository)
         {
@@ -35,7 +35,7 @@ namespace EasyAbp.EShop.Orders.Orders
             _currentTenant = currentTenant;
             _objectMapper = objectMapper;
             _unitOfWorkManager = unitOfWorkManager;
-            _eShopPaymentChecker = eShopPaymentChecker;
+            _orderPaymentChecker = orderPaymentChecker;
             _distributedEventBus = distributedEventBus;
             _orderRepository = orderRepository;
         }
@@ -64,9 +64,9 @@ namespace EasyAbp.EShop.Orders.Orders
                     throw new OrderIsInWrongStageException(order.Id);
                 }
 
-                if (!await _eShopPaymentChecker.IsValidPaymentAsync(order, payment, item))
+                if (!await _orderPaymentChecker.IsValidPaymentAsync(order, payment, item))
                 {
-                    throw new EShopPaymentInvalidException(payment.Id, orderId);
+                    throw new InvalidPaymentException(payment.Id, orderId);
                 }
                 
                 order.SetPaidTime(_clock.Now);

modules/EasyAbp.EShop.Orders/src/EasyAbp.EShop.Orders.Domain/EasyAbp/EShop/Orders/Orders/OrderPaymentCreatedEventHandler.cs → modules/EasyAbp.EShop.Orders/src/EasyAbp.EShop.Orders.Domain/EasyAbp/EShop/Orders/Orders/PaymentCreatedEventHandler.cs

@@ -10,19 +10,19 @@ using Volo.Abp.Uow;
 
 namespace EasyAbp.EShop.Orders.Orders
 {
-    public class EShopPaymentCreatedEventHandler : IEShopPaymentCreatedEventHandler, ITransientDependency
+    public class PaymentCreatedEventHandler : IPaymentCreatedEventHandler, ITransientDependency
     {
         private readonly ICurrentTenant _currentTenant;
-        private readonly IEShopPaymentChecker _eShopPaymentChecker;
+        private readonly IOrderPaymentChecker _orderPaymentChecker;
         private readonly IOrderRepository _orderRepository;
 
-        public EShopPaymentCreatedEventHandler(
+        public PaymentCreatedEventHandler(
             ICurrentTenant currentTenant,
-            IEShopPaymentChecker eShopPaymentChecker,
+            IOrderPaymentChecker orderPaymentChecker,
             IOrderRepository orderRepository)
         {
             _currentTenant = currentTenant;
-            _eShopPaymentChecker = eShopPaymentChecker;
+            _orderPaymentChecker = orderPaymentChecker;
             _orderRepository = orderRepository;
         }
         
@@ -43,10 +43,10 @@ namespace EasyAbp.EShop.Orders.Orders
                     throw new OrderIsInWrongStageException(order.Id);
                 }
                 
-                if (!await _eShopPaymentChecker.IsValidPaymentAsync(order, eventData.Entity, item))
+                if (!await _orderPaymentChecker.IsValidPaymentAsync(order, eventData.Entity, item))
                 {
                     // Todo: should cancel the payment?
-                    throw new EShopPaymentInvalidException(eventData.Entity.Id, orderId);
+                    throw new InvalidPaymentException(eventData.Entity.Id, orderId);
                 }
 
                 order.SetPaymentId(eventData.Entity.Id);

modules/EasyAbp.EShop.Orders/src/EasyAbp.EShop.Orders.Domain/EasyAbp/EShop/Orders/Orders/OrderProductInventoryReductionEventHandler.cs → modules/EasyAbp.EShop.Orders/src/EasyAbp.EShop.Orders.Domain/EasyAbp/EShop/Orders/Orders/ProductInventoryReductionEventHandler.cs

@@ -7,13 +7,13 @@ using Volo.Abp.Uow;
 
 namespace EasyAbp.EShop.Orders.Orders
 {
-    public class OrderProductInventoryReductionEventHandler : IOrderProductInventoryReductionEventHandler, ITransientDependency
+    public class ProductInventoryReductionEventHandler : IProductInventoryReductionEventHandler, ITransientDependency
     {
         private readonly IClock _clock;
         private readonly ICurrentTenant _currentTenant;
         private readonly IOrderRepository _orderRepository;
 
-        public OrderProductInventoryReductionEventHandler(
+        public ProductInventoryReductionEventHandler(
             IClock clock,
             ICurrentTenant currentTenant,
             IOrderRepository orderRepository)

modules/EasyAbp.EShop.Orders/src/EasyAbp.EShop.Orders.Domain/EasyAbp/EShop/Orders/Orders/OrderRefundCompletedEventHandler.cs → modules/EasyAbp.EShop.Orders/src/EasyAbp.EShop.Orders.Domain/EasyAbp/EShop/Orders/Orders/RefundCompletedEventHandler.cs

@@ -8,12 +8,12 @@ using Volo.Abp.Uow;
 
 namespace EasyAbp.EShop.Orders.Orders
 {
-    public class OrderRefundCompletedEventHandler : IDistributedEventHandler<OrderRefundCompletedEto>, ITransientDependency
+    public class RefundCompletedEventHandler : IDistributedEventHandler<EShopRefundCompletedEto>, ITransientDependency
     {
         private readonly ICurrentTenant _currentTenant;
         private readonly IOrderRepository _orderRepository;
 
-        public OrderRefundCompletedEventHandler(
+        public RefundCompletedEventHandler(
             ICurrentTenant currentTenant,
             IOrderRepository orderRepository)
         {
@@ -22,7 +22,7 @@ namespace EasyAbp.EShop.Orders.Orders
         }
         
         [UnitOfWork(true)]
-        public virtual async Task HandleEventAsync(OrderRefundCompletedEto eventData)
+        public virtual async Task HandleEventAsync(EShopRefundCompletedEto eventData)
         {
             using var changeTenant = _currentTenant.Change(eventData.Refund.TenantId);
 

modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.Application.Contracts/EasyAbp/EShop/Payments/Payments/OrderPaymentAlreadyExistsException.cs → modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.Application.Contracts/EasyAbp/EShop/Payments/Payments/PaymentAlreadyExistsException.cs

@@ -3,9 +3,9 @@ using Volo.Abp;
 
 namespace EasyAbp.EShop.Payments.Payments
 {
-    public class EShopPaymentAlreadyExistsException : BusinessException
+    public class PaymentAlreadyExistsException : BusinessException
     {
-        public EShopPaymentAlreadyExistsException(Guid orderId)
+        public PaymentAlreadyExistsException(Guid orderId)
             : base(message: $"The order {orderId}'s payment is already exists.")
         {
         }

modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.Application/EasyAbp/EShop/Payments/Payments/BasicPayableCheckProvider.cs

@@ -14,7 +14,7 @@ namespace EasyAbp.EShop.Payments.Payments
         {
             foreach (var order in orders.Where(order => order.PaymentId.HasValue || order.PaidTime.HasValue))
             {
-                throw new EShopPaymentAlreadyExistsException(order.Id);
+                throw new PaymentAlreadyExistsException(order.Id);
             }
 
             if (orders.Select(order => order.Currency).Distinct().Count() != 1)

modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.Domain.Shared/EasyAbp/EShop/Payments/Refunds/EShopRefundCompletedEto.cs

@@ -0,0 +1,7 @@
+namespace EasyAbp.EShop.Payments.Refunds
+{
+    public class EShopRefundCompletedEto
+    {
+        public EShopRefundEto Refund { get; set; }
+    }
+}

modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.Domain.Shared/EasyAbp/EShop/Payments/Refunds/OrderRefundEto.cs → modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.Domain.Shared/EasyAbp/EShop/Payments/Refunds/EShopRefundEto.cs

@@ -7,7 +7,7 @@ using Volo.Abp.MultiTenancy;
 namespace EasyAbp.EShop.Payments.Refunds
 {
     [Serializable]
-    public class OrderRefundEto : IRefund, IMultiTenant, IHasExtraProperties
+    public class EShopRefundEto : IRefund, IMultiTenant, IHasExtraProperties
     {
         #region Base properties
 
@@ -39,6 +39,6 @@ namespace EasyAbp.EShop.Payments.Refunds
         
         #endregion
 
-        public List<OrderRefundItemEto> RefundItems { get; set; } = new List<OrderRefundItemEto>();
+        public List<EShopRefundItemEto> RefundItems { get; set; } = new List<EShopRefundItemEto>();
     }
 }

modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.Domain.Shared/EasyAbp/EShop/Payments/Refunds/OrderRefundItemEto.cs → modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.Domain.Shared/EasyAbp/EShop/Payments/Refunds/EShopRefundItemEto.cs

@@ -6,7 +6,7 @@ using Volo.Abp.Data;
 namespace EasyAbp.EShop.Payments.Refunds
 {
     [Serializable]
-    public class OrderRefundItemEto : IRefundItem, IHasExtraProperties
+    public class EShopRefundItemEto : IRefundItem, IHasExtraProperties
     {
         #region Base properties
 

modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.Domain.Shared/EasyAbp/EShop/Payments/Refunds/OrderRefundCompletedEto.cs

@@ -1,7 +0,0 @@
-namespace EasyAbp.EShop.Payments.Refunds
-{
-    public class OrderRefundCompletedEto
-    {
-        public OrderRefundEto Refund { get; set; }
-    }
-}

modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.Domain/EasyAbp/EShop/Payments/EShopPaymentsDomainModule.cs

@@ -20,7 +20,7 @@ namespace EasyAbp.EShop.Payments
             Configure<AbpDistributedEntityEventOptions>(options =>
             {
                 options.EtoMappings.Add<Payment, EShopPaymentEto>(typeof(EShopPaymentsDomainModule));
-                options.EtoMappings.Add<Refund, OrderRefundEto>(typeof(EShopPaymentsDomainModule));
+                options.EtoMappings.Add<Refund, EShopRefundEto>(typeof(EShopPaymentsDomainModule));
                 
                 options.AutoEventSelectors.Add<Payment>();
                 options.AutoEventSelectors.Add<Refund>();

modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.Domain/EasyAbp/EShop/Payments/PaymentsDomainAutoMapperProfile.cs

@@ -28,8 +28,8 @@ namespace EasyAbp.EShop.Payments
             
             CreateMap<Payment, EShopPaymentEto>();
             CreateMap<PaymentItem, EShopPaymentItemEto>();
-            CreateMap<Refund, OrderRefundEto>();
+            CreateMap<Refund, EShopRefundEto>();
-            CreateMap<RefundItem, OrderRefundItemEto>();
+            CreateMap<RefundItem, EShopRefundItemEto>();
             CreateMap<RefundItemOrderLine, RefundItemOrderLineEto>();
         }
     }

modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.Domain/EasyAbp/EShop/Payments/Refunds/RefundSynchronizer.cs

@@ -89,8 +89,8 @@ namespace EasyAbp.EShop.Payments.Refunds
             if (refund.CompletedTime.HasValue)
             {
                 _unitOfWorkManager.Current.OnCompleted(async () =>
-                    await _distributedEventBus.PublishAsync(new OrderRefundCompletedEto
+                    await _distributedEventBus.PublishAsync(new EShopRefundCompletedEto
-                        {Refund = _objectMapper.Map<Refund, OrderRefundEto>(refund)}));
+                        {Refund = _objectMapper.Map<Refund, EShopRefundEto>(refund)}));
             }
         }
 
@@ -109,8 +109,8 @@ namespace EasyAbp.EShop.Payments.Refunds
             if (eventData.Entity.CompletedTime.HasValue && !refund.CompletedTime.HasValue)
             {
                 _unitOfWorkManager.Current.OnCompleted(async () =>
-                    await _distributedEventBus.PublishAsync(new OrderRefundCompletedEto
+                    await _distributedEventBus.PublishAsync(new EShopRefundCompletedEto
-                        {Refund = _objectMapper.Map<Refund, OrderRefundEto>(refund)}));
+                        {Refund = _objectMapper.Map<Refund, EShopRefundEto>(refund)}));
             }
                 
             _objectMapper.Map(eventData.Entity, refund);