diff --git a/services/payment/src/EShopOnAbp.PaymentService.Application/PaymentServices/DemoPaymentMethod.cs b/services/payment/src/EShopOnAbp.PaymentService.Application/PaymentMethods/DemoPaymentMethod.cs similarity index 94% rename from services/payment/src/EShopOnAbp.PaymentService.Application/PaymentServices/DemoPaymentMethod.cs rename to services/payment/src/EShopOnAbp.PaymentService.Application/PaymentMethods/DemoPaymentMethod.cs index 46c8e24d..131e1f9c 100644 --- a/services/payment/src/EShopOnAbp.PaymentService.Application/PaymentServices/DemoPaymentMethod.cs +++ b/services/payment/src/EShopOnAbp.PaymentService.Application/PaymentMethods/DemoPaymentMethod.cs @@ -3,7 +3,7 @@ using System.Threading.Tasks; using EShopOnAbp.PaymentService.PaymentRequests; using Volo.Abp.DependencyInjection; -namespace EShopOnAbp.PaymentService.PaymentServices; +namespace EShopOnAbp.PaymentService.PaymentMethods; [ExposeServices(typeof(IPaymentMethod), typeof(DemoPaymentMethod))] public class DemoPaymentMethod : IPaymentMethod diff --git a/services/payment/src/EShopOnAbp.PaymentService.Application/PaymentServices/IPaymentMethod.cs b/services/payment/src/EShopOnAbp.PaymentService.Application/PaymentMethods/IPaymentMethod.cs similarity index 89% rename from services/payment/src/EShopOnAbp.PaymentService.Application/PaymentServices/IPaymentMethod.cs rename to services/payment/src/EShopOnAbp.PaymentService.Application/PaymentMethods/IPaymentMethod.cs index 16d1ed6c..d38285ef 100644 --- a/services/payment/src/EShopOnAbp.PaymentService.Application/PaymentServices/IPaymentMethod.cs +++ b/services/payment/src/EShopOnAbp.PaymentService.Application/PaymentMethods/IPaymentMethod.cs @@ -2,7 +2,7 @@ using EShopOnAbp.PaymentService.PaymentRequests; using Volo.Abp.DependencyInjection; -namespace EShopOnAbp.PaymentService.PaymentServices; +namespace EShopOnAbp.PaymentService.PaymentMethods; public interface IPaymentMethod : ITransientDependency { diff --git a/services/payment/src/EShopOnAbp.PaymentService.Application/PaymentServices/PaymentMethodResolver.cs b/services/payment/src/EShopOnAbp.PaymentService.Application/PaymentMethods/PaymentMethodResolver.cs similarity index 84% rename from services/payment/src/EShopOnAbp.PaymentService.Application/PaymentServices/PaymentMethodResolver.cs rename to services/payment/src/EShopOnAbp.PaymentService.Application/PaymentMethods/PaymentMethodResolver.cs index 7973da79..8ec3b072 100644 --- a/services/payment/src/EShopOnAbp.PaymentService.Application/PaymentServices/PaymentMethodResolver.cs +++ b/services/payment/src/EShopOnAbp.PaymentService.Application/PaymentMethods/PaymentMethodResolver.cs @@ -4,7 +4,7 @@ using System.Linq; using Microsoft.Extensions.Logging; using Volo.Abp.DependencyInjection; -namespace EShopOnAbp.PaymentService.PaymentServices; +namespace EShopOnAbp.PaymentService.PaymentMethods; public class PaymentMethodResolver : ITransientDependency { @@ -19,7 +19,7 @@ public class PaymentMethodResolver : ITransientDependency public IPaymentMethod Resolve(int paymentTypeId) { - IPaymentMethod paymentMethod = _paymentMethods.FirstOrDefault(q => q.PaymentTypeId == paymentTypeId); + var paymentMethod = _paymentMethods.FirstOrDefault(q => q.PaymentTypeId == paymentTypeId); if (paymentMethod == null) { _logger.LogError($"Couldn't find Payment method with id:{paymentTypeId}"); diff --git a/services/payment/src/EShopOnAbp.PaymentService.Application/PaymentServices/PaypalMethod.cs b/services/payment/src/EShopOnAbp.PaymentService.Application/PaymentMethods/PaypalMethod.cs similarity index 96% rename from services/payment/src/EShopOnAbp.PaymentService.Application/PaymentServices/PaypalMethod.cs rename to services/payment/src/EShopOnAbp.PaymentService.Application/PaymentMethods/PaypalMethod.cs index c660f112..c584c872 100644 --- a/services/payment/src/EShopOnAbp.PaymentService.Application/PaymentServices/PaypalMethod.cs +++ b/services/payment/src/EShopOnAbp.PaymentService.Application/PaymentMethods/PaypalMethod.cs @@ -8,7 +8,7 @@ using PayPalCheckoutSdk.Core; using PayPalCheckoutSdk.Orders; using Volo.Abp.DependencyInjection; -namespace EShopOnAbp.PaymentService.PaymentServices; +namespace EShopOnAbp.PaymentService.PaymentMethods; [ExposeServices(typeof(IPaymentMethod), typeof(PaypalMethod))] public class PaypalMethod : IPaymentMethod @@ -76,7 +76,7 @@ public class PaypalMethod : IPaymentMethod request.Prefer("return=representation"); request.RequestBody(order); - Order result = (await _payPalHttpClient.Execute(request)).Result(); + var result = (await _payPalHttpClient.Execute(request)).Result(); return new PaymentRequestStartResultDto { diff --git a/services/payment/src/EShopOnAbp.PaymentService.Application/PaymentRequests/PaymentRequestAppService.cs b/services/payment/src/EShopOnAbp.PaymentService.Application/PaymentRequests/PaymentRequestAppService.cs index 15b62860..59058e3c 100644 --- a/services/payment/src/EShopOnAbp.PaymentService.Application/PaymentRequests/PaymentRequestAppService.cs +++ b/services/payment/src/EShopOnAbp.PaymentService.Application/PaymentRequests/PaymentRequestAppService.cs @@ -4,7 +4,7 @@ using PayPalCheckoutSdk.Orders; using System; using System.Linq; using System.Threading.Tasks; -using EShopOnAbp.PaymentService.PaymentServices; +using EShopOnAbp.PaymentService.PaymentMethods; namespace EShopOnAbp.PaymentService.PaymentRequests { diff --git a/services/payment/src/EShopOnAbp.PaymentService.Application/PaymentServiceApplicationModule.cs b/services/payment/src/EShopOnAbp.PaymentService.Application/PaymentServiceApplicationModule.cs index f0b21e0f..f2dcfb15 100644 --- a/services/payment/src/EShopOnAbp.PaymentService.Application/PaymentServiceApplicationModule.cs +++ b/services/payment/src/EShopOnAbp.PaymentService.Application/PaymentServiceApplicationModule.cs @@ -7,8 +7,8 @@ using EShopOnAbp.PaymentService.PayPal; using PayPalCheckoutSdk.Core; using System; using EShopOnAbp.PaymentService.PaymentRequests; -using EShopOnAbp.PaymentService.PaymentServices; using Microsoft.Extensions.Logging; +using EShopOnAbp.PaymentService.PaymentMethods; namespace EShopOnAbp.PaymentService {