From eb381966ad30deb8c0455bbbf04ee89502280b83 Mon Sep 17 00:00:00 2001 From: gdlcf88 <47396430@qq.com> Date: Mon, 18 May 2020 03:32:45 +0800 Subject: [PATCH] Close #35: Use EasyAbp.PaymentService --- modules/EasyAbp.EShop.Baskets/common.props | 2 +- modules/EasyAbp.EShop.Orders/common.props | 2 +- .../IOrderPaymentCompletedEventHandler.cs | 2 +- .../IOrderPaymentCreatedEventHandler.cs | 2 +- .../OrderPaymentCompletedEventHandler.cs | 2 +- .../Orders/OrderPaymentCreatedEventHandler.cs | 2 +- modules/EasyAbp.EShop.Payments/common.props | 2 +- ...Shop.Payments.Application.Contracts.csproj | 1 + .../PaymentsPermissionDefinitionProvider.cs | 12 +- .../Authorization/PaymentsPermissions.cs | 16 - ...EShopPaymentsApplicationContractsModule.cs | 6 +- .../Payments/Dtos/CreatePaymentDto.cs | 20 - .../Payments/Dtos/CreatePaymentItemDto.cs | 19 - .../Payments/Payments/Dtos/PaymentDto.cs | 29 - .../Payments/Payments/Dtos/PaymentItemDto.cs | 22 - .../Payments/Payments/IPaymentAppService.cs | 18 - .../Payments/Refunds/Dtos/CreateRefundDto.cs | 31 - .../EShop/Payments/Refunds/Dtos/RefundDto.cs | 24 - .../Payments/Refunds/IRefundAppService.cs | 18 - .../EasyAbp.EShop.Payments.Application.csproj | 1 + .../EShopPaymentsApplicationModule.cs | 6 +- .../Payments/Payments/IPaymentAuthorizer.cs | 11 - .../MultiCurrencyNotSupportedException.cs | 13 - .../Payments/Payments/PaymentAppService.cs | 123 - .../PaymentItemNotPayableException.cs | 19 - .../EShop/Payments/PaymentsAppService.cs | 14 - .../PaymentsApplicationAutoMapperProfile.cs | 9 - .../Payments/Refunds/RefundAppService.cs | 18 - .../Payments/EShopOrderPaymentAuthorizer.cs | 4 +- ...asyAbp.EShop.Payments.Domain.Shared.csproj | 1 + .../EShopPaymentsDomainSharedModule.cs | 4 +- .../Payments/Localization/Payments/cs.json | 42 - .../Payments/Localization/Payments/en.json | 44 +- .../Payments/Localization/Payments/pl.json | 42 - .../Payments/Localization/Payments/pt-BR.json | 42 - .../Payments/Localization/Payments/sl.json | 44 +- .../Payments/Localization/Payments/tr.json | 44 +- .../Payments/Localization/Payments/vi.json | 42 - .../Localization/Payments/zh-Hans.json | 44 +- .../Localization/Payments/zh-Hant.json | 44 +- .../EShop/Payments/Payments/PaymentEto.cs | 33 - .../EShop/Payments/Payments/PaymentItemEto.cs | 24 - .../EasyAbp.EShop.Payments.Domain.csproj | 1 + .../Payments/EShopPaymentsDomainModule.cs | 25 +- .../Payments/CurrencyNotSupportedException.cs | 18 - .../Payments/FreePaymentServiceProvider.cs | 36 - .../Payments/IPaymentPayeeAccountProvider.cs | 10 - .../Payments/Payments/IPaymentRepository.cs | 9 - .../Payments/IPaymentServiceProvider.cs | 12 - .../Payments/IPaymentServiceResolver.cs | 15 - .../Payments/PayeeAccountNotFoundException.cs | 12 - ...PayeeConfigurationMissingValueException.cs | 12 - .../EShop/Payments/Payments/Payment.cs | 99 - ...PaymentHasAlreadyBeenCompletedException.cs | 13 - .../EShop/Payments/Payments/PaymentItem.cs | 53 - .../Payments/PaymentPayeeAccountProvider.cs | 36 - .../Payments/PaymentServiceResolver.cs | 51 - .../Payments/UnknownPaymentMethodException.cs | 12 - .../PaymentsDomainAutoMapperProfile.cs | 3 - .../Payments/Refunds/IRefundRepository.cs | 9 - .../EasyAbp/EShop/Payments/Refunds/Refund.cs | 62 - .../PaymentsSettingDefinitionProvider.cs | 4 - .../Payments/Settings/PaymentsSettings.cs | 8 - ....EShop.Payments.EntityFrameworkCore.csproj | 1 + .../EShopPaymentsEntityFrameworkCoreModule.cs | 8 +- .../EntityFrameworkCore/IPaymentsDbContext.cs | 6 - .../EntityFrameworkCore/PaymentsDbContext.cs | 5 - ...aymentsDbContextModelCreatingExtensions.cs | 38 +- .../Payments/Payments/PaymentRepository.cs | 21 - .../Payments/Refunds/RefundRepository.cs | 14 - ...syAbp.EShop.Payments.HttpApi.Client.csproj | 1 + .../EShopPaymentsHttpApiClientModule.cs | 7 +- .../EasyAbp.EShop.Payments.HttpApi.csproj | 1 + .../Payments/EShopPaymentsHttpApiModule.cs | 5 +- .../EasyAbp.EShop.Payments.MongoDB.csproj | 1 + .../MongoDB/EShopPaymentsMongoDbModule.cs | 8 +- .../EShopPaymentsWebModule.cs | 6 +- .../EasyAbp.EShop.Payments.Web.csproj | 4 + .../Payments/Payments/Payment/Index.cshtml | 46 - .../Payments/Payments/Payment/Index.cshtml.cs | 12 - .../EShop/Payments/Payments/Payment/index.css | 0 .../EShop/Payments/Payments/Payment/index.js | 39 - .../Payments/PaymentOrder/Index.cshtml | 51 - .../Payments/PaymentOrder/Index.cshtml.cs | 12 - .../Payments/Payments/PaymentOrder/index.css | 0 .../Payments/Payments/PaymentOrder/index.js | 26 - .../Payments/Refunds/Refund/Index.cshtml | 47 - .../Payments/Refunds/Refund/Index.cshtml.cs | 12 - .../EShop/Payments/Refunds/Refund/index.css | 0 .../EShop/Payments/Refunds/Refund/index.js | 39 - .../PaymentsMenuContributor.cs | 26 - .../PaymentsWebAutoMapperProfile.cs | 5 - .../Payments/PaymentAppServiceTests.cs | 26 - .../Refunds/RefundAppServiceTests.cs | 26 - .../Payments/PaymentDomainTests.cs | 23 - .../Refunds/RefundDomainTests.cs | 23 - .../Payments/PaymentRepositoryTests.cs | 31 - .../Refunds/RefundRepositoryTests.cs | 31 - modules/EasyAbp.EShop.Products/common.props | 2 +- modules/EasyAbp.EShop.Stores/common.props | 2 +- nupkg/common.ps1 | 10 - samples/EasyMall/aspnet-core/EasyMall.sln | 117 - .../EasyMall.Application.Contracts.csproj | 2 +- .../EasyMallApplicationContractsModule.cs | 6 +- .../EasyMall.Application.csproj | 2 +- .../EasyMallApplicationModule.cs | 6 +- .../EasyMall.Domain.Shared.csproj | 2 +- .../EasyMallDomainSharedModule.cs | 8 +- .../EasyMall.Domain/EasyMall.Domain.csproj | 2 +- .../EasyMall.Domain/EasyMallDomainModule.cs | 11 +- ...ll.EntityFrameworkCore.DbMigrations.csproj | 7 + .../EasyMallMigrationsDbContext.cs | 3 + ...61833_UsedPaymentServiceModule.Designer.cs | 2900 +++++++++++++++++ ...20200517161833_UsedPaymentServiceModule.cs | 226 ++ ...asyMallMigrationsDbContextModelSnapshot.cs | 472 +-- .../EasyMall.EntityFrameworkCore.csproj | 2 +- .../EasyMallEntityFrameworkCoreModule.cs | 8 +- .../EasyMall.HttpApi.Client.csproj | 2 +- .../EasyMallHttpApiClientModule.cs | 5 +- .../EasyMall.HttpApi/EasyMall.HttpApi.csproj | 2 +- .../EasyMall.HttpApi/EasyMallHttpApiModule.cs | 8 +- .../src/EasyMall.Web/EasyMall.Web.csproj | 2 +- .../src/EasyMall.Web/EasyMallWebModule.cs | 19 +- 123 files changed, 3485 insertions(+), 2340 deletions(-) delete mode 100644 modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.Application.Contracts/EasyAbp/EShop/Payments/Payments/Dtos/CreatePaymentDto.cs delete mode 100644 modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.Application.Contracts/EasyAbp/EShop/Payments/Payments/Dtos/CreatePaymentItemDto.cs delete mode 100644 modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.Application.Contracts/EasyAbp/EShop/Payments/Payments/Dtos/PaymentDto.cs delete mode 100644 modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.Application.Contracts/EasyAbp/EShop/Payments/Payments/Dtos/PaymentItemDto.cs delete mode 100644 modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.Application.Contracts/EasyAbp/EShop/Payments/Payments/IPaymentAppService.cs delete mode 100644 modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.Application.Contracts/EasyAbp/EShop/Payments/Refunds/Dtos/CreateRefundDto.cs delete mode 100644 modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.Application.Contracts/EasyAbp/EShop/Payments/Refunds/Dtos/RefundDto.cs delete mode 100644 modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.Application.Contracts/EasyAbp/EShop/Payments/Refunds/IRefundAppService.cs delete mode 100644 modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.Application/EasyAbp/EShop/Payments/Payments/IPaymentAuthorizer.cs delete mode 100644 modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.Application/EasyAbp/EShop/Payments/Payments/MultiCurrencyNotSupportedException.cs delete mode 100644 modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.Application/EasyAbp/EShop/Payments/Payments/PaymentAppService.cs delete mode 100644 modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.Application/EasyAbp/EShop/Payments/Payments/PaymentItemNotPayableException.cs delete mode 100644 modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.Application/EasyAbp/EShop/Payments/PaymentsAppService.cs delete mode 100644 modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.Application/EasyAbp/EShop/Payments/Refunds/RefundAppService.cs rename modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.Application/EasyAbp/{EShop/Payments => PaymentService}/Payments/EShopOrderPaymentAuthorizer.cs (94%) delete mode 100644 modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.Domain.Shared/EasyAbp/EShop/Payments/Payments/PaymentEto.cs delete mode 100644 modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.Domain.Shared/EasyAbp/EShop/Payments/Payments/PaymentItemEto.cs delete mode 100644 modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.Domain/EasyAbp/EShop/Payments/Payments/CurrencyNotSupportedException.cs delete mode 100644 modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.Domain/EasyAbp/EShop/Payments/Payments/FreePaymentServiceProvider.cs delete mode 100644 modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.Domain/EasyAbp/EShop/Payments/Payments/IPaymentPayeeAccountProvider.cs delete mode 100644 modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.Domain/EasyAbp/EShop/Payments/Payments/IPaymentRepository.cs delete mode 100644 modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.Domain/EasyAbp/EShop/Payments/Payments/IPaymentServiceProvider.cs delete mode 100644 modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.Domain/EasyAbp/EShop/Payments/Payments/IPaymentServiceResolver.cs delete mode 100644 modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.Domain/EasyAbp/EShop/Payments/Payments/PayeeAccountNotFoundException.cs delete mode 100644 modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.Domain/EasyAbp/EShop/Payments/Payments/PayeeConfigurationMissingValueException.cs delete mode 100644 modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.Domain/EasyAbp/EShop/Payments/Payments/Payment.cs delete mode 100644 modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.Domain/EasyAbp/EShop/Payments/Payments/PaymentHasAlreadyBeenCompletedException.cs delete mode 100644 modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.Domain/EasyAbp/EShop/Payments/Payments/PaymentItem.cs delete mode 100644 modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.Domain/EasyAbp/EShop/Payments/Payments/PaymentPayeeAccountProvider.cs delete mode 100644 modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.Domain/EasyAbp/EShop/Payments/Payments/PaymentServiceResolver.cs delete mode 100644 modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.Domain/EasyAbp/EShop/Payments/Payments/UnknownPaymentMethodException.cs delete mode 100644 modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.Domain/EasyAbp/EShop/Payments/Refunds/IRefundRepository.cs delete mode 100644 modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.Domain/EasyAbp/EShop/Payments/Refunds/Refund.cs delete mode 100644 modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.EntityFrameworkCore/EasyAbp/EShop/Payments/Payments/PaymentRepository.cs delete mode 100644 modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.EntityFrameworkCore/EasyAbp/EShop/Payments/Refunds/RefundRepository.cs delete mode 100644 modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.Web/Pages/EShop/Payments/Payments/Payment/Index.cshtml delete mode 100644 modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.Web/Pages/EShop/Payments/Payments/Payment/Index.cshtml.cs delete mode 100644 modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.Web/Pages/EShop/Payments/Payments/Payment/index.css delete mode 100644 modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.Web/Pages/EShop/Payments/Payments/Payment/index.js delete mode 100644 modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.Web/Pages/EShop/Payments/Payments/PaymentOrder/Index.cshtml delete mode 100644 modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.Web/Pages/EShop/Payments/Payments/PaymentOrder/Index.cshtml.cs delete mode 100644 modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.Web/Pages/EShop/Payments/Payments/PaymentOrder/index.css delete mode 100644 modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.Web/Pages/EShop/Payments/Payments/PaymentOrder/index.js delete mode 100644 modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.Web/Pages/EShop/Payments/Refunds/Refund/Index.cshtml delete mode 100644 modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.Web/Pages/EShop/Payments/Refunds/Refund/Index.cshtml.cs delete mode 100644 modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.Web/Pages/EShop/Payments/Refunds/Refund/index.css delete mode 100644 modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.Web/Pages/EShop/Payments/Refunds/Refund/index.js delete mode 100644 modules/EasyAbp.EShop.Payments/test/EasyAbp.EShop.Payments.Application.Tests/Payments/PaymentAppServiceTests.cs delete mode 100644 modules/EasyAbp.EShop.Payments/test/EasyAbp.EShop.Payments.Application.Tests/Refunds/RefundAppServiceTests.cs delete mode 100644 modules/EasyAbp.EShop.Payments/test/EasyAbp.EShop.Payments.Domain.Tests/Payments/PaymentDomainTests.cs delete mode 100644 modules/EasyAbp.EShop.Payments/test/EasyAbp.EShop.Payments.Domain.Tests/Refunds/RefundDomainTests.cs delete mode 100644 modules/EasyAbp.EShop.Payments/test/EasyAbp.EShop.Payments.EntityFrameworkCore.Tests/EntityFrameworkCore/Payments/PaymentRepositoryTests.cs delete mode 100644 modules/EasyAbp.EShop.Payments/test/EasyAbp.EShop.Payments.EntityFrameworkCore.Tests/EntityFrameworkCore/Refunds/RefundRepositoryTests.cs create mode 100644 samples/EasyMall/aspnet-core/src/EasyMall.EntityFrameworkCore.DbMigrations/Migrations/20200517161833_UsedPaymentServiceModule.Designer.cs create mode 100644 samples/EasyMall/aspnet-core/src/EasyMall.EntityFrameworkCore.DbMigrations/Migrations/20200517161833_UsedPaymentServiceModule.cs diff --git a/modules/EasyAbp.EShop.Baskets/common.props b/modules/EasyAbp.EShop.Baskets/common.props index 1063201e..c93ee579 100644 --- a/modules/EasyAbp.EShop.Baskets/common.props +++ b/modules/EasyAbp.EShop.Baskets/common.props @@ -1,7 +1,7 @@ latest - 0.1.11 + 0.1.12 $(NoWarn);CS1591 true EasyAbp Team diff --git a/modules/EasyAbp.EShop.Orders/common.props b/modules/EasyAbp.EShop.Orders/common.props index 1063201e..c93ee579 100644 --- a/modules/EasyAbp.EShop.Orders/common.props +++ b/modules/EasyAbp.EShop.Orders/common.props @@ -1,7 +1,7 @@ latest - 0.1.11 + 0.1.12 $(NoWarn);CS1591 true EasyAbp Team diff --git a/modules/EasyAbp.EShop.Orders/src/EasyAbp.EShop.Orders.Domain/EasyAbp/EShop/Orders/Orders/IOrderPaymentCompletedEventHandler.cs b/modules/EasyAbp.EShop.Orders/src/EasyAbp.EShop.Orders.Domain/EasyAbp/EShop/Orders/Orders/IOrderPaymentCompletedEventHandler.cs index 3dac937a..fece792f 100644 --- a/modules/EasyAbp.EShop.Orders/src/EasyAbp.EShop.Orders.Domain/EasyAbp/EShop/Orders/Orders/IOrderPaymentCompletedEventHandler.cs +++ b/modules/EasyAbp.EShop.Orders/src/EasyAbp.EShop.Orders.Domain/EasyAbp/EShop/Orders/Orders/IOrderPaymentCompletedEventHandler.cs @@ -1,4 +1,4 @@ -using EasyAbp.EShop.Payments.Payments; +using EasyAbp.PaymentService.Payments; using Volo.Abp.Domain.Entities.Events.Distributed; using Volo.Abp.EventBus.Distributed; diff --git a/modules/EasyAbp.EShop.Orders/src/EasyAbp.EShop.Orders.Domain/EasyAbp/EShop/Orders/Orders/IOrderPaymentCreatedEventHandler.cs b/modules/EasyAbp.EShop.Orders/src/EasyAbp.EShop.Orders.Domain/EasyAbp/EShop/Orders/Orders/IOrderPaymentCreatedEventHandler.cs index c1b716bb..c15f8b9f 100644 --- a/modules/EasyAbp.EShop.Orders/src/EasyAbp.EShop.Orders.Domain/EasyAbp/EShop/Orders/Orders/IOrderPaymentCreatedEventHandler.cs +++ b/modules/EasyAbp.EShop.Orders/src/EasyAbp.EShop.Orders.Domain/EasyAbp/EShop/Orders/Orders/IOrderPaymentCreatedEventHandler.cs @@ -1,4 +1,4 @@ -using EasyAbp.EShop.Payments.Payments; +using EasyAbp.PaymentService.Payments; using Volo.Abp.Domain.Entities.Events.Distributed; using Volo.Abp.EventBus.Distributed; diff --git a/modules/EasyAbp.EShop.Orders/src/EasyAbp.EShop.Orders.Domain/EasyAbp/EShop/Orders/Orders/OrderPaymentCompletedEventHandler.cs b/modules/EasyAbp.EShop.Orders/src/EasyAbp.EShop.Orders.Domain/EasyAbp/EShop/Orders/Orders/OrderPaymentCompletedEventHandler.cs index bf5bad74..c1f6a386 100644 --- a/modules/EasyAbp.EShop.Orders/src/EasyAbp.EShop.Orders.Domain/EasyAbp/EShop/Orders/Orders/OrderPaymentCompletedEventHandler.cs +++ b/modules/EasyAbp.EShop.Orders/src/EasyAbp.EShop.Orders.Domain/EasyAbp/EShop/Orders/Orders/OrderPaymentCompletedEventHandler.cs @@ -1,6 +1,6 @@ using System.Linq; using System.Threading.Tasks; -using EasyAbp.EShop.Payments.Payments; +using EasyAbp.PaymentService.Payments; using Volo.Abp.DependencyInjection; using Volo.Abp.Domain.Entities.Events.Distributed; using Volo.Abp.MultiTenancy; diff --git a/modules/EasyAbp.EShop.Orders/src/EasyAbp.EShop.Orders.Domain/EasyAbp/EShop/Orders/Orders/OrderPaymentCreatedEventHandler.cs b/modules/EasyAbp.EShop.Orders/src/EasyAbp.EShop.Orders.Domain/EasyAbp/EShop/Orders/Orders/OrderPaymentCreatedEventHandler.cs index 7cbcbe3e..01e1d5b7 100644 --- a/modules/EasyAbp.EShop.Orders/src/EasyAbp.EShop.Orders.Domain/EasyAbp/EShop/Orders/Orders/OrderPaymentCreatedEventHandler.cs +++ b/modules/EasyAbp.EShop.Orders/src/EasyAbp.EShop.Orders.Domain/EasyAbp/EShop/Orders/Orders/OrderPaymentCreatedEventHandler.cs @@ -1,6 +1,6 @@ using System.Linq; using System.Threading.Tasks; -using EasyAbp.EShop.Payments.Payments; +using EasyAbp.PaymentService.Payments; using Volo.Abp.DependencyInjection; using Volo.Abp.Domain.Entities.Events.Distributed; using Volo.Abp.MultiTenancy; diff --git a/modules/EasyAbp.EShop.Payments/common.props b/modules/EasyAbp.EShop.Payments/common.props index 1063201e..c93ee579 100644 --- a/modules/EasyAbp.EShop.Payments/common.props +++ b/modules/EasyAbp.EShop.Payments/common.props @@ -1,7 +1,7 @@ latest - 0.1.11 + 0.1.12 $(NoWarn);CS1591 true EasyAbp Team diff --git a/modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.Application.Contracts/EasyAbp.EShop.Payments.Application.Contracts.csproj b/modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.Application.Contracts/EasyAbp.EShop.Payments.Application.Contracts.csproj index 1525bdf7..c9794137 100644 --- a/modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.Application.Contracts/EasyAbp.EShop.Payments.Application.Contracts.csproj +++ b/modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.Application.Contracts/EasyAbp.EShop.Payments.Application.Contracts.csproj @@ -8,6 +8,7 @@ + diff --git a/modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.Application.Contracts/EasyAbp/EShop/Payments/Authorization/PaymentsPermissionDefinitionProvider.cs b/modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.Application.Contracts/EasyAbp/EShop/Payments/Authorization/PaymentsPermissionDefinitionProvider.cs index 3285e4bb..ed8d7e1f 100644 --- a/modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.Application.Contracts/EasyAbp/EShop/Payments/Authorization/PaymentsPermissionDefinitionProvider.cs +++ b/modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.Application.Contracts/EasyAbp/EShop/Payments/Authorization/PaymentsPermissionDefinitionProvider.cs @@ -8,17 +8,7 @@ namespace EasyAbp.EShop.Payments.Authorization { public override void Define(IPermissionDefinitionContext context) { - var moduleGroup = context.AddGroup(PaymentsPermissions.GroupName, L("Permission:Payments")); - - var payment = moduleGroup.AddPermission(PaymentsPermissions.Payments.Default, L("Permission:Payment")); - payment.AddChild(PaymentsPermissions.Payments.Manage, L("Permission:Manage")); - payment.AddChild(PaymentsPermissions.Payments.CrossStore, L("Permission:CrossStore")); - payment.AddChild(PaymentsPermissions.Payments.Create, L("Permission:Create")); - - var refund = moduleGroup.AddPermission(PaymentsPermissions.Refunds.Default, L("Permission:Refund")); - refund.AddChild(PaymentsPermissions.Refunds.Manage, L("Permission:Manage")); - refund.AddChild(PaymentsPermissions.Refunds.CrossStore, L("Permission:CrossStore")); - refund.AddChild(PaymentsPermissions.Refunds.Create, L("Permission:Create")); + // var moduleGroup = context.AddGroup(PaymentsPermissions.GroupName, L("Permission:Payments")); } private static LocalizableString L(string name) diff --git a/modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.Application.Contracts/EasyAbp/EShop/Payments/Authorization/PaymentsPermissions.cs b/modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.Application.Contracts/EasyAbp/EShop/Payments/Authorization/PaymentsPermissions.cs index 6805385a..833c28f4 100644 --- a/modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.Application.Contracts/EasyAbp/EShop/Payments/Authorization/PaymentsPermissions.cs +++ b/modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.Application.Contracts/EasyAbp/EShop/Payments/Authorization/PaymentsPermissions.cs @@ -10,21 +10,5 @@ namespace EasyAbp.EShop.Payments.Authorization { return ReflectionHelper.GetPublicConstantsRecursively(typeof(PaymentsPermissions)); } - - public class Payments - { - public const string Default = GroupName + ".Payment"; - public const string Manage = Default + ".Manage"; - public const string CrossStore = Default + ".CrossStore"; - public const string Create = Default + ".Create"; - } - - public class Refunds - { - public const string Default = GroupName + ".Refund"; - public const string Manage = Default + ".Manage"; - public const string CrossStore = Default + ".CrossStore"; - public const string Create = Default + ".Create"; - } } } \ No newline at end of file diff --git a/modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.Application.Contracts/EasyAbp/EShop/Payments/EShopPaymentsApplicationContractsModule.cs b/modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.Application.Contracts/EasyAbp/EShop/Payments/EShopPaymentsApplicationContractsModule.cs index d51433d8..1ba4d9f1 100644 --- a/modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.Application.Contracts/EasyAbp/EShop/Payments/EShopPaymentsApplicationContractsModule.cs +++ b/modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.Application.Contracts/EasyAbp/EShop/Payments/EShopPaymentsApplicationContractsModule.cs @@ -1,4 +1,5 @@ -using Volo.Abp.Application; +using EasyAbp.PaymentService; +using Volo.Abp.Application; using Volo.Abp.Modularity; using Volo.Abp.VirtualFileSystem; using Volo.Abp.Authorization; @@ -8,7 +9,8 @@ namespace EasyAbp.EShop.Payments [DependsOn( typeof(EShopPaymentsDomainSharedModule), typeof(AbpDddApplicationContractsModule), - typeof(AbpAuthorizationModule) + typeof(AbpAuthorizationModule), + typeof(PaymentServiceApplicationContractsModule) )] public class EShopPaymentsApplicationContractsModule : AbpModule { diff --git a/modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.Application.Contracts/EasyAbp/EShop/Payments/Payments/Dtos/CreatePaymentDto.cs b/modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.Application.Contracts/EasyAbp/EShop/Payments/Payments/Dtos/CreatePaymentDto.cs deleted file mode 100644 index a9d5208e..00000000 --- a/modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.Application.Contracts/EasyAbp/EShop/Payments/Payments/Dtos/CreatePaymentDto.cs +++ /dev/null @@ -1,20 +0,0 @@ -using System; -using System.Collections.Generic; -using System.ComponentModel; -namespace EasyAbp.EShop.Payments.Payments.Dtos -{ - public class CreatePaymentDto - { - [DisplayName("PaymentPaymentMethod")] - public string PaymentMethod { get; set; } - - [DisplayName("PaymentCurrency")] - public string Currency { get; set; } - - [DisplayName("PaymentExtraProperties")] - public Dictionary ExtraProperties { get; set; } - - [DisplayName("PaymentItem")] - public List PaymentItems { get; set; } - } -} \ No newline at end of file diff --git a/modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.Application.Contracts/EasyAbp/EShop/Payments/Payments/Dtos/CreatePaymentItemDto.cs b/modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.Application.Contracts/EasyAbp/EShop/Payments/Payments/Dtos/CreatePaymentItemDto.cs deleted file mode 100644 index 2acbc076..00000000 --- a/modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.Application.Contracts/EasyAbp/EShop/Payments/Payments/Dtos/CreatePaymentItemDto.cs +++ /dev/null @@ -1,19 +0,0 @@ -using System; -using System.ComponentModel; -namespace EasyAbp.EShop.Payments.Payments.Dtos -{ - public class CreatePaymentItemDto - { - [DisplayName("PaymentItemItemType")] - public string ItemType { get; set; } - - [DisplayName("PaymentItemItemKey")] - public Guid ItemKey { get; set; } - - [DisplayName("PaymentItemCurrency")] - public string Currency { get; set; } - - [DisplayName("PaymentItemOriginalPaymentAmount")] - public decimal OriginalPaymentAmount { get; set; } - } -} \ No newline at end of file diff --git a/modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.Application.Contracts/EasyAbp/EShop/Payments/Payments/Dtos/PaymentDto.cs b/modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.Application.Contracts/EasyAbp/EShop/Payments/Payments/Dtos/PaymentDto.cs deleted file mode 100644 index 6ed97984..00000000 --- a/modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.Application.Contracts/EasyAbp/EShop/Payments/Payments/Dtos/PaymentDto.cs +++ /dev/null @@ -1,29 +0,0 @@ -using System; -using System.Collections.Generic; -using Volo.Abp.Application.Dtos; - -namespace EasyAbp.EShop.Payments.Payments.Dtos -{ - public class PaymentDto : ExtensibleFullAuditedEntityDto - { - public Guid UserId { get; set; } - - public string PaymentMethod { get; set; } - - public string ExternalTradingCode { get; set; } - - public string Currency { get; set; } - - public decimal OriginalPaymentAmount { get; set; } - - public decimal PaymentDiscount { get; set; } - - public decimal ActualPaymentAmount { get; set; } - - public decimal RefundAmount { get; set; } - - public DateTime? CompletionTime { get; set; } - - public List PaymentItems { get; set; } - } -} \ No newline at end of file diff --git a/modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.Application.Contracts/EasyAbp/EShop/Payments/Payments/Dtos/PaymentItemDto.cs b/modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.Application.Contracts/EasyAbp/EShop/Payments/Payments/Dtos/PaymentItemDto.cs deleted file mode 100644 index dea31a56..00000000 --- a/modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.Application.Contracts/EasyAbp/EShop/Payments/Payments/Dtos/PaymentItemDto.cs +++ /dev/null @@ -1,22 +0,0 @@ -using System; -using Volo.Abp.Application.Dtos; - -namespace EasyAbp.EShop.Payments.Payments.Dtos -{ - public class PaymentItemDto : FullAuditedEntityDto - { - public string ItemType { get; set; } - - public Guid ItemKey { get; set; } - - public string Currency { get; set; } - - public decimal OriginalPaymentAmount { get; set; } - - public decimal PaymentDiscount { get; set; } - - public decimal ActualPaymentAmount { get; set; } - - public decimal RefundAmount { get; set; } - } -} \ No newline at end of file diff --git a/modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.Application.Contracts/EasyAbp/EShop/Payments/Payments/IPaymentAppService.cs b/modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.Application.Contracts/EasyAbp/EShop/Payments/Payments/IPaymentAppService.cs deleted file mode 100644 index c692bee8..00000000 --- a/modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.Application.Contracts/EasyAbp/EShop/Payments/Payments/IPaymentAppService.cs +++ /dev/null @@ -1,18 +0,0 @@ -using System; -using EasyAbp.EShop.Payments.Payments.Dtos; -using Volo.Abp.Application.Dtos; -using Volo.Abp.Application.Services; - -namespace EasyAbp.EShop.Payments.Payments -{ - public interface IPaymentAppService : - ICrudAppService< - PaymentDto, - Guid, - PagedAndSortedResultRequestDto, - CreatePaymentDto, - object> - { - - } -} \ No newline at end of file diff --git a/modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.Application.Contracts/EasyAbp/EShop/Payments/Refunds/Dtos/CreateRefundDto.cs b/modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.Application.Contracts/EasyAbp/EShop/Payments/Refunds/Dtos/CreateRefundDto.cs deleted file mode 100644 index 6830ca29..00000000 --- a/modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.Application.Contracts/EasyAbp/EShop/Payments/Refunds/Dtos/CreateRefundDto.cs +++ /dev/null @@ -1,31 +0,0 @@ -using System; -using System.ComponentModel; -namespace EasyAbp.EShop.Payments.Refunds.Dtos -{ - public class CreateRefundDto - { - [DisplayName("RefundStoreId")] - public Guid StoreId { get; set; } - - [DisplayName("RefundOrderId")] - public Guid OrderId { get; set; } - - [DisplayName("RefundRefundPaymentMethod")] - public string RefundPaymentMethod { get; set; } - - [DisplayName("RefundExternalTradingCode")] - public string ExternalTradingCode { get; set; } - - [DisplayName("RefundCurrency")] - public string Currency { get; set; } - - [DisplayName("RefundRefundAmount")] - public decimal RefundAmount { get; set; } - - [DisplayName("RefundCustomerRemark")] - public string CustomerRemark { get; set; } - - [DisplayName("RefundStaffRemark")] - public string StaffRemark { get; set; } - } -} \ No newline at end of file diff --git a/modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.Application.Contracts/EasyAbp/EShop/Payments/Refunds/Dtos/RefundDto.cs b/modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.Application.Contracts/EasyAbp/EShop/Payments/Refunds/Dtos/RefundDto.cs deleted file mode 100644 index 6dfdc81e..00000000 --- a/modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.Application.Contracts/EasyAbp/EShop/Payments/Refunds/Dtos/RefundDto.cs +++ /dev/null @@ -1,24 +0,0 @@ -using System; -using Volo.Abp.Application.Dtos; - -namespace EasyAbp.EShop.Payments.Refunds.Dtos -{ - public class RefundDto : FullAuditedEntityDto - { - public Guid StoreId { get; set; } - - public Guid OrderId { get; set; } - - public string RefundPaymentMethod { get; set; } - - public string ExternalTradingCode { get; set; } - - public string Currency { get; set; } - - public decimal RefundAmount { get; set; } - - public string CustomerRemark { get; set; } - - public string StaffRemark { get; set; } - } -} \ No newline at end of file diff --git a/modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.Application.Contracts/EasyAbp/EShop/Payments/Refunds/IRefundAppService.cs b/modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.Application.Contracts/EasyAbp/EShop/Payments/Refunds/IRefundAppService.cs deleted file mode 100644 index d7968b37..00000000 --- a/modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.Application.Contracts/EasyAbp/EShop/Payments/Refunds/IRefundAppService.cs +++ /dev/null @@ -1,18 +0,0 @@ -using System; -using EasyAbp.EShop.Payments.Refunds.Dtos; -using Volo.Abp.Application.Dtos; -using Volo.Abp.Application.Services; - -namespace EasyAbp.EShop.Payments.Refunds -{ - public interface IRefundAppService : - ICrudAppService< - RefundDto, - Guid, - PagedAndSortedResultRequestDto, - CreateRefundDto, - object> - { - - } -} \ No newline at end of file diff --git a/modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.Application/EasyAbp.EShop.Payments.Application.csproj b/modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.Application/EasyAbp.EShop.Payments.Application.csproj index 1d9b33ab..7a351eb6 100644 --- a/modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.Application/EasyAbp.EShop.Payments.Application.csproj +++ b/modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.Application/EasyAbp.EShop.Payments.Application.csproj @@ -8,6 +8,7 @@ + diff --git a/modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.Application/EasyAbp/EShop/Payments/EShopPaymentsApplicationModule.cs b/modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.Application/EasyAbp/EShop/Payments/EShopPaymentsApplicationModule.cs index 5ea39432..2efec0eb 100644 --- a/modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.Application/EasyAbp/EShop/Payments/EShopPaymentsApplicationModule.cs +++ b/modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.Application/EasyAbp/EShop/Payments/EShopPaymentsApplicationModule.cs @@ -1,4 +1,5 @@ -using Microsoft.Extensions.DependencyInjection; +using EasyAbp.PaymentService; +using Microsoft.Extensions.DependencyInjection; using Volo.Abp.AutoMapper; using Volo.Abp.Modularity; using Volo.Abp.Application; @@ -9,7 +10,8 @@ namespace EasyAbp.EShop.Payments typeof(EShopPaymentsDomainModule), typeof(EShopPaymentsApplicationContractsModule), typeof(AbpDddApplicationModule), - typeof(AbpAutoMapperModule) + typeof(AbpAutoMapperModule), + typeof(PaymentServiceApplicationModule) )] public class EShopPaymentsApplicationModule : AbpModule { diff --git a/modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.Application/EasyAbp/EShop/Payments/Payments/IPaymentAuthorizer.cs b/modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.Application/EasyAbp/EShop/Payments/Payments/IPaymentAuthorizer.cs deleted file mode 100644 index 57bb1da3..00000000 --- a/modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.Application/EasyAbp/EShop/Payments/Payments/IPaymentAuthorizer.cs +++ /dev/null @@ -1,11 +0,0 @@ -using System.Collections.Generic; -using System.Threading.Tasks; - -namespace EasyAbp.EShop.Payments.Payments -{ - public interface IPaymentAuthorizer - { - Task IsPaymentItemAllowedAsync(Payment payment, PaymentItem paymentItem, - Dictionary inputExtraProperties); - } -} \ No newline at end of file diff --git a/modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.Application/EasyAbp/EShop/Payments/Payments/MultiCurrencyNotSupportedException.cs b/modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.Application/EasyAbp/EShop/Payments/Payments/MultiCurrencyNotSupportedException.cs deleted file mode 100644 index 728c1fd7..00000000 --- a/modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.Application/EasyAbp/EShop/Payments/Payments/MultiCurrencyNotSupportedException.cs +++ /dev/null @@ -1,13 +0,0 @@ -using System; -using System.Collections.Generic; -using Volo.Abp; - -namespace EasyAbp.EShop.Payments.Payments -{ - public class MultiCurrencyNotSupportedException : BusinessException - { - public MultiCurrencyNotSupportedException() : base(message: $"Multi-currency is not supported.") - { - } - } -} \ No newline at end of file diff --git a/modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.Application/EasyAbp/EShop/Payments/Payments/PaymentAppService.cs b/modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.Application/EasyAbp/EShop/Payments/Payments/PaymentAppService.cs deleted file mode 100644 index 63215415..00000000 --- a/modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.Application/EasyAbp/EShop/Payments/Payments/PaymentAppService.cs +++ /dev/null @@ -1,123 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Threading.Tasks; -using EasyAbp.EShop.Payments.Payments.Dtos; -using Microsoft.Extensions.DependencyInjection; -using Volo.Abp; -using Volo.Abp.Application.Dtos; -using Volo.Abp.Application.Services; -using Volo.Abp.Users; - -namespace EasyAbp.EShop.Payments.Payments -{ - public class PaymentAppService : CrudAppService, - IPaymentAppService - { - private readonly IPaymentPayeeAccountProvider _paymentPayeeAccountProvider; - private readonly IPaymentServiceResolver _paymentServiceResolver; - private readonly IPaymentRepository _repository; - - public PaymentAppService( - IPaymentPayeeAccountProvider paymentPayeeAccountProvider, - IPaymentServiceResolver paymentServiceResolver, - IPaymentRepository repository) : base(repository) - { - _paymentPayeeAccountProvider = paymentPayeeAccountProvider; - _paymentServiceResolver = paymentServiceResolver; - _repository = repository; - } - - public override Task GetAsync(Guid id) - { - // Todo: Check permission. - return base.GetAsync(id); - } - - public override Task> GetListAsync(PagedAndSortedResultRequestDto input) - { - // Todo: Check permission. - return base.GetListAsync(input); - } - - public override async Task CreateAsync(CreatePaymentDto input) - { - await CheckCreatePolicyAsync(); - - var providerType = _paymentServiceResolver.GetProviderTypeOrDefault(input.PaymentMethod) ?? - throw new UnknownPaymentMethodException(input.PaymentMethod); - - var provider = ServiceProvider.GetService(providerType) as IPaymentServiceProvider ?? - throw new UnknownPaymentMethodException(input.PaymentMethod); - - var paymentItems = input.PaymentItems.Select(inputPaymentItem => - new PaymentItem(GuidGenerator.Create(), inputPaymentItem.ItemType, inputPaymentItem.ItemKey, - inputPaymentItem.Currency, inputPaymentItem.OriginalPaymentAmount)).ToList(); - - if (paymentItems.Select(item => item.Currency).Any(c => c != input.Currency)) - { - throw new MultiCurrencyNotSupportedException(); - } - - var payment = new Payment(GuidGenerator.Create(), CurrentTenant.Id, CurrentUser.GetId(), - input.PaymentMethod, input.Currency, paymentItems.Select(item => item.OriginalPaymentAmount).Sum(), - paymentItems); - - await Repository.InsertAsync(payment, autoSave: true); - - await CheckPayableAsync(payment, input.ExtraProperties); - - var payeeConfigurations = await GetPayeeConfigurationsAsync(payment, input.ExtraProperties); - - // Todo: payment discount - - await provider.PayAsync(payment, input.ExtraProperties, payeeConfigurations); - - return MapToGetOutputDto(payment); - } - - protected virtual Task> GetPayeeConfigurationsAsync(Payment payment, - Dictionary inputExtraProperties) - { - // Todo: use payee configurations provider. - // Todo: get store side payee configurations. - - var payeeConfigurations = new Dictionary(); - - return Task.FromResult(payeeConfigurations); - } - - protected virtual async Task CheckPayableAsync(Payment payment, Dictionary inputExtraProperties) - { - var itemSet = new HashSet(payment.PaymentItems); - - foreach (var authorizer in ServiceProvider.GetServices()) - { - foreach (var item in itemSet.ToList()) - { - if (await authorizer.IsPaymentItemAllowedAsync(payment, item, inputExtraProperties)) - { - itemSet.Remove(item); - } - } - } - - if (!itemSet.IsNullOrEmpty()) - { - throw new PaymentItemNotPayableException(itemSet.Select(item => item.ItemKey).ToList()); - } - } - - [RemoteService(false)] - public override Task UpdateAsync(Guid id, object input) - { - throw new NotSupportedException(); - } - - [RemoteService(false)] - public override Task DeleteAsync(Guid id) - { - throw new NotSupportedException(); - } - } -} \ No newline at end of file diff --git a/modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.Application/EasyAbp/EShop/Payments/Payments/PaymentItemNotPayableException.cs b/modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.Application/EasyAbp/EShop/Payments/Payments/PaymentItemNotPayableException.cs deleted file mode 100644 index 70167536..00000000 --- a/modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.Application/EasyAbp/EShop/Payments/Payments/PaymentItemNotPayableException.cs +++ /dev/null @@ -1,19 +0,0 @@ -using System; -using System.Collections.Generic; -using Volo.Abp; - -namespace EasyAbp.EShop.Payments.Payments -{ - public class PaymentItemNotPayableException : BusinessException - { - public PaymentItemNotPayableException(Guid itemKey) : base( - message: $"Payment item ({itemKey}) is not payable") - { - } - - public PaymentItemNotPayableException(IEnumerable itemKeys) : base( - message: $"Payment item ({itemKeys.JoinAsString(", ")}) is not payable") - { - } - } -} \ No newline at end of file diff --git a/modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.Application/EasyAbp/EShop/Payments/PaymentsAppService.cs b/modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.Application/EasyAbp/EShop/Payments/PaymentsAppService.cs deleted file mode 100644 index 1b2a2e94..00000000 --- a/modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.Application/EasyAbp/EShop/Payments/PaymentsAppService.cs +++ /dev/null @@ -1,14 +0,0 @@ -using EasyAbp.EShop.Payments.Localization; -using Volo.Abp.Application.Services; - -namespace EasyAbp.EShop.Payments -{ - public abstract class PaymentsAppService : ApplicationService - { - protected PaymentsAppService() - { - LocalizationResource = typeof(PaymentsResource); - ObjectMapperContext = typeof(EShopPaymentsApplicationModule); - } - } -} diff --git a/modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.Application/EasyAbp/EShop/Payments/PaymentsApplicationAutoMapperProfile.cs b/modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.Application/EasyAbp/EShop/Payments/PaymentsApplicationAutoMapperProfile.cs index dabe92ea..38e25986 100644 --- a/modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.Application/EasyAbp/EShop/Payments/PaymentsApplicationAutoMapperProfile.cs +++ b/modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.Application/EasyAbp/EShop/Payments/PaymentsApplicationAutoMapperProfile.cs @@ -1,9 +1,4 @@ -using EasyAbp.EShop.Payments.Payments; -using EasyAbp.EShop.Payments.Payments.Dtos; -using EasyAbp.EShop.Payments.Refunds; -using EasyAbp.EShop.Payments.Refunds.Dtos; using AutoMapper; -using Volo.Abp.AutoMapper; namespace EasyAbp.EShop.Payments { @@ -14,10 +9,6 @@ namespace EasyAbp.EShop.Payments /* You can configure your AutoMapper mapping configuration here. * Alternatively, you can split your mapping configurations * into multiple profile classes for a better organization. */ - CreateMap(); - CreateMap(); - CreateMap(MemberList.Source); - CreateMap(); } } } diff --git a/modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.Application/EasyAbp/EShop/Payments/Refunds/RefundAppService.cs b/modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.Application/EasyAbp/EShop/Payments/Refunds/RefundAppService.cs deleted file mode 100644 index 22ab26ee..00000000 --- a/modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.Application/EasyAbp/EShop/Payments/Refunds/RefundAppService.cs +++ /dev/null @@ -1,18 +0,0 @@ -using System; -using EasyAbp.EShop.Payments.Refunds.Dtos; -using Volo.Abp.Application.Dtos; -using Volo.Abp.Application.Services; - -namespace EasyAbp.EShop.Payments.Refunds -{ - public class RefundAppService : CrudAppService, - IRefundAppService - { - private readonly IRefundRepository _repository; - - public RefundAppService(IRefundRepository repository) : base(repository) - { - _repository = repository; - } - } -} \ No newline at end of file diff --git a/modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.Application/EasyAbp/EShop/Payments/Payments/EShopOrderPaymentAuthorizer.cs b/modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.Application/EasyAbp/PaymentService/Payments/EShopOrderPaymentAuthorizer.cs similarity index 94% rename from modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.Application/EasyAbp/EShop/Payments/Payments/EShopOrderPaymentAuthorizer.cs rename to modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.Application/EasyAbp/PaymentService/Payments/EShopOrderPaymentAuthorizer.cs index 41f9d88b..c9ba31ed 100644 --- a/modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.Application/EasyAbp/EShop/Payments/Payments/EShopOrderPaymentAuthorizer.cs +++ b/modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.Application/EasyAbp/PaymentService/Payments/EShopOrderPaymentAuthorizer.cs @@ -5,7 +5,7 @@ using EasyAbp.EShop.Orders.Orders; using Volo.Abp.DependencyInjection; using Volo.Abp.Users; -namespace EasyAbp.EShop.Payments.Payments +namespace EasyAbp.PaymentService.Payments { public class EShopOrderPaymentAuthorizer : IPaymentAuthorizer, ITransientDependency { @@ -40,7 +40,7 @@ namespace EasyAbp.EShop.Payments.Payments return false; } - if (!order.ReducedInventoryAfterPlacingTime.HasValue) + if (order.ReducedInventoryAfterPlacingTime.HasValue) { return false; } diff --git a/modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.Domain.Shared/EasyAbp.EShop.Payments.Domain.Shared.csproj b/modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.Domain.Shared/EasyAbp.EShop.Payments.Domain.Shared.csproj index b2851132..0272df68 100644 --- a/modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.Domain.Shared/EasyAbp.EShop.Payments.Domain.Shared.csproj +++ b/modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.Domain.Shared/EasyAbp.EShop.Payments.Domain.Shared.csproj @@ -8,6 +8,7 @@ + diff --git a/modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.Domain.Shared/EasyAbp/EShop/Payments/EShopPaymentsDomainSharedModule.cs b/modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.Domain.Shared/EasyAbp/EShop/Payments/EShopPaymentsDomainSharedModule.cs index 523e5479..cb25efb7 100644 --- a/modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.Domain.Shared/EasyAbp/EShop/Payments/EShopPaymentsDomainSharedModule.cs +++ b/modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.Domain.Shared/EasyAbp/EShop/Payments/EShopPaymentsDomainSharedModule.cs @@ -1,6 +1,7 @@ using Volo.Abp.Modularity; using Volo.Abp.Localization; using EasyAbp.EShop.Payments.Localization; +using EasyAbp.PaymentService; using Volo.Abp.Localization.ExceptionHandling; using Volo.Abp.Validation; using Volo.Abp.Validation.Localization; @@ -9,7 +10,8 @@ using Volo.Abp.VirtualFileSystem; namespace EasyAbp.EShop.Payments { [DependsOn( - typeof(AbpValidationModule) + typeof(AbpValidationModule), + typeof(PaymentServiceDomainSharedModule) )] public class EShopPaymentsDomainSharedModule : AbpModule { diff --git a/modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.Domain.Shared/EasyAbp/EShop/Payments/Localization/Payments/cs.json b/modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.Domain.Shared/EasyAbp/EShop/Payments/Localization/Payments/cs.json index a0f5d36a..0032b106 100644 --- a/modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.Domain.Shared/EasyAbp/EShop/Payments/Localization/Payments/cs.json +++ b/modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.Domain.Shared/EasyAbp/EShop/Payments/Localization/Payments/cs.json @@ -1,47 +1,5 @@ { "culture": "cs", "texts": { - "Menu:Payment": "MenuPayment", - "Payment": "Payment", - "PaymentTenantId": "PaymentTenantId", - "PaymentPaymentMethod": "PaymentPaymentMethod", - "PaymentExternalTradingCode": "PaymentExternalTradingCode", - "PaymentCurrency": "PaymentCurrency", - "PaymentOriginalPaymentAmount": "PaymentOriginalPaymentAmount", - "PaymentExtraProperties": "PaymentExtraProperties", - "PaymentPaymentDiscount": "PaymentPaymentDiscount", - "PaymentActualPaymentAmount": "PaymentActualPaymentAmount", - "PaymentRefundAmount": "PaymentRefundAmount", - "PaymentCompletionTime": "PaymentCompletionTime", - "CreatePayment": "CreatePayment", - "EditPayment": "EditPayment", - "PaymentDeletionConfirmationMessage": "Are you sure to delete the payment {0}?", - "SuccessfullyDeleted": "Successfully deleted", - "Menu:Refund": "MenuRefund", - "Refund": "Refund", - "RefundTenantId": "RefundTenantId", - "RefundStoreId": "RefundStoreId", - "RefundOrderId": "RefundOrderId", - "RefundRefundPaymentMethod": "RefundRefundPaymentMethod", - "RefundExternalTradingCode": "RefundExternalTradingCode", - "RefundCurrency": "RefundCurrency", - "RefundRefundAmount": "RefundRefundAmount", - "RefundCustomerRemark": "RefundCustomerRemark", - "RefundStaffRemark": "RefundStaffRemark", - "CreateRefund": "CreateRefund", - "EditRefund": "EditRefund", - "RefundDeletionConfirmationMessage": "Are you sure to delete the refund {0}?", - "Menu:PaymentItem": "MenuPaymentItem", - "PaymentItem": "PaymentItem", - "PaymentItemItemType": "PaymentItemItemType", - "PaymentItemItemKey": "PaymentItemItemKey", - "PaymentItemCurrency": "PaymentItemCurrency", - "PaymentItemOriginalPaymentAmount": "PaymentItemOriginalPaymentAmount", - "PaymentItemPaymentDiscount": "PaymentItemPaymentDiscount", - "PaymentItemActualPaymentAmount": "PaymentItemActualPaymentAmount", - "PaymentItemRefundAmount": "PaymentItemRefundAmount", - "CreatePaymentItem": "CreatePaymentItem", - "EditPaymentItem": "EditPaymentItem", - "PaymentItemDeletionConfirmationMessage": "Are you sure to delete the PaymentItem {0}?" } } \ No newline at end of file diff --git a/modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.Domain.Shared/EasyAbp/EShop/Payments/Localization/Payments/en.json b/modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.Domain.Shared/EasyAbp/EShop/Payments/Localization/Payments/en.json index e782ca5d..bb66921a 100644 --- a/modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.Domain.Shared/EasyAbp/EShop/Payments/Localization/Payments/en.json +++ b/modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.Domain.Shared/EasyAbp/EShop/Payments/Localization/Payments/en.json @@ -1,48 +1,6 @@ { "culture": "en", "texts": { - "ManageYourProfile": "Manage your profile", - "Menu:Payment": "MenuPayment", - "Payment": "Payment", - "PaymentTenantId": "PaymentTenantId", - "PaymentPaymentMethod": "PaymentPaymentMethod", - "PaymentExternalTradingCode": "PaymentExternalTradingCode", - "PaymentCurrency": "PaymentCurrency", - "PaymentOriginalPaymentAmount": "PaymentOriginalPaymentAmount", - "PaymentExtraProperties": "PaymentExtraProperties", - "PaymentPaymentDiscount": "PaymentPaymentDiscount", - "PaymentActualPaymentAmount": "PaymentActualPaymentAmount", - "PaymentRefundAmount": "PaymentRefundAmount", - "PaymentCompletionTime": "PaymentCompletionTime", - "CreatePayment": "CreatePayment", - "EditPayment": "EditPayment", - "PaymentDeletionConfirmationMessage": "Are you sure to delete the payment {0}?", - "SuccessfullyDeleted": "Successfully deleted", - "Menu:Refund": "MenuRefund", - "Refund": "Refund", - "RefundTenantId": "RefundTenantId", - "RefundStoreId": "RefundStoreId", - "RefundOrderId": "RefundOrderId", - "RefundRefundPaymentMethod": "RefundRefundPaymentMethod", - "RefundExternalTradingCode": "RefundExternalTradingCode", - "RefundCurrency": "RefundCurrency", - "RefundRefundAmount": "RefundRefundAmount", - "RefundCustomerRemark": "RefundCustomerRemark", - "RefundStaffRemark": "RefundStaffRemark", - "CreateRefund": "CreateRefund", - "EditRefund": "EditRefund", - "RefundDeletionConfirmationMessage": "Are you sure to delete the refund {0}?", - "Menu:PaymentItem": "MenuPaymentItem", - "PaymentItem": "PaymentItem", - "PaymentItemItemType": "PaymentItemItemType", - "PaymentItemItemKey": "PaymentItemItemKey", - "PaymentItemCurrency": "PaymentItemCurrency", - "PaymentItemOriginalPaymentAmount": "PaymentItemOriginalPaymentAmount", - "PaymentItemPaymentDiscount": "PaymentItemPaymentDiscount", - "PaymentItemActualPaymentAmount": "PaymentItemActualPaymentAmount", - "PaymentItemRefundAmount": "PaymentItemRefundAmount", - "CreatePaymentItem": "CreatePaymentItem", - "EditPaymentItem": "EditPaymentItem", - "PaymentItemDeletionConfirmationMessage": "Are you sure to delete the PaymentItem {0}?" + "ManageYourProfile": "Manage your profile" } } \ No newline at end of file diff --git a/modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.Domain.Shared/EasyAbp/EShop/Payments/Localization/Payments/pl.json b/modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.Domain.Shared/EasyAbp/EShop/Payments/Localization/Payments/pl.json index 7d01b204..26bcf7be 100644 --- a/modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.Domain.Shared/EasyAbp/EShop/Payments/Localization/Payments/pl.json +++ b/modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.Domain.Shared/EasyAbp/EShop/Payments/Localization/Payments/pl.json @@ -1,47 +1,5 @@ { "culture": "pl", "texts": { - "Menu:Payment": "MenuPayment", - "Payment": "Payment", - "PaymentTenantId": "PaymentTenantId", - "PaymentPaymentMethod": "PaymentPaymentMethod", - "PaymentExternalTradingCode": "PaymentExternalTradingCode", - "PaymentCurrency": "PaymentCurrency", - "PaymentOriginalPaymentAmount": "PaymentOriginalPaymentAmount", - "PaymentExtraProperties": "PaymentExtraProperties", - "PaymentPaymentDiscount": "PaymentPaymentDiscount", - "PaymentActualPaymentAmount": "PaymentActualPaymentAmount", - "PaymentRefundAmount": "PaymentRefundAmount", - "PaymentCompletionTime": "PaymentCompletionTime", - "CreatePayment": "CreatePayment", - "EditPayment": "EditPayment", - "PaymentDeletionConfirmationMessage": "Are you sure to delete the payment {0}?", - "SuccessfullyDeleted": "Successfully deleted", - "Menu:Refund": "MenuRefund", - "Refund": "Refund", - "RefundTenantId": "RefundTenantId", - "RefundStoreId": "RefundStoreId", - "RefundOrderId": "RefundOrderId", - "RefundRefundPaymentMethod": "RefundRefundPaymentMethod", - "RefundExternalTradingCode": "RefundExternalTradingCode", - "RefundCurrency": "RefundCurrency", - "RefundRefundAmount": "RefundRefundAmount", - "RefundCustomerRemark": "RefundCustomerRemark", - "RefundStaffRemark": "RefundStaffRemark", - "CreateRefund": "CreateRefund", - "EditRefund": "EditRefund", - "RefundDeletionConfirmationMessage": "Are you sure to delete the refund {0}?", - "Menu:PaymentItem": "MenuPaymentItem", - "PaymentItem": "PaymentItem", - "PaymentItemItemType": "PaymentItemItemType", - "PaymentItemItemKey": "PaymentItemItemKey", - "PaymentItemCurrency": "PaymentItemCurrency", - "PaymentItemOriginalPaymentAmount": "PaymentItemOriginalPaymentAmount", - "PaymentItemPaymentDiscount": "PaymentItemPaymentDiscount", - "PaymentItemActualPaymentAmount": "PaymentItemActualPaymentAmount", - "PaymentItemRefundAmount": "PaymentItemRefundAmount", - "CreatePaymentItem": "CreatePaymentItem", - "EditPaymentItem": "EditPaymentItem", - "PaymentItemDeletionConfirmationMessage": "Are you sure to delete the PaymentItem {0}?" } } \ No newline at end of file diff --git a/modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.Domain.Shared/EasyAbp/EShop/Payments/Localization/Payments/pt-BR.json b/modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.Domain.Shared/EasyAbp/EShop/Payments/Localization/Payments/pt-BR.json index 0aade8f4..2012b4c1 100644 --- a/modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.Domain.Shared/EasyAbp/EShop/Payments/Localization/Payments/pt-BR.json +++ b/modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.Domain.Shared/EasyAbp/EShop/Payments/Localization/Payments/pt-BR.json @@ -1,47 +1,5 @@ { "culture": "pt-BR", "texts": { - "Menu:Payment": "MenuPayment", - "Payment": "Payment", - "PaymentTenantId": "PaymentTenantId", - "PaymentPaymentMethod": "PaymentPaymentMethod", - "PaymentExternalTradingCode": "PaymentExternalTradingCode", - "PaymentCurrency": "PaymentCurrency", - "PaymentOriginalPaymentAmount": "PaymentOriginalPaymentAmount", - "PaymentExtraProperties": "PaymentExtraProperties", - "PaymentPaymentDiscount": "PaymentPaymentDiscount", - "PaymentActualPaymentAmount": "PaymentActualPaymentAmount", - "PaymentRefundAmount": "PaymentRefundAmount", - "PaymentCompletionTime": "PaymentCompletionTime", - "CreatePayment": "CreatePayment", - "EditPayment": "EditPayment", - "PaymentDeletionConfirmationMessage": "Are you sure to delete the payment {0}?", - "SuccessfullyDeleted": "Successfully deleted", - "Menu:Refund": "MenuRefund", - "Refund": "Refund", - "RefundTenantId": "RefundTenantId", - "RefundStoreId": "RefundStoreId", - "RefundOrderId": "RefundOrderId", - "RefundRefundPaymentMethod": "RefundRefundPaymentMethod", - "RefundExternalTradingCode": "RefundExternalTradingCode", - "RefundCurrency": "RefundCurrency", - "RefundRefundAmount": "RefundRefundAmount", - "RefundCustomerRemark": "RefundCustomerRemark", - "RefundStaffRemark": "RefundStaffRemark", - "CreateRefund": "CreateRefund", - "EditRefund": "EditRefund", - "RefundDeletionConfirmationMessage": "Are you sure to delete the refund {0}?", - "Menu:PaymentItem": "MenuPaymentItem", - "PaymentItem": "PaymentItem", - "PaymentItemItemType": "PaymentItemItemType", - "PaymentItemItemKey": "PaymentItemItemKey", - "PaymentItemCurrency": "PaymentItemCurrency", - "PaymentItemOriginalPaymentAmount": "PaymentItemOriginalPaymentAmount", - "PaymentItemPaymentDiscount": "PaymentItemPaymentDiscount", - "PaymentItemActualPaymentAmount": "PaymentItemActualPaymentAmount", - "PaymentItemRefundAmount": "PaymentItemRefundAmount", - "CreatePaymentItem": "CreatePaymentItem", - "EditPaymentItem": "EditPaymentItem", - "PaymentItemDeletionConfirmationMessage": "Are you sure to delete the PaymentItem {0}?" } } \ No newline at end of file diff --git a/modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.Domain.Shared/EasyAbp/EShop/Payments/Localization/Payments/sl.json b/modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.Domain.Shared/EasyAbp/EShop/Payments/Localization/Payments/sl.json index a5a59d5b..bb27e36f 100644 --- a/modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.Domain.Shared/EasyAbp/EShop/Payments/Localization/Payments/sl.json +++ b/modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.Domain.Shared/EasyAbp/EShop/Payments/Localization/Payments/sl.json @@ -1,48 +1,6 @@ { "culture": "sl", "texts": { - "ManageYourProfile": "Upravljajte svojim profilom", - "Menu:Payment": "MenuPayment", - "Payment": "Payment", - "PaymentTenantId": "PaymentTenantId", - "PaymentPaymentMethod": "PaymentPaymentMethod", - "PaymentExternalTradingCode": "PaymentExternalTradingCode", - "PaymentCurrency": "PaymentCurrency", - "PaymentOriginalPaymentAmount": "PaymentOriginalPaymentAmount", - "PaymentExtraProperties": "PaymentExtraProperties", - "PaymentPaymentDiscount": "PaymentPaymentDiscount", - "PaymentActualPaymentAmount": "PaymentActualPaymentAmount", - "PaymentRefundAmount": "PaymentRefundAmount", - "PaymentCompletionTime": "PaymentCompletionTime", - "CreatePayment": "CreatePayment", - "EditPayment": "EditPayment", - "PaymentDeletionConfirmationMessage": "Are you sure to delete the payment {0}?", - "SuccessfullyDeleted": "Successfully deleted", - "Menu:Refund": "MenuRefund", - "Refund": "Refund", - "RefundTenantId": "RefundTenantId", - "RefundStoreId": "RefundStoreId", - "RefundOrderId": "RefundOrderId", - "RefundRefundPaymentMethod": "RefundRefundPaymentMethod", - "RefundExternalTradingCode": "RefundExternalTradingCode", - "RefundCurrency": "RefundCurrency", - "RefundRefundAmount": "RefundRefundAmount", - "RefundCustomerRemark": "RefundCustomerRemark", - "RefundStaffRemark": "RefundStaffRemark", - "CreateRefund": "CreateRefund", - "EditRefund": "EditRefund", - "RefundDeletionConfirmationMessage": "Are you sure to delete the refund {0}?", - "Menu:PaymentItem": "MenuPaymentItem", - "PaymentItem": "PaymentItem", - "PaymentItemItemType": "PaymentItemItemType", - "PaymentItemItemKey": "PaymentItemItemKey", - "PaymentItemCurrency": "PaymentItemCurrency", - "PaymentItemOriginalPaymentAmount": "PaymentItemOriginalPaymentAmount", - "PaymentItemPaymentDiscount": "PaymentItemPaymentDiscount", - "PaymentItemActualPaymentAmount": "PaymentItemActualPaymentAmount", - "PaymentItemRefundAmount": "PaymentItemRefundAmount", - "CreatePaymentItem": "CreatePaymentItem", - "EditPaymentItem": "EditPaymentItem", - "PaymentItemDeletionConfirmationMessage": "Are you sure to delete the PaymentItem {0}?" + "ManageYourProfile": "Upravljajte svojim profilom" } } \ No newline at end of file diff --git a/modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.Domain.Shared/EasyAbp/EShop/Payments/Localization/Payments/tr.json b/modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.Domain.Shared/EasyAbp/EShop/Payments/Localization/Payments/tr.json index 273abe16..745dcb01 100644 --- a/modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.Domain.Shared/EasyAbp/EShop/Payments/Localization/Payments/tr.json +++ b/modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.Domain.Shared/EasyAbp/EShop/Payments/Localization/Payments/tr.json @@ -1,48 +1,6 @@ { "culture": "tr", "texts": { - "ManageYourProfile": "Profil y�netimi", - "Menu:Payment": "MenuPayment", - "Payment": "Payment", - "PaymentTenantId": "PaymentTenantId", - "PaymentPaymentMethod": "PaymentPaymentMethod", - "PaymentExternalTradingCode": "PaymentExternalTradingCode", - "PaymentCurrency": "PaymentCurrency", - "PaymentOriginalPaymentAmount": "PaymentOriginalPaymentAmount", - "PaymentExtraProperties": "PaymentExtraProperties", - "PaymentPaymentDiscount": "PaymentPaymentDiscount", - "PaymentActualPaymentAmount": "PaymentActualPaymentAmount", - "PaymentRefundAmount": "PaymentRefundAmount", - "PaymentCompletionTime": "PaymentCompletionTime", - "CreatePayment": "CreatePayment", - "EditPayment": "EditPayment", - "PaymentDeletionConfirmationMessage": "Are you sure to delete the payment {0}?", - "SuccessfullyDeleted": "Successfully deleted", - "Menu:Refund": "MenuRefund", - "Refund": "Refund", - "RefundTenantId": "RefundTenantId", - "RefundStoreId": "RefundStoreId", - "RefundOrderId": "RefundOrderId", - "RefundRefundPaymentMethod": "RefundRefundPaymentMethod", - "RefundExternalTradingCode": "RefundExternalTradingCode", - "RefundCurrency": "RefundCurrency", - "RefundRefundAmount": "RefundRefundAmount", - "RefundCustomerRemark": "RefundCustomerRemark", - "RefundStaffRemark": "RefundStaffRemark", - "CreateRefund": "CreateRefund", - "EditRefund": "EditRefund", - "RefundDeletionConfirmationMessage": "Are you sure to delete the refund {0}?", - "Menu:PaymentItem": "MenuPaymentItem", - "PaymentItem": "PaymentItem", - "PaymentItemItemType": "PaymentItemItemType", - "PaymentItemItemKey": "PaymentItemItemKey", - "PaymentItemCurrency": "PaymentItemCurrency", - "PaymentItemOriginalPaymentAmount": "PaymentItemOriginalPaymentAmount", - "PaymentItemPaymentDiscount": "PaymentItemPaymentDiscount", - "PaymentItemActualPaymentAmount": "PaymentItemActualPaymentAmount", - "PaymentItemRefundAmount": "PaymentItemRefundAmount", - "CreatePaymentItem": "CreatePaymentItem", - "EditPaymentItem": "EditPaymentItem", - "PaymentItemDeletionConfirmationMessage": "Are you sure to delete the PaymentItem {0}?" + "ManageYourProfile": "Profil y�netimi" } } \ No newline at end of file diff --git a/modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.Domain.Shared/EasyAbp/EShop/Payments/Localization/Payments/vi.json b/modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.Domain.Shared/EasyAbp/EShop/Payments/Localization/Payments/vi.json index 081aaca9..1ce1a0e1 100644 --- a/modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.Domain.Shared/EasyAbp/EShop/Payments/Localization/Payments/vi.json +++ b/modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.Domain.Shared/EasyAbp/EShop/Payments/Localization/Payments/vi.json @@ -1,47 +1,5 @@ { "culture": "vi", "texts": { - "Menu:Payment": "MenuPayment", - "Payment": "Payment", - "PaymentTenantId": "PaymentTenantId", - "PaymentPaymentMethod": "PaymentPaymentMethod", - "PaymentExternalTradingCode": "PaymentExternalTradingCode", - "PaymentCurrency": "PaymentCurrency", - "PaymentOriginalPaymentAmount": "PaymentOriginalPaymentAmount", - "PaymentExtraProperties": "PaymentExtraProperties", - "PaymentPaymentDiscount": "PaymentPaymentDiscount", - "PaymentActualPaymentAmount": "PaymentActualPaymentAmount", - "PaymentRefundAmount": "PaymentRefundAmount", - "PaymentCompletionTime": "PaymentCompletionTime", - "CreatePayment": "CreatePayment", - "EditPayment": "EditPayment", - "PaymentDeletionConfirmationMessage": "Are you sure to delete the payment {0}?", - "SuccessfullyDeleted": "Successfully deleted", - "Menu:Refund": "MenuRefund", - "Refund": "Refund", - "RefundTenantId": "RefundTenantId", - "RefundStoreId": "RefundStoreId", - "RefundOrderId": "RefundOrderId", - "RefundRefundPaymentMethod": "RefundRefundPaymentMethod", - "RefundExternalTradingCode": "RefundExternalTradingCode", - "RefundCurrency": "RefundCurrency", - "RefundRefundAmount": "RefundRefundAmount", - "RefundCustomerRemark": "RefundCustomerRemark", - "RefundStaffRemark": "RefundStaffRemark", - "CreateRefund": "CreateRefund", - "EditRefund": "EditRefund", - "RefundDeletionConfirmationMessage": "Are you sure to delete the refund {0}?", - "Menu:PaymentItem": "MenuPaymentItem", - "PaymentItem": "PaymentItem", - "PaymentItemItemType": "PaymentItemItemType", - "PaymentItemItemKey": "PaymentItemItemKey", - "PaymentItemCurrency": "PaymentItemCurrency", - "PaymentItemOriginalPaymentAmount": "PaymentItemOriginalPaymentAmount", - "PaymentItemPaymentDiscount": "PaymentItemPaymentDiscount", - "PaymentItemActualPaymentAmount": "PaymentItemActualPaymentAmount", - "PaymentItemRefundAmount": "PaymentItemRefundAmount", - "CreatePaymentItem": "CreatePaymentItem", - "EditPaymentItem": "EditPaymentItem", - "PaymentItemDeletionConfirmationMessage": "Are you sure to delete the PaymentItem {0}?" } } \ No newline at end of file diff --git a/modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.Domain.Shared/EasyAbp/EShop/Payments/Localization/Payments/zh-Hans.json b/modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.Domain.Shared/EasyAbp/EShop/Payments/Localization/Payments/zh-Hans.json index 1efa0a04..5f0fab67 100644 --- a/modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.Domain.Shared/EasyAbp/EShop/Payments/Localization/Payments/zh-Hans.json +++ b/modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.Domain.Shared/EasyAbp/EShop/Payments/Localization/Payments/zh-Hans.json @@ -1,48 +1,6 @@ { "culture": "zh-Hans", "texts": { - "ManageYourProfile": "管理个人资料", - "Menu:Payment": "MenuPayment", - "Payment": "Payment", - "PaymentTenantId": "PaymentTenantId", - "PaymentPaymentMethod": "PaymentPaymentMethod", - "PaymentExternalTradingCode": "PaymentExternalTradingCode", - "PaymentCurrency": "PaymentCurrency", - "PaymentOriginalPaymentAmount": "PaymentOriginalPaymentAmount", - "PaymentExtraProperties": "PaymentExtraProperties", - "PaymentPaymentDiscount": "PaymentPaymentDiscount", - "PaymentActualPaymentAmount": "PaymentActualPaymentAmount", - "PaymentRefundAmount": "PaymentRefundAmount", - "PaymentCompletionTime": "PaymentCompletionTime", - "CreatePayment": "CreatePayment", - "EditPayment": "EditPayment", - "PaymentDeletionConfirmationMessage": "Are you sure to delete the payment {0}?", - "SuccessfullyDeleted": "Successfully deleted", - "Menu:Refund": "MenuRefund", - "Refund": "Refund", - "RefundTenantId": "RefundTenantId", - "RefundStoreId": "RefundStoreId", - "RefundOrderId": "RefundOrderId", - "RefundRefundPaymentMethod": "RefundRefundPaymentMethod", - "RefundExternalTradingCode": "RefundExternalTradingCode", - "RefundCurrency": "RefundCurrency", - "RefundRefundAmount": "RefundRefundAmount", - "RefundCustomerRemark": "RefundCustomerRemark", - "RefundStaffRemark": "RefundStaffRemark", - "CreateRefund": "CreateRefund", - "EditRefund": "EditRefund", - "RefundDeletionConfirmationMessage": "Are you sure to delete the refund {0}?", - "Menu:PaymentItem": "MenuPaymentItem", - "PaymentItem": "PaymentItem", - "PaymentItemItemType": "PaymentItemItemType", - "PaymentItemItemKey": "PaymentItemItemKey", - "PaymentItemCurrency": "PaymentItemCurrency", - "PaymentItemOriginalPaymentAmount": "PaymentItemOriginalPaymentAmount", - "PaymentItemPaymentDiscount": "PaymentItemPaymentDiscount", - "PaymentItemActualPaymentAmount": "PaymentItemActualPaymentAmount", - "PaymentItemRefundAmount": "PaymentItemRefundAmount", - "CreatePaymentItem": "CreatePaymentItem", - "EditPaymentItem": "EditPaymentItem", - "PaymentItemDeletionConfirmationMessage": "Are you sure to delete the PaymentItem {0}?" + "ManageYourProfile": "管理个人资料" } } \ No newline at end of file diff --git a/modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.Domain.Shared/EasyAbp/EShop/Payments/Localization/Payments/zh-Hant.json b/modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.Domain.Shared/EasyAbp/EShop/Payments/Localization/Payments/zh-Hant.json index 2274fa68..7b79ff13 100644 --- a/modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.Domain.Shared/EasyAbp/EShop/Payments/Localization/Payments/zh-Hant.json +++ b/modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.Domain.Shared/EasyAbp/EShop/Payments/Localization/Payments/zh-Hant.json @@ -1,48 +1,6 @@ { "culture": "zh-Hant", "texts": { - "ManageYourProfile": "管理個人資料", - "Menu:Payment": "MenuPayment", - "Payment": "Payment", - "PaymentTenantId": "PaymentTenantId", - "PaymentPaymentMethod": "PaymentPaymentMethod", - "PaymentExternalTradingCode": "PaymentExternalTradingCode", - "PaymentCurrency": "PaymentCurrency", - "PaymentOriginalPaymentAmount": "PaymentOriginalPaymentAmount", - "PaymentExtraProperties": "PaymentExtraProperties", - "PaymentPaymentDiscount": "PaymentPaymentDiscount", - "PaymentActualPaymentAmount": "PaymentActualPaymentAmount", - "PaymentRefundAmount": "PaymentRefundAmount", - "PaymentCompletionTime": "PaymentCompletionTime", - "CreatePayment": "CreatePayment", - "EditPayment": "EditPayment", - "PaymentDeletionConfirmationMessage": "Are you sure to delete the payment {0}?", - "SuccessfullyDeleted": "Successfully deleted", - "Menu:Refund": "MenuRefund", - "Refund": "Refund", - "RefundTenantId": "RefundTenantId", - "RefundStoreId": "RefundStoreId", - "RefundOrderId": "RefundOrderId", - "RefundRefundPaymentMethod": "RefundRefundPaymentMethod", - "RefundExternalTradingCode": "RefundExternalTradingCode", - "RefundCurrency": "RefundCurrency", - "RefundRefundAmount": "RefundRefundAmount", - "RefundCustomerRemark": "RefundCustomerRemark", - "RefundStaffRemark": "RefundStaffRemark", - "CreateRefund": "CreateRefund", - "EditRefund": "EditRefund", - "RefundDeletionConfirmationMessage": "Are you sure to delete the refund {0}?", - "Menu:PaymentItem": "MenuPaymentItem", - "PaymentItem": "PaymentItem", - "PaymentItemItemType": "PaymentItemItemType", - "PaymentItemItemKey": "PaymentItemItemKey", - "PaymentItemCurrency": "PaymentItemCurrency", - "PaymentItemOriginalPaymentAmount": "PaymentItemOriginalPaymentAmount", - "PaymentItemPaymentDiscount": "PaymentItemPaymentDiscount", - "PaymentItemActualPaymentAmount": "PaymentItemActualPaymentAmount", - "PaymentItemRefundAmount": "PaymentItemRefundAmount", - "CreatePaymentItem": "CreatePaymentItem", - "EditPaymentItem": "EditPaymentItem", - "PaymentItemDeletionConfirmationMessage": "Are you sure to delete the PaymentItem {0}?" + "ManageYourProfile": "管理個人資料" } } \ No newline at end of file diff --git a/modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.Domain.Shared/EasyAbp/EShop/Payments/Payments/PaymentEto.cs b/modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.Domain.Shared/EasyAbp/EShop/Payments/Payments/PaymentEto.cs deleted file mode 100644 index 6deb2f16..00000000 --- a/modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.Domain.Shared/EasyAbp/EShop/Payments/Payments/PaymentEto.cs +++ /dev/null @@ -1,33 +0,0 @@ -using System; -using System.Collections.Generic; - -namespace EasyAbp.EShop.Payments.Payments -{ - [Serializable] - public class PaymentEto - { - public Guid UserId { get; set; } - - public Guid Id { get; set; } - - public Guid? TenantId { get; set; } - - public string PaymentMethod { get; set; } - - public string ExternalTradingCode { get; set; } - - public string Currency { get; set; } - - public decimal OriginalPaymentAmount { get; set; } - - public decimal PaymentDiscount { get; set; } - - public decimal ActualPaymentAmount { get; set; } - - public decimal RefundAmount { get; set; } - - public DateTime? CompletionTime { get; set; } - - public List PaymentItems { get; set; } - } -} \ No newline at end of file diff --git a/modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.Domain.Shared/EasyAbp/EShop/Payments/Payments/PaymentItemEto.cs b/modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.Domain.Shared/EasyAbp/EShop/Payments/Payments/PaymentItemEto.cs deleted file mode 100644 index af284fd0..00000000 --- a/modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.Domain.Shared/EasyAbp/EShop/Payments/Payments/PaymentItemEto.cs +++ /dev/null @@ -1,24 +0,0 @@ -using System; - -namespace EasyAbp.EShop.Payments.Payments -{ - [Serializable] - public class PaymentItemEto - { - public Guid Id { get; set; } - - public string ItemType { get; set; } - - public Guid ItemKey { get; set; } - - public string Currency { get; set; } - - public decimal OriginalPaymentAmount { get; set; } - - public decimal PaymentDiscount { get; set; } - - public decimal ActualPaymentAmount { get; set; } - - public decimal RefundAmount { get; set; } - } -} \ No newline at end of file diff --git a/modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.Domain/EasyAbp.EShop.Payments.Domain.csproj b/modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.Domain/EasyAbp.EShop.Payments.Domain.csproj index 976fb0ae..33d7c4dc 100644 --- a/modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.Domain/EasyAbp.EShop.Payments.Domain.csproj +++ b/modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.Domain/EasyAbp.EShop.Payments.Domain.csproj @@ -8,6 +8,7 @@ + diff --git a/modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.Domain/EasyAbp/EShop/Payments/EShopPaymentsDomainModule.cs b/modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.Domain/EasyAbp/EShop/Payments/EShopPaymentsDomainModule.cs index 51d1f77f..85146981 100644 --- a/modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.Domain/EasyAbp/EShop/Payments/EShopPaymentsDomainModule.cs +++ b/modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.Domain/EasyAbp/EShop/Payments/EShopPaymentsDomainModule.cs @@ -1,10 +1,7 @@ -using EasyAbp.EShop.Payments.Payments; -using EasyAbp.EShop.Stores; +using EasyAbp.EShop.Stores; +using EasyAbp.PaymentService; using Microsoft.Extensions.DependencyInjection; -using Microsoft.Extensions.DependencyInjection.Extensions; -using Volo.Abp; using Volo.Abp.AutoMapper; -using Volo.Abp.EventBus.Distributed; using Volo.Abp.Modularity; namespace EasyAbp.EShop.Payments @@ -12,20 +9,11 @@ namespace EasyAbp.EShop.Payments [DependsOn( typeof(AbpAutoMapperModule), typeof(EShopPaymentsDomainSharedModule), - typeof(EShopStoresDomainSharedModule) + typeof(EShopStoresDomainSharedModule), + typeof(PaymentServiceDomainModule) )] public class EShopPaymentsDomainModule : AbpModule { - public override void OnPostApplicationInitialization(ApplicationInitializationContext context) - { - var resolver = context.ServiceProvider.GetService(); - - if (resolver.GetPaymentMethods().Count == 0) - { - resolver.TryRegisterProvider(FreePaymentServiceProvider.PaymentMethod, typeof(FreePaymentServiceProvider)); - } - } - public override void ConfigureServices(ServiceConfigurationContext context) { context.Services.AddAutoMapperObjectMapper(); @@ -34,11 +22,6 @@ namespace EasyAbp.EShop.Payments { options.AddProfile(validate: true); }); - - Configure(options => - { - options.EtoMappings.Add(typeof(EShopPaymentsDomainModule)); - }); } } } diff --git a/modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.Domain/EasyAbp/EShop/Payments/Payments/CurrencyNotSupportedException.cs b/modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.Domain/EasyAbp/EShop/Payments/Payments/CurrencyNotSupportedException.cs deleted file mode 100644 index 0228eb9c..00000000 --- a/modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.Domain/EasyAbp/EShop/Payments/Payments/CurrencyNotSupportedException.cs +++ /dev/null @@ -1,18 +0,0 @@ -using System; -using Volo.Abp; - -namespace EasyAbp.EShop.Payments.Payments -{ - public class CurrencyNotSupportedException : BusinessException - { - public CurrencyNotSupportedException(string paymentMethod, string currency) : base( - message: $"Payment method {paymentMethod} does not support currency: {currency}") - { - } - - public CurrencyNotSupportedException(string paymentMethod, string currency, Guid storeId) : base( - message: $"Payment method {paymentMethod} in store {storeId} does not support currency: {currency}") - { - } - } -} \ No newline at end of file diff --git a/modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.Domain/EasyAbp/EShop/Payments/Payments/FreePaymentServiceProvider.cs b/modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.Domain/EasyAbp/EShop/Payments/Payments/FreePaymentServiceProvider.cs deleted file mode 100644 index 244829b6..00000000 --- a/modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.Domain/EasyAbp/EShop/Payments/Payments/FreePaymentServiceProvider.cs +++ /dev/null @@ -1,36 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Threading.Tasks; -using Microsoft.Extensions.DependencyInjection; -using Volo.Abp.DependencyInjection; -using Volo.Abp.Timing; - -namespace EasyAbp.EShop.Payments.Payments -{ - public class FreePaymentServiceProvider : IPaymentServiceProvider, ITransientDependency - { - private readonly IClock _clock; - private readonly IPaymentRepository _paymentRepository; - public const string PaymentMethod = "Free"; - - public FreePaymentServiceProvider( - IClock clock, - IPaymentRepository paymentRepository) - { - _clock = clock; - _paymentRepository = paymentRepository; - } - - public async Task PayAsync(Payment payment, Dictionary inputExtraProperties, - Dictionary payeeConfigurations) - { - payment.SetPayeeAccount("None"); - - payment.SetExternalTradingCode(payment.Id.ToString()); - - payment.CompletePayment(_clock.Now); - - return await _paymentRepository.UpdateAsync(payment, true); - } - } -} \ No newline at end of file diff --git a/modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.Domain/EasyAbp/EShop/Payments/Payments/IPaymentPayeeAccountProvider.cs b/modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.Domain/EasyAbp/EShop/Payments/Payments/IPaymentPayeeAccountProvider.cs deleted file mode 100644 index 932e0204..00000000 --- a/modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.Domain/EasyAbp/EShop/Payments/Payments/IPaymentPayeeAccountProvider.cs +++ /dev/null @@ -1,10 +0,0 @@ -using System.Collections.Generic; -using System.Threading.Tasks; - -namespace EasyAbp.EShop.Payments.Payments -{ - public interface IPaymentPayeeAccountProvider - { - Task GetPayeeAccountAsync(Payment payment, Dictionary inputExtraProperties); - } -} \ No newline at end of file diff --git a/modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.Domain/EasyAbp/EShop/Payments/Payments/IPaymentRepository.cs b/modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.Domain/EasyAbp/EShop/Payments/Payments/IPaymentRepository.cs deleted file mode 100644 index a83b9806..00000000 --- a/modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.Domain/EasyAbp/EShop/Payments/Payments/IPaymentRepository.cs +++ /dev/null @@ -1,9 +0,0 @@ -using System; -using Volo.Abp.Domain.Repositories; - -namespace EasyAbp.EShop.Payments.Payments -{ - public interface IPaymentRepository : IRepository - { - } -} \ No newline at end of file diff --git a/modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.Domain/EasyAbp/EShop/Payments/Payments/IPaymentServiceProvider.cs b/modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.Domain/EasyAbp/EShop/Payments/Payments/IPaymentServiceProvider.cs deleted file mode 100644 index c6542921..00000000 --- a/modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.Domain/EasyAbp/EShop/Payments/Payments/IPaymentServiceProvider.cs +++ /dev/null @@ -1,12 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Threading.Tasks; - -namespace EasyAbp.EShop.Payments.Payments -{ - public interface IPaymentServiceProvider - { - Task PayAsync(Payment payment, Dictionary inputExtraProperties, - Dictionary payeeConfigurations); - } -} \ No newline at end of file diff --git a/modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.Domain/EasyAbp/EShop/Payments/Payments/IPaymentServiceResolver.cs b/modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.Domain/EasyAbp/EShop/Payments/Payments/IPaymentServiceResolver.cs deleted file mode 100644 index aed171d2..00000000 --- a/modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.Domain/EasyAbp/EShop/Payments/Payments/IPaymentServiceResolver.cs +++ /dev/null @@ -1,15 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Threading.Tasks; - -namespace EasyAbp.EShop.Payments.Payments -{ - public interface IPaymentServiceResolver - { - bool TryRegisterProvider(string paymentMethod, Type providerType); - - List GetPaymentMethods(); - - Type GetProviderTypeOrDefault(string paymentMethod); - } -} \ No newline at end of file diff --git a/modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.Domain/EasyAbp/EShop/Payments/Payments/PayeeAccountNotFoundException.cs b/modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.Domain/EasyAbp/EShop/Payments/Payments/PayeeAccountNotFoundException.cs deleted file mode 100644 index f192eee1..00000000 --- a/modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.Domain/EasyAbp/EShop/Payments/Payments/PayeeAccountNotFoundException.cs +++ /dev/null @@ -1,12 +0,0 @@ -using Volo.Abp; - -namespace EasyAbp.EShop.Payments.Payments -{ - public class PayeeAccountNotFoundException : BusinessException - { - public PayeeAccountNotFoundException(string paymentMethod) : base( - message: $"Cannot find the payee account of payment method {paymentMethod}.") - { - } - } -} \ No newline at end of file diff --git a/modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.Domain/EasyAbp/EShop/Payments/Payments/PayeeConfigurationMissingValueException.cs b/modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.Domain/EasyAbp/EShop/Payments/Payments/PayeeConfigurationMissingValueException.cs deleted file mode 100644 index b88cfcba..00000000 --- a/modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.Domain/EasyAbp/EShop/Payments/Payments/PayeeConfigurationMissingValueException.cs +++ /dev/null @@ -1,12 +0,0 @@ -using Volo.Abp; - -namespace EasyAbp.EShop.Payments.Payments -{ - public class PayeeConfigurationMissingValueException : BusinessException - { - public PayeeConfigurationMissingValueException(string paymentMethod, string configurationKey) : base( - message: $"Payment method ({paymentMethod}) is missing configuration: {configurationKey}.") - { - } - } -} \ No newline at end of file diff --git a/modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.Domain/EasyAbp/EShop/Payments/Payments/Payment.cs b/modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.Domain/EasyAbp/EShop/Payments/Payments/Payment.cs deleted file mode 100644 index f22aa204..00000000 --- a/modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.Domain/EasyAbp/EShop/Payments/Payments/Payment.cs +++ /dev/null @@ -1,99 +0,0 @@ -using System; -using System.Collections.Generic; -using JetBrains.Annotations; -using Volo.Abp.Domain.Entities.Auditing; -using Volo.Abp.MultiTenancy; - -namespace EasyAbp.EShop.Payments.Payments -{ - public class Payment : FullAuditedAggregateRoot, IMultiTenant - { - public virtual Guid? TenantId { get; protected set; } - - public virtual Guid UserId { get; protected set; } - - [NotNull] - public virtual string PaymentMethod { get; protected set; } - - [CanBeNull] - public virtual string PayeeAccount { get; protected set; } - - [CanBeNull] - public virtual string ExternalTradingCode { get; protected set; } - - [NotNull] - public virtual string Currency { get; protected set; } - - public virtual decimal OriginalPaymentAmount { get; protected set; } - - public virtual decimal PaymentDiscount { get; protected set; } - - public virtual decimal ActualPaymentAmount { get; protected set; } - - public virtual decimal RefundAmount { get; protected set; } - - public virtual DateTime? CompletionTime { get; protected set; } - - public virtual List PaymentItems { get; protected set; } - - protected Payment() - { - PaymentItems = new List(); - } - - public Payment( - Guid id, - Guid? tenantId, - Guid userId, - [NotNull] string paymentMethod, - [NotNull] string currency, - decimal originalPaymentAmount, - List paymentItems - ) :base(id) - { - TenantId = tenantId; - UserId = userId; - PaymentMethod = paymentMethod; - Currency = currency; - OriginalPaymentAmount = originalPaymentAmount; - ActualPaymentAmount = originalPaymentAmount; - PaymentItems = paymentItems; - RefundAmount = 0; - } - - public void SetPayeeAccount([NotNull] string payeeAccount) - { - PayeeAccount = payeeAccount; - } - - public void SetExternalTradingCode([NotNull] string externalTradingCode) - { - CheckPaymentIsNotCompleted(); - - ExternalTradingCode = externalTradingCode; - } - - public void SetPaymentDiscount(decimal paymentDiscount) - { - CheckPaymentIsNotCompleted(); - - PaymentDiscount = paymentDiscount; - ActualPaymentAmount -= paymentDiscount; - } - - public void CompletePayment(DateTime completionTime) - { - CheckPaymentIsNotCompleted(); - - CompletionTime = completionTime; - } - - private void CheckPaymentIsNotCompleted() - { - if (CompletionTime.HasValue) - { - throw new PaymentHasAlreadyBeenCompletedException(Id); - } - } - } -} diff --git a/modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.Domain/EasyAbp/EShop/Payments/Payments/PaymentHasAlreadyBeenCompletedException.cs b/modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.Domain/EasyAbp/EShop/Payments/Payments/PaymentHasAlreadyBeenCompletedException.cs deleted file mode 100644 index 514047d3..00000000 --- a/modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.Domain/EasyAbp/EShop/Payments/Payments/PaymentHasAlreadyBeenCompletedException.cs +++ /dev/null @@ -1,13 +0,0 @@ -using System; -using Volo.Abp; - -namespace EasyAbp.EShop.Payments.Payments -{ - public class PaymentHasAlreadyBeenCompletedException : BusinessException - { - public PaymentHasAlreadyBeenCompletedException(Guid id) : base( - message: $"Payment ({id}) has already been completed.") - { - } - } -} \ No newline at end of file diff --git a/modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.Domain/EasyAbp/EShop/Payments/Payments/PaymentItem.cs b/modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.Domain/EasyAbp/EShop/Payments/Payments/PaymentItem.cs deleted file mode 100644 index cf2d8d37..00000000 --- a/modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.Domain/EasyAbp/EShop/Payments/Payments/PaymentItem.cs +++ /dev/null @@ -1,53 +0,0 @@ -using System; -using JetBrains.Annotations; -using Volo.Abp.Domain.Entities.Auditing; - -namespace EasyAbp.EShop.Payments.Payments -{ - public class PaymentItem : FullAuditedEntity - { - [NotNull] - public virtual string ItemType { get; protected set; } - - public virtual Guid ItemKey { get; protected set; } - - [NotNull] - public virtual string Currency { get; protected set; } - - public virtual decimal OriginalPaymentAmount { get; protected set; } - - public virtual decimal PaymentDiscount { get; protected set; } - - public virtual decimal ActualPaymentAmount { get; protected set; } - - public virtual decimal RefundAmount { get; protected set; } - - protected PaymentItem() - { - } - - public PaymentItem( - Guid id, - [NotNull] string itemType, - Guid itemKey, - [NotNull] string currency, - decimal originalPaymentAmount - ) :base(id) - { - ItemType = itemType; - ItemKey = itemKey; - Currency = currency; - OriginalPaymentAmount = originalPaymentAmount; - } - - public void CompletePayment( - decimal paymentDiscount, - decimal actualPaymentAmount, - decimal refundAmount) - { - PaymentDiscount = paymentDiscount; - ActualPaymentAmount = actualPaymentAmount; - RefundAmount = refundAmount; - } - } -} diff --git a/modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.Domain/EasyAbp/EShop/Payments/Payments/PaymentPayeeAccountProvider.cs b/modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.Domain/EasyAbp/EShop/Payments/Payments/PaymentPayeeAccountProvider.cs deleted file mode 100644 index 9bb04c44..00000000 --- a/modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.Domain/EasyAbp/EShop/Payments/Payments/PaymentPayeeAccountProvider.cs +++ /dev/null @@ -1,36 +0,0 @@ -using System.Collections.Generic; -using System.Threading.Tasks; -using EasyAbp.EShop.Payments.Settings; -using Volo.Abp.DependencyInjection; -using Volo.Abp.Settings; - -namespace EasyAbp.EShop.Payments.Payments -{ - public class PaymentPayeeAccountProvider : IPaymentPayeeAccountProvider, ITransientDependency - { - private readonly IPaymentRepository _paymentRepository; - private readonly ISettingProvider _settingProvider; - - public PaymentPayeeAccountProvider( - IPaymentRepository paymentRepository, - ISettingProvider settingProvider) - { - _paymentRepository = paymentRepository; - _settingProvider = settingProvider; - } - public async Task GetPayeeAccountAsync(Payment payment, Dictionary inputExtraProperties) - { - // Todo: support multi-store. - - var payeeAccount = await _settingProvider.GetOrNullAsync( - PaymentsSettings.GroupName + "." + payment.PaymentMethod + ".DefaultPayeeAccount"); - - if (payeeAccount == null) - { - throw new PayeeAccountNotFoundException(payment.PaymentMethod); - } - - return payeeAccount; - } - } -} \ No newline at end of file diff --git a/modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.Domain/EasyAbp/EShop/Payments/Payments/PaymentServiceResolver.cs b/modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.Domain/EasyAbp/EShop/Payments/Payments/PaymentServiceResolver.cs deleted file mode 100644 index 0fdd8a89..00000000 --- a/modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.Domain/EasyAbp/EShop/Payments/Payments/PaymentServiceResolver.cs +++ /dev/null @@ -1,51 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Threading.Tasks; -using Microsoft.Extensions.DependencyInjection; -using Volo.Abp.DependencyInjection; - -namespace EasyAbp.EShop.Payments.Payments -{ - public class PaymentServiceResolver : IPaymentServiceResolver, ISingletonDependency - { - protected readonly Dictionary Providers = new Dictionary(); - - private readonly IServiceProvider _serviceProvider; - - public PaymentServiceResolver(IServiceProvider serviceProvider) - { - _serviceProvider = serviceProvider; - } - - public virtual bool TryRegisterProvider(string paymentMethod, Type providerType) - { - if (Providers.ContainsKey(paymentMethod)) - { - return false; - } - - using (var scope = _serviceProvider.CreateScope()) - { - if (scope.ServiceProvider.GetService(providerType) == null) - { - return false; - } - } - - Providers.Add(paymentMethod, providerType); - - return true; - } - - public virtual List GetPaymentMethods() - { - return Providers.Keys.ToList(); - } - - public virtual Type GetProviderTypeOrDefault(string paymentMethod) - { - return Providers.GetOrDefault(paymentMethod); - } - } -} \ No newline at end of file diff --git a/modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.Domain/EasyAbp/EShop/Payments/Payments/UnknownPaymentMethodException.cs b/modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.Domain/EasyAbp/EShop/Payments/Payments/UnknownPaymentMethodException.cs deleted file mode 100644 index dd4aba6e..00000000 --- a/modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.Domain/EasyAbp/EShop/Payments/Payments/UnknownPaymentMethodException.cs +++ /dev/null @@ -1,12 +0,0 @@ -using Volo.Abp; - -namespace EasyAbp.EShop.Payments.Payments -{ - public class UnknownPaymentMethodException : BusinessException - { - public UnknownPaymentMethodException(string paymentMethod) : base( - message: $"Payment method {paymentMethod} does not exist.") - { - } - } -} \ No newline at end of file diff --git a/modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.Domain/EasyAbp/EShop/Payments/PaymentsDomainAutoMapperProfile.cs b/modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.Domain/EasyAbp/EShop/Payments/PaymentsDomainAutoMapperProfile.cs index a31288b6..75c2694c 100644 --- a/modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.Domain/EasyAbp/EShop/Payments/PaymentsDomainAutoMapperProfile.cs +++ b/modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.Domain/EasyAbp/EShop/Payments/PaymentsDomainAutoMapperProfile.cs @@ -1,5 +1,4 @@ using AutoMapper; -using EasyAbp.EShop.Payments.Payments; namespace EasyAbp.EShop.Payments { @@ -10,8 +9,6 @@ namespace EasyAbp.EShop.Payments /* You can configure your AutoMapper mapping configuration here. * Alternatively, you can split your mapping configurations * into multiple profile classes for a better organization. */ - CreateMap(); - CreateMap(); } } } diff --git a/modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.Domain/EasyAbp/EShop/Payments/Refunds/IRefundRepository.cs b/modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.Domain/EasyAbp/EShop/Payments/Refunds/IRefundRepository.cs deleted file mode 100644 index 3ab73121..00000000 --- a/modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.Domain/EasyAbp/EShop/Payments/Refunds/IRefundRepository.cs +++ /dev/null @@ -1,9 +0,0 @@ -using System; -using Volo.Abp.Domain.Repositories; - -namespace EasyAbp.EShop.Payments.Refunds -{ - public interface IRefundRepository : IRepository - { - } -} \ No newline at end of file diff --git a/modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.Domain/EasyAbp/EShop/Payments/Refunds/Refund.cs b/modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.Domain/EasyAbp/EShop/Payments/Refunds/Refund.cs deleted file mode 100644 index ba30610b..00000000 --- a/modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.Domain/EasyAbp/EShop/Payments/Refunds/Refund.cs +++ /dev/null @@ -1,62 +0,0 @@ -using System; -using EasyAbp.EShop.Stores.Stores; -using JetBrains.Annotations; -using Volo.Abp.Domain.Entities.Auditing; -using Volo.Abp.MultiTenancy; - -namespace EasyAbp.EShop.Payments.Refunds -{ - public class Refund : FullAuditedAggregateRoot, IMultiTenant, IMultiStore - { - public virtual Guid? TenantId { get; protected set; } - - public virtual Guid StoreId { get; protected set; } - - public virtual Guid OrderId { get; protected set; } - - [NotNull] - public virtual string RefundPaymentMethod { get; protected set; } - - [NotNull] - public virtual string ExternalTradingCode { get; protected set; } - - [NotNull] - public virtual string Currency { get; protected set; } - - public virtual decimal RefundAmount { get; protected set; } - - [CanBeNull] - public virtual string CustomerRemark { get; protected set; } - - [CanBeNull] - public virtual string StaffRemark { get; protected set; } - - protected Refund() - { - } - - public Refund( - Guid id, - Guid? tenantId, - Guid storeId, - Guid orderId, - string refundPaymentMethod, - string externalTradingCode, - string currency, - decimal refundAmount, - string customerRemark, - string staffRemark - ) :base(id) - { - TenantId = tenantId; - StoreId = storeId; - OrderId = orderId; - RefundPaymentMethod = refundPaymentMethod; - ExternalTradingCode = externalTradingCode; - Currency = currency; - RefundAmount = refundAmount; - CustomerRemark = customerRemark; - StaffRemark = staffRemark; - } - } -} diff --git a/modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.Domain/EasyAbp/EShop/Payments/Settings/PaymentsSettingDefinitionProvider.cs b/modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.Domain/EasyAbp/EShop/Payments/Settings/PaymentsSettingDefinitionProvider.cs index 5e922fce..34eb9d14 100644 --- a/modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.Domain/EasyAbp/EShop/Payments/Settings/PaymentsSettingDefinitionProvider.cs +++ b/modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.Domain/EasyAbp/EShop/Payments/Settings/PaymentsSettingDefinitionProvider.cs @@ -9,10 +9,6 @@ namespace EasyAbp.EShop.Payments.Settings /* Define module settings here. * Use names from PaymentsSettings class. */ - - context.Add( - new SettingDefinition(PaymentsSettings.FreePaymentMethod.DefaultPayeeAccount, "None") - ); } } } \ No newline at end of file diff --git a/modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.Domain/EasyAbp/EShop/Payments/Settings/PaymentsSettings.cs b/modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.Domain/EasyAbp/EShop/Payments/Settings/PaymentsSettings.cs index 921db7d6..4b1f0e18 100644 --- a/modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.Domain/EasyAbp/EShop/Payments/Settings/PaymentsSettings.cs +++ b/modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.Domain/EasyAbp/EShop/Payments/Settings/PaymentsSettings.cs @@ -7,13 +7,5 @@ /* Add constants for setting names. Example: * public const string MySettingName = GroupName + ".MySettingName"; */ - - public static class FreePaymentMethod - { - private const string PaymentMethodName = GroupName + ".Free"; - - public const string DefaultPayeeAccount = PaymentMethodName + ".DefaultPayeeAccount"; - - } } } \ No newline at end of file diff --git a/modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.EntityFrameworkCore/EasyAbp.EShop.Payments.EntityFrameworkCore.csproj b/modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.EntityFrameworkCore/EasyAbp.EShop.Payments.EntityFrameworkCore.csproj index 8f85ef2f..ba23a50f 100644 --- a/modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.EntityFrameworkCore/EasyAbp.EShop.Payments.EntityFrameworkCore.csproj +++ b/modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.EntityFrameworkCore/EasyAbp.EShop.Payments.EntityFrameworkCore.csproj @@ -8,6 +8,7 @@ + diff --git a/modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.EntityFrameworkCore/EasyAbp/EShop/Payments/EntityFrameworkCore/EShopPaymentsEntityFrameworkCoreModule.cs b/modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.EntityFrameworkCore/EasyAbp/EShop/Payments/EntityFrameworkCore/EShopPaymentsEntityFrameworkCoreModule.cs index 3e860320..ed0b5c87 100644 --- a/modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.EntityFrameworkCore/EasyAbp/EShop/Payments/EntityFrameworkCore/EShopPaymentsEntityFrameworkCoreModule.cs +++ b/modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.EntityFrameworkCore/EasyAbp/EShop/Payments/EntityFrameworkCore/EShopPaymentsEntityFrameworkCoreModule.cs @@ -1,5 +1,4 @@ -using EasyAbp.EShop.Payments.Refunds; -using EasyAbp.EShop.Payments.Payments; +using EasyAbp.PaymentService.EntityFrameworkCore; using Microsoft.Extensions.DependencyInjection; using Volo.Abp.EntityFrameworkCore; using Volo.Abp.Modularity; @@ -8,7 +7,8 @@ namespace EasyAbp.EShop.Payments.EntityFrameworkCore { [DependsOn( typeof(EShopPaymentsDomainModule), - typeof(AbpEntityFrameworkCoreModule) + typeof(AbpEntityFrameworkCoreModule), + typeof(PaymentServiceEntityFrameworkCoreModule) )] public class EShopPaymentsEntityFrameworkCoreModule : AbpModule { @@ -19,8 +19,6 @@ namespace EasyAbp.EShop.Payments.EntityFrameworkCore /* Add custom repositories here. Example: * options.AddRepository(); */ - options.AddRepository(); - options.AddRepository(); }); } } diff --git a/modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.EntityFrameworkCore/EasyAbp/EShop/Payments/EntityFrameworkCore/IPaymentsDbContext.cs b/modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.EntityFrameworkCore/EasyAbp/EShop/Payments/EntityFrameworkCore/IPaymentsDbContext.cs index b517b031..8a8eb6cb 100644 --- a/modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.EntityFrameworkCore/EasyAbp/EShop/Payments/EntityFrameworkCore/IPaymentsDbContext.cs +++ b/modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.EntityFrameworkCore/EasyAbp/EShop/Payments/EntityFrameworkCore/IPaymentsDbContext.cs @@ -1,8 +1,5 @@ -using Microsoft.EntityFrameworkCore; using Volo.Abp.Data; using Volo.Abp.EntityFrameworkCore; -using EasyAbp.EShop.Payments.Payments; -using EasyAbp.EShop.Payments.Refunds; namespace EasyAbp.EShop.Payments.EntityFrameworkCore { @@ -12,8 +9,5 @@ namespace EasyAbp.EShop.Payments.EntityFrameworkCore /* Add DbSet for each Aggregate Root here. Example: * DbSet Questions { get; } */ - DbSet Payments { get; set; } - DbSet Refunds { get; set; } - DbSet PaymentItems { get; set; } } } diff --git a/modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.EntityFrameworkCore/EasyAbp/EShop/Payments/EntityFrameworkCore/PaymentsDbContext.cs b/modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.EntityFrameworkCore/EasyAbp/EShop/Payments/EntityFrameworkCore/PaymentsDbContext.cs index e72a2377..0b346b1b 100644 --- a/modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.EntityFrameworkCore/EasyAbp/EShop/Payments/EntityFrameworkCore/PaymentsDbContext.cs +++ b/modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.EntityFrameworkCore/EasyAbp/EShop/Payments/EntityFrameworkCore/PaymentsDbContext.cs @@ -1,8 +1,6 @@ using Microsoft.EntityFrameworkCore; using Volo.Abp.Data; using Volo.Abp.EntityFrameworkCore; -using EasyAbp.EShop.Payments.Payments; -using EasyAbp.EShop.Payments.Refunds; namespace EasyAbp.EShop.Payments.EntityFrameworkCore { @@ -12,9 +10,6 @@ namespace EasyAbp.EShop.Payments.EntityFrameworkCore /* Add DbSet for each Aggregate Root here. Example: * public DbSet Questions { get; set; } */ - public DbSet Payments { get; set; } - public DbSet Refunds { get; set; } - public DbSet PaymentItems { get; set; } public PaymentsDbContext(DbContextOptions options) : base(options) diff --git a/modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.EntityFrameworkCore/EasyAbp/EShop/Payments/EntityFrameworkCore/PaymentsDbContextModelCreatingExtensions.cs b/modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.EntityFrameworkCore/EasyAbp/EShop/Payments/EntityFrameworkCore/PaymentsDbContextModelCreatingExtensions.cs index 67285889..2a3f7907 100644 --- a/modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.EntityFrameworkCore/EasyAbp/EShop/Payments/EntityFrameworkCore/PaymentsDbContextModelCreatingExtensions.cs +++ b/modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.EntityFrameworkCore/EasyAbp/EShop/Payments/EntityFrameworkCore/PaymentsDbContextModelCreatingExtensions.cs @@ -1,9 +1,7 @@ -using EasyAbp.EShop.Payments.Refunds; -using EasyAbp.EShop.Payments.Payments; using System; +using EasyAbp.PaymentService.EntityFrameworkCore; using Microsoft.EntityFrameworkCore; using Volo.Abp; -using Volo.Abp.EntityFrameworkCore.Modeling; namespace EasyAbp.EShop.Payments.EntityFrameworkCore { @@ -41,36 +39,10 @@ namespace EasyAbp.EShop.Payments.EntityFrameworkCore b.HasIndex(q => q.CreationTime); }); */ - - builder.Entity(b => - { - b.ToTable(options.TablePrefix + "Payments", options.Schema); - b.ConfigureByConvention(); - /* Configure more properties here */ - b.Property(x => x.ActualPaymentAmount).HasColumnType("decimal(18,6)"); - b.Property(x => x.OriginalPaymentAmount).HasColumnType("decimal(18,6)"); - b.Property(x => x.PaymentDiscount).HasColumnType("decimal(18,6)"); - b.Property(x => x.RefundAmount).HasColumnType("decimal(18,6)"); - }); - - builder.Entity(b => - { - b.ToTable(options.TablePrefix + "Refunds", options.Schema); - b.ConfigureByConvention(); - /* Configure more properties here */ - b.Property(x => x.RefundAmount).HasColumnType("decimal(18,6)"); - }); - - builder.Entity(b => - { - b.ToTable(options.TablePrefix + "PaymentItems", options.Schema); - b.ConfigureByConvention(); - /* Configure more properties here */ - b.Property(x => x.ActualPaymentAmount).HasColumnType("decimal(18,6)"); - b.Property(x => x.OriginalPaymentAmount).HasColumnType("decimal(18,6)"); - b.Property(x => x.PaymentDiscount).HasColumnType("decimal(18,6)"); - b.Property(x => x.RefundAmount).HasColumnType("decimal(18,6)"); - }); + + // Configure dependent module + + builder.ConfigurePaymentService(); } } } diff --git a/modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.EntityFrameworkCore/EasyAbp/EShop/Payments/Payments/PaymentRepository.cs b/modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.EntityFrameworkCore/EasyAbp/EShop/Payments/Payments/PaymentRepository.cs deleted file mode 100644 index b7ca3b56..00000000 --- a/modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.EntityFrameworkCore/EasyAbp/EShop/Payments/Payments/PaymentRepository.cs +++ /dev/null @@ -1,21 +0,0 @@ -using System; -using System.Linq; -using EasyAbp.EShop.Payments.EntityFrameworkCore; -using Microsoft.EntityFrameworkCore; -using Volo.Abp.Domain.Repositories.EntityFrameworkCore; -using Volo.Abp.EntityFrameworkCore; - -namespace EasyAbp.EShop.Payments.Payments -{ - public class PaymentRepository : EfCoreRepository, IPaymentRepository - { - public PaymentRepository(IDbContextProvider dbContextProvider) : base(dbContextProvider) - { - } - - public override IQueryable WithDetails() - { - return base.WithDetails().Include(x => x.PaymentItems); - } - } -} \ No newline at end of file diff --git a/modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.EntityFrameworkCore/EasyAbp/EShop/Payments/Refunds/RefundRepository.cs b/modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.EntityFrameworkCore/EasyAbp/EShop/Payments/Refunds/RefundRepository.cs deleted file mode 100644 index f1914215..00000000 --- a/modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.EntityFrameworkCore/EasyAbp/EShop/Payments/Refunds/RefundRepository.cs +++ /dev/null @@ -1,14 +0,0 @@ -using System; -using EasyAbp.EShop.Payments.EntityFrameworkCore; -using Volo.Abp.Domain.Repositories.EntityFrameworkCore; -using Volo.Abp.EntityFrameworkCore; - -namespace EasyAbp.EShop.Payments.Refunds -{ - public class RefundRepository : EfCoreRepository, IRefundRepository - { - public RefundRepository(IDbContextProvider dbContextProvider) : base(dbContextProvider) - { - } - } -} \ No newline at end of file diff --git a/modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.HttpApi.Client/EasyAbp.EShop.Payments.HttpApi.Client.csproj b/modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.HttpApi.Client/EasyAbp.EShop.Payments.HttpApi.Client.csproj index 15023c51..82ea2076 100644 --- a/modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.HttpApi.Client/EasyAbp.EShop.Payments.HttpApi.Client.csproj +++ b/modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.HttpApi.Client/EasyAbp.EShop.Payments.HttpApi.Client.csproj @@ -8,6 +8,7 @@ + diff --git a/modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.HttpApi.Client/EasyAbp/EShop/Payments/EShopPaymentsHttpApiClientModule.cs b/modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.HttpApi.Client/EasyAbp/EShop/Payments/EShopPaymentsHttpApiClientModule.cs index 8c782044..aa00783c 100644 --- a/modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.HttpApi.Client/EasyAbp/EShop/Payments/EShopPaymentsHttpApiClientModule.cs +++ b/modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.HttpApi.Client/EasyAbp/EShop/Payments/EShopPaymentsHttpApiClientModule.cs @@ -1,4 +1,5 @@ -using Microsoft.Extensions.DependencyInjection; +using EasyAbp.PaymentService; +using Microsoft.Extensions.DependencyInjection; using Volo.Abp.Http.Client; using Volo.Abp.Modularity; @@ -6,7 +7,9 @@ namespace EasyAbp.EShop.Payments { [DependsOn( typeof(EShopPaymentsApplicationContractsModule), - typeof(AbpHttpClientModule))] + typeof(AbpHttpClientModule), + typeof(PaymentServiceHttpApiClientModule) + )] public class EShopPaymentsHttpApiClientModule : AbpModule { public const string RemoteServiceName = "Payments"; diff --git a/modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.HttpApi/EasyAbp.EShop.Payments.HttpApi.csproj b/modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.HttpApi/EasyAbp.EShop.Payments.HttpApi.csproj index dbf6685a..a8133606 100644 --- a/modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.HttpApi/EasyAbp.EShop.Payments.HttpApi.csproj +++ b/modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.HttpApi/EasyAbp.EShop.Payments.HttpApi.csproj @@ -8,6 +8,7 @@ + diff --git a/modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.HttpApi/EasyAbp/EShop/Payments/EShopPaymentsHttpApiModule.cs b/modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.HttpApi/EasyAbp/EShop/Payments/EShopPaymentsHttpApiModule.cs index b14e5b72..3b121a3f 100644 --- a/modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.HttpApi/EasyAbp/EShop/Payments/EShopPaymentsHttpApiModule.cs +++ b/modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.HttpApi/EasyAbp/EShop/Payments/EShopPaymentsHttpApiModule.cs @@ -1,5 +1,6 @@ using Localization.Resources.AbpUi; using EasyAbp.EShop.Payments.Localization; +using EasyAbp.PaymentService; using Volo.Abp.AspNetCore.Mvc; using Volo.Abp.Localization; using Volo.Abp.Modularity; @@ -9,7 +10,9 @@ namespace EasyAbp.EShop.Payments { [DependsOn( typeof(EShopPaymentsApplicationContractsModule), - typeof(AbpAspNetCoreMvcModule))] + typeof(AbpAspNetCoreMvcModule), + typeof(PaymentServiceHttpApiModule) + )] public class EShopPaymentsHttpApiModule : AbpModule { public override void PreConfigureServices(ServiceConfigurationContext context) diff --git a/modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.MongoDB/EasyAbp.EShop.Payments.MongoDB.csproj b/modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.MongoDB/EasyAbp.EShop.Payments.MongoDB.csproj index 976b97aa..716cb0cf 100644 --- a/modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.MongoDB/EasyAbp.EShop.Payments.MongoDB.csproj +++ b/modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.MongoDB/EasyAbp.EShop.Payments.MongoDB.csproj @@ -8,6 +8,7 @@ + diff --git a/modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.MongoDB/EasyAbp/EShop/Payments/MongoDB/EShopPaymentsMongoDbModule.cs b/modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.MongoDB/EasyAbp/EShop/Payments/MongoDB/EShopPaymentsMongoDbModule.cs index 0778f890..482a147e 100644 --- a/modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.MongoDB/EasyAbp/EShop/Payments/MongoDB/EShopPaymentsMongoDbModule.cs +++ b/modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.MongoDB/EasyAbp/EShop/Payments/MongoDB/EShopPaymentsMongoDbModule.cs @@ -1,4 +1,5 @@ -using Microsoft.Extensions.DependencyInjection; +using EasyAbp.PaymentService.MongoDB; +using Microsoft.Extensions.DependencyInjection; using Volo.Abp.Modularity; using Volo.Abp.MongoDB; @@ -6,8 +7,9 @@ namespace EasyAbp.EShop.Payments.MongoDB { [DependsOn( typeof(EShopPaymentsDomainModule), - typeof(AbpMongoDbModule) - )] + typeof(AbpMongoDbModule), + typeof(PaymentServiceMongoDbModule) + )] public class EShopPaymentsMongoDbModule : AbpModule { public override void ConfigureServices(ServiceConfigurationContext context) diff --git a/modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.Web/EShopPaymentsWebModule.cs b/modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.Web/EShopPaymentsWebModule.cs index 8b05478b..2433366a 100644 --- a/modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.Web/EShopPaymentsWebModule.cs +++ b/modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.Web/EShopPaymentsWebModule.cs @@ -1,6 +1,7 @@ using Microsoft.AspNetCore.Mvc.RazorPages; using Microsoft.Extensions.DependencyInjection; using EasyAbp.EShop.Payments.Localization; +using EasyAbp.PaymentService.Web; using Volo.Abp.AspNetCore.Mvc.Localization; using Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared; using Volo.Abp.AutoMapper; @@ -13,8 +14,9 @@ namespace EasyAbp.EShop.Payments.Web [DependsOn( typeof(EShopPaymentsHttpApiModule), typeof(AbpAspNetCoreMvcUiThemeSharedModule), - typeof(AbpAutoMapperModule) - )] + typeof(AbpAutoMapperModule), + typeof(PaymentServiceWebModule) + )] public class EShopPaymentsWebModule : AbpModule { public override void PreConfigureServices(ServiceConfigurationContext context) diff --git a/modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.Web/EasyAbp.EShop.Payments.Web.csproj b/modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.Web/EasyAbp.EShop.Payments.Web.csproj index 8a70e83e..6f34969a 100644 --- a/modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.Web/EasyAbp.EShop.Payments.Web.csproj +++ b/modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.Web/EasyAbp.EShop.Payments.Web.csproj @@ -11,6 +11,7 @@ + @@ -43,6 +44,9 @@ <_ContentIncludedByDefault Remove="Pages\Payments\PaymentOrder\Index.cshtml" /> <_ContentIncludedByDefault Remove="Pages\Payments\Payment\Index.cshtml" /> <_ContentIncludedByDefault Remove="Pages\Refunds\Refund\Index.cshtml" /> + <_ContentIncludedByDefault Remove="Pages\EShop\Payments\Payments\PaymentOrder\Index.cshtml" /> + <_ContentIncludedByDefault Remove="Pages\EShop\Payments\Payments\Payment\Index.cshtml" /> + <_ContentIncludedByDefault Remove="Pages\EShop\Payments\Refunds\Refund\Index.cshtml" /> diff --git a/modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.Web/Pages/EShop/Payments/Payments/Payment/Index.cshtml b/modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.Web/Pages/EShop/Payments/Payments/Payment/Index.cshtml deleted file mode 100644 index b29b9c3b..00000000 --- a/modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.Web/Pages/EShop/Payments/Payments/Payment/Index.cshtml +++ /dev/null @@ -1,46 +0,0 @@ -@page -@using Volo.Abp.AspNetCore.Mvc.UI.Layout -@inherits EasyAbp.EShop.Payments.Web.Pages.PaymentsPage -@model EasyAbp.EShop.Payments.Web.Pages.EShop.Payments.Payments.Payment.IndexModel -@inject IPageLayout PageLayout -@{ - PageLayout.Content.Title = L["Payment"].Value; - PageLayout.Content.BreadCrumb.Add(L["Menu:Payment"].Value); - PageLayout.Content.MenuItemName = "Payment"; -} - -@section scripts -{ - -} -@section styles -{ - -} - - - - - - @L["Payment"] - - - - - - - - @L["Actions"] - @L["PaymentPaymentMethod"] - @L["PaymentExternalTradingCode"] - @L["PaymentCurrency"] - @L["PaymentOriginalPaymentAmount"] - @L["PaymentPaymentDiscount"] - @L["PaymentActualPaymentAmount"] - @L["PaymentRefundAmount"] - @L["PaymentCompletionTime"] - - - - - \ No newline at end of file diff --git a/modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.Web/Pages/EShop/Payments/Payments/Payment/Index.cshtml.cs b/modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.Web/Pages/EShop/Payments/Payments/Payment/Index.cshtml.cs deleted file mode 100644 index 41139d58..00000000 --- a/modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.Web/Pages/EShop/Payments/Payments/Payment/Index.cshtml.cs +++ /dev/null @@ -1,12 +0,0 @@ -using System.Threading.Tasks; - -namespace EasyAbp.EShop.Payments.Web.Pages.EShop.Payments.Payments.Payment -{ - public class IndexModel : PaymentsPageModel - { - public async Task OnGetAsync() - { - await Task.CompletedTask; - } - } -} diff --git a/modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.Web/Pages/EShop/Payments/Payments/Payment/index.css b/modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.Web/Pages/EShop/Payments/Payments/Payment/index.css deleted file mode 100644 index e69de29b..00000000 diff --git a/modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.Web/Pages/EShop/Payments/Payments/Payment/index.js b/modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.Web/Pages/EShop/Payments/Payments/Payment/index.js deleted file mode 100644 index f2ea73f9..00000000 --- a/modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.Web/Pages/EShop/Payments/Payments/Payment/index.js +++ /dev/null @@ -1,39 +0,0 @@ -$(function () { - - var l = abp.localization.getResource('EasyAbpEShopPayments'); - - var service = easyAbp.eShop.payments.payments.payment; - - var dataTable = $('#PaymentTable').DataTable(abp.libs.datatables.normalizeConfiguration({ - processing: true, - serverSide: true, - paging: true, - searching: false, - autoWidth: false, - scrollCollapse: true, - order: [[1, "asc"]], - ajax: abp.libs.datatables.createAjax(service.getList), - columnDefs: [ - { - rowAction: { - items: - [ - { - text: l('PaymentItem'), - action: function (data) { - } - } - ] - } - }, - { data: "paymentMethod" }, - { data: "externalTradingCode" }, - { data: "currency" }, - { data: "originalPaymentAmount" }, - { data: "paymentDiscount" }, - { data: "actualPaymentAmount" }, - { data: "refundAmount" }, - { data: "completionTime" }, - ] - })); -}); \ No newline at end of file diff --git a/modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.Web/Pages/EShop/Payments/Payments/PaymentOrder/Index.cshtml b/modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.Web/Pages/EShop/Payments/Payments/PaymentOrder/Index.cshtml deleted file mode 100644 index cf060598..00000000 --- a/modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.Web/Pages/EShop/Payments/Payments/PaymentOrder/Index.cshtml +++ /dev/null @@ -1,51 +0,0 @@ -@page -@using Volo.Abp.AspNetCore.Mvc.UI.Layout -@inherits EasyAbp.EShop.Payments.Web.Pages.PaymentsPage -@model EasyAbp.EShop.Payments.Web.Pages.EShop.Payments.Payments.PaymentOrder.IndexModel -@inject IPageLayout PageLayout -@{ - PageLayout.Content.Title = L["PaymentItem"].Value; - PageLayout.Content.BreadCrumb.Add(L["Menu:PaymentItem"].Value); - PageLayout.Content.MenuItemName = "PaymentItem"; -} - -@section scripts -{ - -} -@section styles -{ - -} - - - - - - @L["PaymentItem"] - - - - - - - - - - - @L["Actions"] - @L["PaymentItemItemType"] - @L["PaymentItemItemKey"] - @L["PaymentItemCurrency"] - @L["PaymentItemOriginalPaymentAmount"] - @L["PaymentItemPaymentDiscount"] - @L["PaymentItemActualPaymentAmount"] - @L["PaymentItemRefundAmount"] - - - - - \ No newline at end of file diff --git a/modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.Web/Pages/EShop/Payments/Payments/PaymentOrder/Index.cshtml.cs b/modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.Web/Pages/EShop/Payments/Payments/PaymentOrder/Index.cshtml.cs deleted file mode 100644 index 388ce97d..00000000 --- a/modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.Web/Pages/EShop/Payments/Payments/PaymentOrder/Index.cshtml.cs +++ /dev/null @@ -1,12 +0,0 @@ -using System.Threading.Tasks; - -namespace EasyAbp.EShop.Payments.Web.Pages.EShop.Payments.Payments.PaymentOrder -{ - public class IndexModel : PaymentsPageModel - { - public async Task OnGetAsync() - { - await Task.CompletedTask; - } - } -} diff --git a/modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.Web/Pages/EShop/Payments/Payments/PaymentOrder/index.css b/modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.Web/Pages/EShop/Payments/Payments/PaymentOrder/index.css deleted file mode 100644 index e69de29b..00000000 diff --git a/modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.Web/Pages/EShop/Payments/Payments/PaymentOrder/index.js b/modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.Web/Pages/EShop/Payments/Payments/PaymentOrder/index.js deleted file mode 100644 index 3c25f41e..00000000 --- a/modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.Web/Pages/EShop/Payments/Payments/PaymentOrder/index.js +++ /dev/null @@ -1,26 +0,0 @@ -$(function () { - - var l = abp.localization.getResource('EasyAbpEShopPayments'); - - var service = easyAbp.eShop.payments.payments.PaymentItem; - - var dataTable = $('#PaymentItemTable').DataTable(abp.libs.datatables.normalizeConfiguration({ - processing: true, - serverSide: true, - paging: true, - searching: false, - autoWidth: false, - scrollCollapse: true, - order: [[1, "asc"]], - ajax: abp.libs.datatables.createAjax(service.getList), - columnDefs: [ - { data: "itemType" }, - { data: "itemKey" }, - { data: "currency" }, - { data: "originalPaymentAmount" }, - { data: "paymentDiscount" }, - { data: "actualPaymentAmount" }, - { data: "refundAmount" }, - ] - })); -}); \ No newline at end of file diff --git a/modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.Web/Pages/EShop/Payments/Refunds/Refund/Index.cshtml b/modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.Web/Pages/EShop/Payments/Refunds/Refund/Index.cshtml deleted file mode 100644 index 9d5063fe..00000000 --- a/modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.Web/Pages/EShop/Payments/Refunds/Refund/Index.cshtml +++ /dev/null @@ -1,47 +0,0 @@ -@page -@using EasyAbp.EShop.Payments.Web.Pages.Refunds.Refund -@using Volo.Abp.AspNetCore.Mvc.UI.Layout -@inherits EasyAbp.EShop.Payments.Web.Pages.PaymentsPage -@model IndexModel -@inject IPageLayout PageLayout -@{ - PageLayout.Content.Title = L["Refund"].Value; - PageLayout.Content.BreadCrumb.Add(L["Menu:Refund"].Value); - PageLayout.Content.MenuItemName = "Refund"; -} - -@section scripts -{ - -} -@section styles -{ - -} - - - - - - @L["Refund"] - - - - - - - - @L["Actions"] - @L["RefundStoreId"] - @L["RefundOrderId"] - @L["RefundRefundPaymentMethod"] - @L["RefundExternalTradingCode"] - @L["RefundCurrency"] - @L["RefundRefundAmount"] - @L["RefundCustomerRemark"] - @L["RefundStaffRemark"] - - - - - \ No newline at end of file diff --git a/modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.Web/Pages/EShop/Payments/Refunds/Refund/Index.cshtml.cs b/modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.Web/Pages/EShop/Payments/Refunds/Refund/Index.cshtml.cs deleted file mode 100644 index 2d381a9a..00000000 --- a/modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.Web/Pages/EShop/Payments/Refunds/Refund/Index.cshtml.cs +++ /dev/null @@ -1,12 +0,0 @@ -using System.Threading.Tasks; - -namespace EasyAbp.EShop.Payments.Web.Pages.Refunds.Refund -{ - public class IndexModel : PaymentsPageModel - { - public async Task OnGetAsync() - { - await Task.CompletedTask; - } - } -} diff --git a/modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.Web/Pages/EShop/Payments/Refunds/Refund/index.css b/modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.Web/Pages/EShop/Payments/Refunds/Refund/index.css deleted file mode 100644 index e69de29b..00000000 diff --git a/modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.Web/Pages/EShop/Payments/Refunds/Refund/index.js b/modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.Web/Pages/EShop/Payments/Refunds/Refund/index.js deleted file mode 100644 index 787b4173..00000000 --- a/modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.Web/Pages/EShop/Payments/Refunds/Refund/index.js +++ /dev/null @@ -1,39 +0,0 @@ -$(function () { - - var l = abp.localization.getResource('EasyAbpEShopPayments'); - - var service = easyAbp.eShop.payments.refunds.refund; - - var dataTable = $('#RefundTable').DataTable(abp.libs.datatables.normalizeConfiguration({ - processing: true, - serverSide: true, - paging: true, - searching: false, - autoWidth: false, - scrollCollapse: true, - order: [[1, "asc"]], - ajax: abp.libs.datatables.createAjax(service.getList), - columnDefs: [ - { - rowAction: { - items: - [ - { - text: l('Detail'), - action: function (data) { - } - }, - ] - } - }, - { data: "storeId" }, - { data: "orderId" }, - { data: "refundPaymentMethod" }, - { data: "externalTradingCode" }, - { data: "currency" }, - { data: "refundAmount" }, - { data: "customerRemark" }, - { data: "staffRemark" }, - ] - })); -}); \ No newline at end of file diff --git a/modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.Web/PaymentsMenuContributor.cs b/modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.Web/PaymentsMenuContributor.cs index c7fed8fb..c44e5b80 100644 --- a/modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.Web/PaymentsMenuContributor.cs +++ b/modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.Web/PaymentsMenuContributor.cs @@ -27,33 +27,7 @@ namespace EasyAbp.EShop.Payments.Web private async Task ConfigureMainMenu(MenuConfigurationContext context) { - var l = context.ServiceProvider.GetRequiredService>(); //Add main menu items. - - var authorizationService = context.ServiceProvider.GetRequiredService(); - - var paymentManagementMenuItem = new ApplicationMenuItem("PaymentManagement", l["Menu:PaymentManagement"]); - - if (await authorizationService.IsGrantedAsync(PaymentsPermissions.Payments.Manage)) - { - paymentManagementMenuItem.AddItem( - new ApplicationMenuItem("Payment", l["Menu:Payment"], "/EShop/Payments/Payments/Payment") - ); - } - if (await authorizationService.IsGrantedAsync(PaymentsPermissions.Refunds.Manage)) - { - paymentManagementMenuItem.AddItem( - new ApplicationMenuItem("Refund", l["Menu:Refund"], "/EShop/Payments/Refunds/Refund") - ); - } - - if (!paymentManagementMenuItem.Items.IsNullOrEmpty()) - { - var eShopMenuItem = context.Menu.Items.GetOrAdd(i => i.Name == "EasyAbpEShop", - () => new ApplicationMenuItem("EasyAbpEShop", l["Menu:EasyAbpEShop"])); - - eShopMenuItem.Items.Add(paymentManagementMenuItem); - } } } } diff --git a/modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.Web/PaymentsWebAutoMapperProfile.cs b/modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.Web/PaymentsWebAutoMapperProfile.cs index 6d11a9bb..f135f468 100644 --- a/modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.Web/PaymentsWebAutoMapperProfile.cs +++ b/modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.Web/PaymentsWebAutoMapperProfile.cs @@ -1,5 +1,3 @@ -using EasyAbp.EShop.Payments.Payments.Dtos; -using EasyAbp.EShop.Payments.Refunds.Dtos; using AutoMapper; namespace EasyAbp.EShop.Payments.Web @@ -11,9 +9,6 @@ namespace EasyAbp.EShop.Payments.Web /* You can configure your AutoMapper mapping configuration here. * Alternatively, you can split your mapping configurations * into multiple profile classes for a better organization. */ - CreateMap(); - CreateMap(); - CreateMap(); } } } diff --git a/modules/EasyAbp.EShop.Payments/test/EasyAbp.EShop.Payments.Application.Tests/Payments/PaymentAppServiceTests.cs b/modules/EasyAbp.EShop.Payments/test/EasyAbp.EShop.Payments.Application.Tests/Payments/PaymentAppServiceTests.cs deleted file mode 100644 index d8c7dd39..00000000 --- a/modules/EasyAbp.EShop.Payments/test/EasyAbp.EShop.Payments.Application.Tests/Payments/PaymentAppServiceTests.cs +++ /dev/null @@ -1,26 +0,0 @@ -using Shouldly; -using System.Threading.Tasks; -using Xunit; - -namespace EasyAbp.EShop.Payments.Payments -{ - public class PaymentAppServiceTests : PaymentsApplicationTestBase - { - private readonly IPaymentAppService _paymentAppService; - - public PaymentAppServiceTests() - { - _paymentAppService = GetRequiredService(); - } - - [Fact] - public async Task Test1() - { - // Arrange - - // Act - - // Assert - } - } -} diff --git a/modules/EasyAbp.EShop.Payments/test/EasyAbp.EShop.Payments.Application.Tests/Refunds/RefundAppServiceTests.cs b/modules/EasyAbp.EShop.Payments/test/EasyAbp.EShop.Payments.Application.Tests/Refunds/RefundAppServiceTests.cs deleted file mode 100644 index 626e117c..00000000 --- a/modules/EasyAbp.EShop.Payments/test/EasyAbp.EShop.Payments.Application.Tests/Refunds/RefundAppServiceTests.cs +++ /dev/null @@ -1,26 +0,0 @@ -using Shouldly; -using System.Threading.Tasks; -using Xunit; - -namespace EasyAbp.EShop.Payments.Refunds -{ - public class RefundAppServiceTests : PaymentsApplicationTestBase - { - private readonly IRefundAppService _refundAppService; - - public RefundAppServiceTests() - { - _refundAppService = GetRequiredService(); - } - - [Fact] - public async Task Test1() - { - // Arrange - - // Act - - // Assert - } - } -} diff --git a/modules/EasyAbp.EShop.Payments/test/EasyAbp.EShop.Payments.Domain.Tests/Payments/PaymentDomainTests.cs b/modules/EasyAbp.EShop.Payments/test/EasyAbp.EShop.Payments.Domain.Tests/Payments/PaymentDomainTests.cs deleted file mode 100644 index 530c661e..00000000 --- a/modules/EasyAbp.EShop.Payments/test/EasyAbp.EShop.Payments.Domain.Tests/Payments/PaymentDomainTests.cs +++ /dev/null @@ -1,23 +0,0 @@ -using System.Threading.Tasks; -using Shouldly; -using Xunit; - -namespace EasyAbp.EShop.Payments.Payments -{ - public class PaymentDomainTests : PaymentsDomainTestBase - { - public PaymentDomainTests() - { - } - - [Fact] - public async Task Test1() - { - // Arrange - - // Assert - - // Assert - } - } -} diff --git a/modules/EasyAbp.EShop.Payments/test/EasyAbp.EShop.Payments.Domain.Tests/Refunds/RefundDomainTests.cs b/modules/EasyAbp.EShop.Payments/test/EasyAbp.EShop.Payments.Domain.Tests/Refunds/RefundDomainTests.cs deleted file mode 100644 index e0b696ce..00000000 --- a/modules/EasyAbp.EShop.Payments/test/EasyAbp.EShop.Payments.Domain.Tests/Refunds/RefundDomainTests.cs +++ /dev/null @@ -1,23 +0,0 @@ -using System.Threading.Tasks; -using Shouldly; -using Xunit; - -namespace EasyAbp.EShop.Payments.Refunds -{ - public class RefundDomainTests : PaymentsDomainTestBase - { - public RefundDomainTests() - { - } - - [Fact] - public async Task Test1() - { - // Arrange - - // Assert - - // Assert - } - } -} diff --git a/modules/EasyAbp.EShop.Payments/test/EasyAbp.EShop.Payments.EntityFrameworkCore.Tests/EntityFrameworkCore/Payments/PaymentRepositoryTests.cs b/modules/EasyAbp.EShop.Payments/test/EasyAbp.EShop.Payments.EntityFrameworkCore.Tests/EntityFrameworkCore/Payments/PaymentRepositoryTests.cs deleted file mode 100644 index 8156457c..00000000 --- a/modules/EasyAbp.EShop.Payments/test/EasyAbp.EShop.Payments.EntityFrameworkCore.Tests/EntityFrameworkCore/Payments/PaymentRepositoryTests.cs +++ /dev/null @@ -1,31 +0,0 @@ -using System; -using System.Threading.Tasks; -using EasyAbp.EShop.Payments.Payments; -using Volo.Abp.Domain.Repositories; -using Xunit; - -namespace EasyAbp.EShop.Payments.EntityFrameworkCore.Payments -{ - public class PaymentRepositoryTests : PaymentsEntityFrameworkCoreTestBase - { - private readonly IRepository _paymentRepository; - - public PaymentRepositoryTests() - { - _paymentRepository = GetRequiredService>(); - } - - [Fact] - public async Task Test1() - { - await WithUnitOfWorkAsync(async () => - { - // Arrange - - // Act - - //Assert - }); - } - } -} diff --git a/modules/EasyAbp.EShop.Payments/test/EasyAbp.EShop.Payments.EntityFrameworkCore.Tests/EntityFrameworkCore/Refunds/RefundRepositoryTests.cs b/modules/EasyAbp.EShop.Payments/test/EasyAbp.EShop.Payments.EntityFrameworkCore.Tests/EntityFrameworkCore/Refunds/RefundRepositoryTests.cs deleted file mode 100644 index 2caca9a6..00000000 --- a/modules/EasyAbp.EShop.Payments/test/EasyAbp.EShop.Payments.EntityFrameworkCore.Tests/EntityFrameworkCore/Refunds/RefundRepositoryTests.cs +++ /dev/null @@ -1,31 +0,0 @@ -using System; -using System.Threading.Tasks; -using EasyAbp.EShop.Payments.Refunds; -using Volo.Abp.Domain.Repositories; -using Xunit; - -namespace EasyAbp.EShop.Payments.EntityFrameworkCore.Refunds -{ - public class RefundRepositoryTests : PaymentsEntityFrameworkCoreTestBase - { - private readonly IRepository _refundRepository; - - public RefundRepositoryTests() - { - _refundRepository = GetRequiredService>(); - } - - [Fact] - public async Task Test1() - { - await WithUnitOfWorkAsync(async () => - { - // Arrange - - // Act - - //Assert - }); - } - } -} diff --git a/modules/EasyAbp.EShop.Products/common.props b/modules/EasyAbp.EShop.Products/common.props index 1063201e..c93ee579 100644 --- a/modules/EasyAbp.EShop.Products/common.props +++ b/modules/EasyAbp.EShop.Products/common.props @@ -1,7 +1,7 @@ latest - 0.1.11 + 0.1.12 $(NoWarn);CS1591 true EasyAbp Team diff --git a/modules/EasyAbp.EShop.Stores/common.props b/modules/EasyAbp.EShop.Stores/common.props index 1063201e..c93ee579 100644 --- a/modules/EasyAbp.EShop.Stores/common.props +++ b/modules/EasyAbp.EShop.Stores/common.props @@ -1,7 +1,7 @@ latest - 0.1.11 + 0.1.12 $(NoWarn);CS1591 true EasyAbp Team diff --git a/nupkg/common.ps1 b/nupkg/common.ps1 index b2722c5f..a193bde5 100644 --- a/nupkg/common.ps1 +++ b/nupkg/common.ps1 @@ -35,16 +35,6 @@ $projects = ( "modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.MongoDB", "modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.Web", - "modules/EasyAbp.EShop.Payments.WeChatPay/src/EasyAbp.EShop.Payments.WeChatPay.Application", - "modules/EasyAbp.EShop.Payments.WeChatPay/src/EasyAbp.EShop.Payments.WeChatPay.Application.Contracts", - "modules/EasyAbp.EShop.Payments.WeChatPay/src/EasyAbp.EShop.Payments.WeChatPay.Domain", - "modules/EasyAbp.EShop.Payments.WeChatPay/src/EasyAbp.EShop.Payments.WeChatPay.Domain.Shared", - "modules/EasyAbp.EShop.Payments.WeChatPay/src/EasyAbp.EShop.Payments.WeChatPay.EntityFrameworkCore", - "modules/EasyAbp.EShop.Payments.WeChatPay/src/EasyAbp.EShop.Payments.WeChatPay.HttpApi", - "modules/EasyAbp.EShop.Payments.WeChatPay/src/EasyAbp.EShop.Payments.WeChatPay.HttpApi.Client", - "modules/EasyAbp.EShop.Payments.WeChatPay/src/EasyAbp.EShop.Payments.WeChatPay.MongoDB", - "modules/EasyAbp.EShop.Payments.WeChatPay/src/EasyAbp.EShop.Payments.WeChatPay.Web", - "modules/EasyAbp.EShop.Products/src/EasyAbp.EShop.Products.Application", "modules/EasyAbp.EShop.Products/src/EasyAbp.EShop.Products.Application.Contracts", "modules/EasyAbp.EShop.Products/src/EasyAbp.EShop.Products.Domain", diff --git a/samples/EasyMall/aspnet-core/EasyMall.sln b/samples/EasyMall/aspnet-core/EasyMall.sln index 2abe7129..b30c3529 100644 --- a/samples/EasyMall/aspnet-core/EasyMall.sln +++ b/samples/EasyMall/aspnet-core/EasyMall.sln @@ -221,44 +221,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EasyAbp.EShop.Stores.MongoD EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EasyAbp.EShop.Stores.TestBase", "..\..\..\modules\EasyAbp.EShop.Stores\test\EasyAbp.EShop.Stores.TestBase\EasyAbp.EShop.Stores.TestBase.csproj", "{F2A770E7-17A5-4009-9DE2-703940F34A3D}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "provider", "provider", "{7D80E979-D0C3-4D6A-8FF0-22733CAA37A3}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "WeChatPay", "WeChatPay", "{4FF7000A-2CD2-40B9-B2B0-A1EFD501A5B1}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{60986AC6-FDD9-4B57-942D-A006A83315CF}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{B14DE465-81BA-4242-AD2E-8BEE1F0F0D22}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EasyAbp.EShop.Payments.WeChatPay.Application", "..\..\..\modules\EasyAbp.EShop.Payments.WeChatPay\src\EasyAbp.EShop.Payments.WeChatPay.Application\EasyAbp.EShop.Payments.WeChatPay.Application.csproj", "{B2C56EF7-AB4A-454B-BC77-0F2178BBD09F}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EasyAbp.EShop.Payments.WeChatPay.Application.Contracts", "..\..\..\modules\EasyAbp.EShop.Payments.WeChatPay\src\EasyAbp.EShop.Payments.WeChatPay.Application.Contracts\EasyAbp.EShop.Payments.WeChatPay.Application.Contracts.csproj", "{4F07C29E-1CAF-42A6-BC8D-E6F7575D844B}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EasyAbp.EShop.Payments.WeChatPay.Domain", "..\..\..\modules\EasyAbp.EShop.Payments.WeChatPay\src\EasyAbp.EShop.Payments.WeChatPay.Domain\EasyAbp.EShop.Payments.WeChatPay.Domain.csproj", "{5193B2DC-6AE2-4279-8DC5-36B68BC89915}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EasyAbp.EShop.Payments.WeChatPay.Domain.Shared", "..\..\..\modules\EasyAbp.EShop.Payments.WeChatPay\src\EasyAbp.EShop.Payments.WeChatPay.Domain.Shared\EasyAbp.EShop.Payments.WeChatPay.Domain.Shared.csproj", "{A44E43C4-2C52-4D76-BB77-A7080CBAC084}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EasyAbp.EShop.Payments.WeChatPay.EntityFrameworkCore", "..\..\..\modules\EasyAbp.EShop.Payments.WeChatPay\src\EasyAbp.EShop.Payments.WeChatPay.EntityFrameworkCore\EasyAbp.EShop.Payments.WeChatPay.EntityFrameworkCore.csproj", "{4659A828-333C-421E-B735-10D83CA2FD9F}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EasyAbp.EShop.Payments.WeChatPay.HttpApi", "..\..\..\modules\EasyAbp.EShop.Payments.WeChatPay\src\EasyAbp.EShop.Payments.WeChatPay.HttpApi\EasyAbp.EShop.Payments.WeChatPay.HttpApi.csproj", "{59151C03-351A-4D36-9F6B-F1733F64D83E}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EasyAbp.EShop.Payments.WeChatPay.HttpApi.Client", "..\..\..\modules\EasyAbp.EShop.Payments.WeChatPay\src\EasyAbp.EShop.Payments.WeChatPay.HttpApi.Client\EasyAbp.EShop.Payments.WeChatPay.HttpApi.Client.csproj", "{09FDBA1B-06C4-4F34-9153-9E841305CA07}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EasyAbp.EShop.Payments.WeChatPay.MongoDB", "..\..\..\modules\EasyAbp.EShop.Payments.WeChatPay\src\EasyAbp.EShop.Payments.WeChatPay.MongoDB\EasyAbp.EShop.Payments.WeChatPay.MongoDB.csproj", "{5BFF62AB-2FCB-4426-9A3A-0A3DA94684BC}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EasyAbp.EShop.Payments.WeChatPay.Web", "..\..\..\modules\EasyAbp.EShop.Payments.WeChatPay\src\EasyAbp.EShop.Payments.WeChatPay.Web\EasyAbp.EShop.Payments.WeChatPay.Web.csproj", "{D9EDC5D3-BEAC-4CE2-9216-A8EC056AE6F9}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EasyAbp.EShop.Payments.WeChatPay.Application.Tests", "..\..\..\modules\EasyAbp.EShop.Payments.WeChatPay\test\EasyAbp.EShop.Payments.WeChatPay.Application.Tests\EasyAbp.EShop.Payments.WeChatPay.Application.Tests.csproj", "{F138E2B8-6585-4C1C-BCD9-1CF99A2131DE}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EasyAbp.EShop.Payments.WeChatPay.Domain.Tests", "..\..\..\modules\EasyAbp.EShop.Payments.WeChatPay\test\EasyAbp.EShop.Payments.WeChatPay.Domain.Tests\EasyAbp.EShop.Payments.WeChatPay.Domain.Tests.csproj", "{D19CD3F2-DABE-4F6D-9F24-AB3316528E0D}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EasyAbp.EShop.Payments.WeChatPay.EntityFrameworkCore.Tests", "..\..\..\modules\EasyAbp.EShop.Payments.WeChatPay\test\EasyAbp.EShop.Payments.WeChatPay.EntityFrameworkCore.Tests\EasyAbp.EShop.Payments.WeChatPay.EntityFrameworkCore.Tests.csproj", "{F28236AB-9989-4F1D-BE8A-9E25BE5D168B}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EasyAbp.EShop.Payments.WeChatPay.HttpApi.Client.ConsoleTestApp", "..\..\..\modules\EasyAbp.EShop.Payments.WeChatPay\test\EasyAbp.EShop.Payments.WeChatPay.HttpApi.Client.ConsoleTestApp\EasyAbp.EShop.Payments.WeChatPay.HttpApi.Client.ConsoleTestApp.csproj", "{83FE9011-B587-4015-93D6-68BEC8E243B2}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EasyAbp.EShop.Payments.WeChatPay.MongoDB.Tests", "..\..\..\modules\EasyAbp.EShop.Payments.WeChatPay\test\EasyAbp.EShop.Payments.WeChatPay.MongoDB.Tests\EasyAbp.EShop.Payments.WeChatPay.MongoDB.Tests.csproj", "{865EA40F-F627-412A-82B1-107034E3E94C}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EasyAbp.EShop.Payments.WeChatPay.TestBase", "..\..\..\modules\EasyAbp.EShop.Payments.WeChatPay\test\EasyAbp.EShop.Payments.WeChatPay.TestBase\EasyAbp.EShop.Payments.WeChatPay.TestBase.csproj", "{E1C36040-87FB-4250-BF0E-6A8E270825A9}" -EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -629,66 +591,6 @@ Global {F2A770E7-17A5-4009-9DE2-703940F34A3D}.Debug|Any CPU.Build.0 = Debug|Any CPU {F2A770E7-17A5-4009-9DE2-703940F34A3D}.Release|Any CPU.ActiveCfg = Release|Any CPU {F2A770E7-17A5-4009-9DE2-703940F34A3D}.Release|Any CPU.Build.0 = Release|Any CPU - {B2C56EF7-AB4A-454B-BC77-0F2178BBD09F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B2C56EF7-AB4A-454B-BC77-0F2178BBD09F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B2C56EF7-AB4A-454B-BC77-0F2178BBD09F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B2C56EF7-AB4A-454B-BC77-0F2178BBD09F}.Release|Any CPU.Build.0 = Release|Any CPU - {4F07C29E-1CAF-42A6-BC8D-E6F7575D844B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {4F07C29E-1CAF-42A6-BC8D-E6F7575D844B}.Debug|Any CPU.Build.0 = Debug|Any CPU - {4F07C29E-1CAF-42A6-BC8D-E6F7575D844B}.Release|Any CPU.ActiveCfg = Release|Any CPU - {4F07C29E-1CAF-42A6-BC8D-E6F7575D844B}.Release|Any CPU.Build.0 = Release|Any CPU - {5193B2DC-6AE2-4279-8DC5-36B68BC89915}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {5193B2DC-6AE2-4279-8DC5-36B68BC89915}.Debug|Any CPU.Build.0 = Debug|Any CPU - {5193B2DC-6AE2-4279-8DC5-36B68BC89915}.Release|Any CPU.ActiveCfg = Release|Any CPU - {5193B2DC-6AE2-4279-8DC5-36B68BC89915}.Release|Any CPU.Build.0 = Release|Any CPU - {A44E43C4-2C52-4D76-BB77-A7080CBAC084}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A44E43C4-2C52-4D76-BB77-A7080CBAC084}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A44E43C4-2C52-4D76-BB77-A7080CBAC084}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A44E43C4-2C52-4D76-BB77-A7080CBAC084}.Release|Any CPU.Build.0 = Release|Any CPU - {4659A828-333C-421E-B735-10D83CA2FD9F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {4659A828-333C-421E-B735-10D83CA2FD9F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {4659A828-333C-421E-B735-10D83CA2FD9F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {4659A828-333C-421E-B735-10D83CA2FD9F}.Release|Any CPU.Build.0 = Release|Any CPU - {59151C03-351A-4D36-9F6B-F1733F64D83E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {59151C03-351A-4D36-9F6B-F1733F64D83E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {59151C03-351A-4D36-9F6B-F1733F64D83E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {59151C03-351A-4D36-9F6B-F1733F64D83E}.Release|Any CPU.Build.0 = Release|Any CPU - {09FDBA1B-06C4-4F34-9153-9E841305CA07}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {09FDBA1B-06C4-4F34-9153-9E841305CA07}.Debug|Any CPU.Build.0 = Debug|Any CPU - {09FDBA1B-06C4-4F34-9153-9E841305CA07}.Release|Any CPU.ActiveCfg = Release|Any CPU - {09FDBA1B-06C4-4F34-9153-9E841305CA07}.Release|Any CPU.Build.0 = Release|Any CPU - {5BFF62AB-2FCB-4426-9A3A-0A3DA94684BC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {5BFF62AB-2FCB-4426-9A3A-0A3DA94684BC}.Debug|Any CPU.Build.0 = Debug|Any CPU - {5BFF62AB-2FCB-4426-9A3A-0A3DA94684BC}.Release|Any CPU.ActiveCfg = Release|Any CPU - {5BFF62AB-2FCB-4426-9A3A-0A3DA94684BC}.Release|Any CPU.Build.0 = Release|Any CPU - {D9EDC5D3-BEAC-4CE2-9216-A8EC056AE6F9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {D9EDC5D3-BEAC-4CE2-9216-A8EC056AE6F9}.Debug|Any CPU.Build.0 = Debug|Any CPU - {D9EDC5D3-BEAC-4CE2-9216-A8EC056AE6F9}.Release|Any CPU.ActiveCfg = Release|Any CPU - {D9EDC5D3-BEAC-4CE2-9216-A8EC056AE6F9}.Release|Any CPU.Build.0 = Release|Any CPU - {F138E2B8-6585-4C1C-BCD9-1CF99A2131DE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {F138E2B8-6585-4C1C-BCD9-1CF99A2131DE}.Debug|Any CPU.Build.0 = Debug|Any CPU - {F138E2B8-6585-4C1C-BCD9-1CF99A2131DE}.Release|Any CPU.ActiveCfg = Release|Any CPU - {F138E2B8-6585-4C1C-BCD9-1CF99A2131DE}.Release|Any CPU.Build.0 = Release|Any CPU - {D19CD3F2-DABE-4F6D-9F24-AB3316528E0D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {D19CD3F2-DABE-4F6D-9F24-AB3316528E0D}.Debug|Any CPU.Build.0 = Debug|Any CPU - {D19CD3F2-DABE-4F6D-9F24-AB3316528E0D}.Release|Any CPU.ActiveCfg = Release|Any CPU - {D19CD3F2-DABE-4F6D-9F24-AB3316528E0D}.Release|Any CPU.Build.0 = Release|Any CPU - {F28236AB-9989-4F1D-BE8A-9E25BE5D168B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {F28236AB-9989-4F1D-BE8A-9E25BE5D168B}.Debug|Any CPU.Build.0 = Debug|Any CPU - {F28236AB-9989-4F1D-BE8A-9E25BE5D168B}.Release|Any CPU.ActiveCfg = Release|Any CPU - {F28236AB-9989-4F1D-BE8A-9E25BE5D168B}.Release|Any CPU.Build.0 = Release|Any CPU - {83FE9011-B587-4015-93D6-68BEC8E243B2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {83FE9011-B587-4015-93D6-68BEC8E243B2}.Debug|Any CPU.Build.0 = Debug|Any CPU - {83FE9011-B587-4015-93D6-68BEC8E243B2}.Release|Any CPU.ActiveCfg = Release|Any CPU - {83FE9011-B587-4015-93D6-68BEC8E243B2}.Release|Any CPU.Build.0 = Release|Any CPU - {865EA40F-F627-412A-82B1-107034E3E94C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {865EA40F-F627-412A-82B1-107034E3E94C}.Debug|Any CPU.Build.0 = Debug|Any CPU - {865EA40F-F627-412A-82B1-107034E3E94C}.Release|Any CPU.ActiveCfg = Release|Any CPU - {865EA40F-F627-412A-82B1-107034E3E94C}.Release|Any CPU.Build.0 = Release|Any CPU - {E1C36040-87FB-4250-BF0E-6A8E270825A9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {E1C36040-87FB-4250-BF0E-6A8E270825A9}.Debug|Any CPU.Build.0 = Debug|Any CPU - {E1C36040-87FB-4250-BF0E-6A8E270825A9}.Release|Any CPU.ActiveCfg = Release|Any CPU - {E1C36040-87FB-4250-BF0E-6A8E270825A9}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -800,25 +702,6 @@ Global {F9F30B96-B456-452A-843F-904E89BB1B58} = {AD00688C-1F70-4439-BCF5-8931989359E0} {B64703AF-1554-4087-A638-E295444F2F86} = {AD00688C-1F70-4439-BCF5-8931989359E0} {F2A770E7-17A5-4009-9DE2-703940F34A3D} = {AD00688C-1F70-4439-BCF5-8931989359E0} - {7D80E979-D0C3-4D6A-8FF0-22733CAA37A3} = {CB8F4FFA-815A-426A-ADCD-C78FB35CBDA7} - {4FF7000A-2CD2-40B9-B2B0-A1EFD501A5B1} = {7D80E979-D0C3-4D6A-8FF0-22733CAA37A3} - {60986AC6-FDD9-4B57-942D-A006A83315CF} = {4FF7000A-2CD2-40B9-B2B0-A1EFD501A5B1} - {B14DE465-81BA-4242-AD2E-8BEE1F0F0D22} = {4FF7000A-2CD2-40B9-B2B0-A1EFD501A5B1} - {B2C56EF7-AB4A-454B-BC77-0F2178BBD09F} = {60986AC6-FDD9-4B57-942D-A006A83315CF} - {4F07C29E-1CAF-42A6-BC8D-E6F7575D844B} = {60986AC6-FDD9-4B57-942D-A006A83315CF} - {5193B2DC-6AE2-4279-8DC5-36B68BC89915} = {60986AC6-FDD9-4B57-942D-A006A83315CF} - {A44E43C4-2C52-4D76-BB77-A7080CBAC084} = {60986AC6-FDD9-4B57-942D-A006A83315CF} - {4659A828-333C-421E-B735-10D83CA2FD9F} = {60986AC6-FDD9-4B57-942D-A006A83315CF} - {59151C03-351A-4D36-9F6B-F1733F64D83E} = {60986AC6-FDD9-4B57-942D-A006A83315CF} - {09FDBA1B-06C4-4F34-9153-9E841305CA07} = {60986AC6-FDD9-4B57-942D-A006A83315CF} - {5BFF62AB-2FCB-4426-9A3A-0A3DA94684BC} = {60986AC6-FDD9-4B57-942D-A006A83315CF} - {D9EDC5D3-BEAC-4CE2-9216-A8EC056AE6F9} = {60986AC6-FDD9-4B57-942D-A006A83315CF} - {F138E2B8-6585-4C1C-BCD9-1CF99A2131DE} = {B14DE465-81BA-4242-AD2E-8BEE1F0F0D22} - {D19CD3F2-DABE-4F6D-9F24-AB3316528E0D} = {B14DE465-81BA-4242-AD2E-8BEE1F0F0D22} - {F28236AB-9989-4F1D-BE8A-9E25BE5D168B} = {B14DE465-81BA-4242-AD2E-8BEE1F0F0D22} - {83FE9011-B587-4015-93D6-68BEC8E243B2} = {B14DE465-81BA-4242-AD2E-8BEE1F0F0D22} - {865EA40F-F627-412A-82B1-107034E3E94C} = {B14DE465-81BA-4242-AD2E-8BEE1F0F0D22} - {E1C36040-87FB-4250-BF0E-6A8E270825A9} = {B14DE465-81BA-4242-AD2E-8BEE1F0F0D22} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {28315BFD-90E7-4E14-A2EA-F3D23AF4126F} diff --git a/samples/EasyMall/aspnet-core/src/EasyMall.Application.Contracts/EasyMall.Application.Contracts.csproj b/samples/EasyMall/aspnet-core/src/EasyMall.Application.Contracts/EasyMall.Application.Contracts.csproj index 86ca8788..e8f913ca 100644 --- a/samples/EasyMall/aspnet-core/src/EasyMall.Application.Contracts/EasyMall.Application.Contracts.csproj +++ b/samples/EasyMall/aspnet-core/src/EasyMall.Application.Contracts/EasyMall.Application.Contracts.csproj @@ -10,7 +10,6 @@ - @@ -18,6 +17,7 @@ + diff --git a/samples/EasyMall/aspnet-core/src/EasyMall.Application.Contracts/EasyMallApplicationContractsModule.cs b/samples/EasyMall/aspnet-core/src/EasyMall.Application.Contracts/EasyMallApplicationContractsModule.cs index 438bd51e..37b1013d 100644 --- a/samples/EasyMall/aspnet-core/src/EasyMall.Application.Contracts/EasyMallApplicationContractsModule.cs +++ b/samples/EasyMall/aspnet-core/src/EasyMall.Application.Contracts/EasyMallApplicationContractsModule.cs @@ -1,9 +1,9 @@ using EasyAbp.EShop.Baskets; using EasyAbp.EShop.Orders; using EasyAbp.EShop.Payments; -using EasyAbp.EShop.Payments.WeChatPay; using EasyAbp.EShop.Products; using EasyAbp.EShop.Stores; +using EasyAbp.PaymentService.WeChatPay; using Volo.Abp.Account; using Volo.Abp.FeatureManagement; using Volo.Abp.Identity; @@ -25,9 +25,9 @@ namespace EasyMall typeof(EShopBasketsApplicationContractsModule), typeof(EShopOrdersApplicationContractsModule), typeof(EShopPaymentsApplicationContractsModule), - typeof(EShopPaymentsWeChatPayApplicationContractsModule), typeof(EShopProductsApplicationContractsModule), - typeof(EShopStoresApplicationContractsModule) + typeof(EShopStoresApplicationContractsModule), + typeof(PaymentServiceWeChatPayApplicationContractsModule) )] public class EasyMallApplicationContractsModule : AbpModule { diff --git a/samples/EasyMall/aspnet-core/src/EasyMall.Application/EasyMall.Application.csproj b/samples/EasyMall/aspnet-core/src/EasyMall.Application/EasyMall.Application.csproj index 56df1fb6..a482494a 100644 --- a/samples/EasyMall/aspnet-core/src/EasyMall.Application/EasyMall.Application.csproj +++ b/samples/EasyMall/aspnet-core/src/EasyMall.Application/EasyMall.Application.csproj @@ -10,7 +10,6 @@ - @@ -19,6 +18,7 @@ + diff --git a/samples/EasyMall/aspnet-core/src/EasyMall.Application/EasyMallApplicationModule.cs b/samples/EasyMall/aspnet-core/src/EasyMall.Application/EasyMallApplicationModule.cs index e60ca6fe..e106929c 100644 --- a/samples/EasyMall/aspnet-core/src/EasyMall.Application/EasyMallApplicationModule.cs +++ b/samples/EasyMall/aspnet-core/src/EasyMall.Application/EasyMallApplicationModule.cs @@ -1,9 +1,9 @@ using EasyAbp.EShop.Baskets; using EasyAbp.EShop.Orders; using EasyAbp.EShop.Payments; -using EasyAbp.EShop.Payments.WeChatPay; using EasyAbp.EShop.Products; using EasyAbp.EShop.Stores; +using EasyAbp.PaymentService.WeChatPay; using Volo.Abp.Account; using Volo.Abp.AutoMapper; using Volo.Abp.FeatureManagement; @@ -25,9 +25,9 @@ namespace EasyMall typeof(EShopBasketsApplicationModule), typeof(EShopOrdersApplicationModule), typeof(EShopPaymentsApplicationModule), - typeof(EShopPaymentsWeChatPayApplicationModule), typeof(EShopProductsApplicationModule), - typeof(EShopStoresApplicationModule) + typeof(EShopStoresApplicationModule), + typeof(PaymentServiceWeChatPayApplicationModule) )] public class EasyMallApplicationModule : AbpModule { diff --git a/samples/EasyMall/aspnet-core/src/EasyMall.Domain.Shared/EasyMall.Domain.Shared.csproj b/samples/EasyMall/aspnet-core/src/EasyMall.Domain.Shared/EasyMall.Domain.Shared.csproj index 6281d815..29df329c 100644 --- a/samples/EasyMall/aspnet-core/src/EasyMall.Domain.Shared/EasyMall.Domain.Shared.csproj +++ b/samples/EasyMall/aspnet-core/src/EasyMall.Domain.Shared/EasyMall.Domain.Shared.csproj @@ -8,6 +8,7 @@ + @@ -26,7 +27,6 @@ - diff --git a/samples/EasyMall/aspnet-core/src/EasyMall.Domain.Shared/EasyMallDomainSharedModule.cs b/samples/EasyMall/aspnet-core/src/EasyMall.Domain.Shared/EasyMallDomainSharedModule.cs index 231797cf..d81fca27 100644 --- a/samples/EasyMall/aspnet-core/src/EasyMall.Domain.Shared/EasyMallDomainSharedModule.cs +++ b/samples/EasyMall/aspnet-core/src/EasyMall.Domain.Shared/EasyMallDomainSharedModule.cs @@ -1,9 +1,9 @@ using EasyAbp.EShop.Baskets; using EasyAbp.EShop.Orders; using EasyAbp.EShop.Payments; -using EasyAbp.EShop.Payments.WeChatPay; using EasyAbp.EShop.Products; using EasyAbp.EShop.Stores; +using EasyAbp.PaymentService.WeChatPay; using EasyMall.Localization; using Volo.Abp.AuditLogging; using Volo.Abp.BackgroundJobs; @@ -32,10 +32,10 @@ namespace EasyMall typeof(EShopBasketsDomainSharedModule), typeof(EShopOrdersDomainSharedModule), typeof(EShopPaymentsDomainSharedModule), - typeof(EShopPaymentsWeChatPayDomainSharedModule), typeof(EShopProductsDomainSharedModule), - typeof(EShopStoresDomainSharedModule) - )] + typeof(EShopStoresDomainSharedModule), + typeof(PaymentServiceWeChatPayDomainSharedModule) + )] public class EasyMallDomainSharedModule : AbpModule { public override void ConfigureServices(ServiceConfigurationContext context) diff --git a/samples/EasyMall/aspnet-core/src/EasyMall.Domain/EasyMall.Domain.csproj b/samples/EasyMall/aspnet-core/src/EasyMall.Domain/EasyMall.Domain.csproj index c09fc657..dabbeb99 100644 --- a/samples/EasyMall/aspnet-core/src/EasyMall.Domain/EasyMall.Domain.csproj +++ b/samples/EasyMall/aspnet-core/src/EasyMall.Domain/EasyMall.Domain.csproj @@ -10,7 +10,6 @@ - @@ -18,6 +17,7 @@ + diff --git a/samples/EasyMall/aspnet-core/src/EasyMall.Domain/EasyMallDomainModule.cs b/samples/EasyMall/aspnet-core/src/EasyMall.Domain/EasyMallDomainModule.cs index e2ef6c62..332dbc3d 100644 --- a/samples/EasyMall/aspnet-core/src/EasyMall.Domain/EasyMallDomainModule.cs +++ b/samples/EasyMall/aspnet-core/src/EasyMall.Domain/EasyMallDomainModule.cs @@ -1,10 +1,10 @@ using EasyAbp.EShop.Baskets; using EasyAbp.EShop.Orders; using EasyAbp.EShop.Payments; -using EasyAbp.EShop.Payments.Payments; -using EasyAbp.EShop.Payments.WeChatPay; using EasyAbp.EShop.Products; using EasyAbp.EShop.Stores; +using EasyAbp.PaymentService.Payments; +using EasyAbp.PaymentService.WeChatPay; using EasyMall.MultiTenancy; using EasyMall.ObjectExtending; using Microsoft.Extensions.DependencyInjection; @@ -37,10 +37,10 @@ namespace EasyMall typeof(EShopBasketsDomainModule), typeof(EShopOrdersDomainModule), typeof(EShopPaymentsDomainModule), - typeof(EShopPaymentsWeChatPayDomainModule), typeof(EShopProductsDomainModule), - typeof(EShopStoresDomainModule) - )] + typeof(EShopStoresDomainModule), + typeof(PaymentServiceWeChatPayDomainModule) + )] public class EasyMallDomainModule : AbpModule { public override void PreConfigureServices(ServiceConfigurationContext context) @@ -60,6 +60,7 @@ namespace EasyMall { var resolver = context.ServiceProvider.GetService(); + resolver.TryRegisterProvider(FreePaymentServiceProvider.PaymentMethod, typeof(FreePaymentServiceProvider)); resolver.TryRegisterProvider(WeChatPayPaymentServiceProvider.PaymentMethod, typeof(WeChatPayPaymentServiceProvider)); } } diff --git a/samples/EasyMall/aspnet-core/src/EasyMall.EntityFrameworkCore.DbMigrations/EasyMall.EntityFrameworkCore.DbMigrations.csproj b/samples/EasyMall/aspnet-core/src/EasyMall.EntityFrameworkCore.DbMigrations/EasyMall.EntityFrameworkCore.DbMigrations.csproj index 86bafea4..98265c78 100644 --- a/samples/EasyMall/aspnet-core/src/EasyMall.EntityFrameworkCore.DbMigrations/EasyMall.EntityFrameworkCore.DbMigrations.csproj +++ b/samples/EasyMall/aspnet-core/src/EasyMall.EntityFrameworkCore.DbMigrations/EasyMall.EntityFrameworkCore.DbMigrations.csproj @@ -7,6 +7,13 @@ EasyMall + + + + + + + diff --git a/samples/EasyMall/aspnet-core/src/EasyMall.EntityFrameworkCore.DbMigrations/EntityFrameworkCore/EasyMallMigrationsDbContext.cs b/samples/EasyMall/aspnet-core/src/EasyMall.EntityFrameworkCore.DbMigrations/EntityFrameworkCore/EasyMallMigrationsDbContext.cs index 21180f44..aa2f339e 100644 --- a/samples/EasyMall/aspnet-core/src/EasyMall.EntityFrameworkCore.DbMigrations/EntityFrameworkCore/EasyMallMigrationsDbContext.cs +++ b/samples/EasyMall/aspnet-core/src/EasyMall.EntityFrameworkCore.DbMigrations/EntityFrameworkCore/EasyMallMigrationsDbContext.cs @@ -3,6 +3,7 @@ using EasyAbp.EShop.Orders.EntityFrameworkCore; using EasyAbp.EShop.Payments.EntityFrameworkCore; using EasyAbp.EShop.Products.EntityFrameworkCore; using EasyAbp.EShop.Stores.EntityFrameworkCore; +using EasyAbp.PaymentService.WeChatPay.EntityFrameworkCore; using Microsoft.EntityFrameworkCore; using Volo.Abp.AuditLogging.EntityFrameworkCore; using Volo.Abp.BackgroundJobs.EntityFrameworkCore; @@ -53,6 +54,8 @@ namespace EasyMall.EntityFrameworkCore builder.ConfigureEShopPayments(); builder.ConfigureEShopProducts(); builder.ConfigureEShopStores(); + + builder.ConfigurePaymentServiceWeChatPay(); } } } \ No newline at end of file diff --git a/samples/EasyMall/aspnet-core/src/EasyMall.EntityFrameworkCore.DbMigrations/Migrations/20200517161833_UsedPaymentServiceModule.Designer.cs b/samples/EasyMall/aspnet-core/src/EasyMall.EntityFrameworkCore.DbMigrations/Migrations/20200517161833_UsedPaymentServiceModule.Designer.cs new file mode 100644 index 00000000..82283b9a --- /dev/null +++ b/samples/EasyMall/aspnet-core/src/EasyMall.EntityFrameworkCore.DbMigrations/Migrations/20200517161833_UsedPaymentServiceModule.Designer.cs @@ -0,0 +1,2900 @@ +// +using System; +using EasyMall.EntityFrameworkCore; +using Microsoft.EntityFrameworkCore; +using Microsoft.EntityFrameworkCore.Infrastructure; +using Microsoft.EntityFrameworkCore.Metadata; +using Microsoft.EntityFrameworkCore.Migrations; +using Microsoft.EntityFrameworkCore.Storage.ValueConversion; + +namespace EasyMall.Migrations +{ + [DbContext(typeof(EasyMallMigrationsDbContext))] + [Migration("20200517161833_UsedPaymentServiceModule")] + partial class UsedPaymentServiceModule + { + protected override void BuildTargetModel(ModelBuilder modelBuilder) + { +#pragma warning disable 612, 618 + modelBuilder + .HasAnnotation("ProductVersion", "3.1.2") + .HasAnnotation("Relational:MaxIdentifierLength", 128) + .HasAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn); + + modelBuilder.Entity("EasyAbp.EShop.Orders.Orders.Order", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("uniqueidentifier"); + + b.Property("CancelledTime") + .HasColumnType("datetime2"); + + b.Property("CompletionTime") + .HasColumnType("datetime2"); + + b.Property("ConcurrencyStamp") + .IsConcurrencyToken() + .HasColumnName("ConcurrencyStamp") + .HasColumnType("nvarchar(max)"); + + b.Property("CreationTime") + .HasColumnName("CreationTime") + .HasColumnType("datetime2"); + + b.Property("CreatorId") + .HasColumnName("CreatorId") + .HasColumnType("uniqueidentifier"); + + b.Property("Currency") + .HasColumnType("nvarchar(max)"); + + b.Property("CustomerRemark") + .HasColumnType("nvarchar(max)"); + + b.Property("CustomerUserId") + .HasColumnType("uniqueidentifier"); + + b.Property("DeleterId") + .HasColumnName("DeleterId") + .HasColumnType("uniqueidentifier"); + + b.Property("DeletionTime") + .HasColumnName("DeletionTime") + .HasColumnType("datetime2"); + + b.Property("ExtraProperties") + .HasColumnName("ExtraProperties") + .HasColumnType("nvarchar(max)"); + + b.Property("IsDeleted") + .ValueGeneratedOnAdd() + .HasColumnName("IsDeleted") + .HasColumnType("bit") + .HasDefaultValue(false); + + b.Property("LastModificationTime") + .HasColumnName("LastModificationTime") + .HasColumnType("datetime2"); + + b.Property("LastModifierId") + .HasColumnName("LastModifierId") + .HasColumnType("uniqueidentifier"); + + b.Property("OrderStatus") + .HasColumnType("int"); + + b.Property("PaidTime") + .HasColumnType("datetime2"); + + b.Property("PaymentId") + .HasColumnType("uniqueidentifier"); + + b.Property("ProductTotalPrice") + .HasColumnType("decimal(18,6)"); + + b.Property("ReducedInventoryAfterPaymentTime") + .HasColumnType("datetime2"); + + b.Property("ReducedInventoryAfterPlacingTime") + .HasColumnType("datetime2"); + + b.Property("RefundedAmount") + .HasColumnType("decimal(18,6)"); + + b.Property("StaffRemark") + .HasColumnType("nvarchar(max)"); + + b.Property("StoreId") + .HasColumnType("uniqueidentifier"); + + b.Property("TenantId") + .HasColumnName("TenantId") + .HasColumnType("uniqueidentifier"); + + b.Property("TotalDiscount") + .HasColumnType("decimal(18,6)"); + + b.Property("TotalPrice") + .HasColumnType("decimal(18,6)"); + + b.HasKey("Id"); + + b.ToTable("OrdersOrders"); + }); + + modelBuilder.Entity("EasyAbp.EShop.Orders.Orders.OrderLine", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("uniqueidentifier"); + + b.Property("CreationTime") + .HasColumnName("CreationTime") + .HasColumnType("datetime2"); + + b.Property("CreatorId") + .HasColumnName("CreatorId") + .HasColumnType("uniqueidentifier"); + + b.Property("Currency") + .HasColumnType("nvarchar(max)"); + + b.Property("DeleterId") + .HasColumnName("DeleterId") + .HasColumnType("uniqueidentifier"); + + b.Property("DeletionTime") + .HasColumnName("DeletionTime") + .HasColumnType("datetime2"); + + b.Property("IsDeleted") + .ValueGeneratedOnAdd() + .HasColumnName("IsDeleted") + .HasColumnType("bit") + .HasDefaultValue(false); + + b.Property("LastModificationTime") + .HasColumnName("LastModificationTime") + .HasColumnType("datetime2"); + + b.Property("LastModifierId") + .HasColumnName("LastModifierId") + .HasColumnType("uniqueidentifier"); + + b.Property("MediaResources") + .HasColumnType("nvarchar(max)"); + + b.Property("OrderId") + .HasColumnType("uniqueidentifier"); + + b.Property("ProductDetailModificationTime") + .HasColumnType("datetime2"); + + b.Property("ProductId") + .HasColumnType("uniqueidentifier"); + + b.Property("ProductModificationTime") + .HasColumnType("datetime2"); + + b.Property("ProductName") + .HasColumnType("nvarchar(max)"); + + b.Property("ProductSkuId") + .HasColumnType("uniqueidentifier"); + + b.Property("Quantity") + .HasColumnType("int"); + + b.Property("SkuDescription") + .HasColumnType("nvarchar(max)"); + + b.Property("TotalDiscount") + .HasColumnType("decimal(18,6)"); + + b.Property("TotalPrice") + .HasColumnType("decimal(18,6)"); + + b.Property("UnitPrice") + .HasColumnType("decimal(18,6)"); + + b.HasKey("Id"); + + b.HasIndex("OrderId"); + + b.ToTable("OrdersOrderLines"); + }); + + modelBuilder.Entity("EasyAbp.EShop.Products.Categories.Category", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("uniqueidentifier"); + + b.Property("ConcurrencyStamp") + .IsConcurrencyToken() + .HasColumnName("ConcurrencyStamp") + .HasColumnType("nvarchar(max)"); + + b.Property("CreationTime") + .HasColumnName("CreationTime") + .HasColumnType("datetime2"); + + b.Property("CreatorId") + .HasColumnName("CreatorId") + .HasColumnType("uniqueidentifier"); + + b.Property("DeleterId") + .HasColumnName("DeleterId") + .HasColumnType("uniqueidentifier"); + + b.Property("DeletionTime") + .HasColumnName("DeletionTime") + .HasColumnType("datetime2"); + + b.Property("Description") + .HasColumnType("nvarchar(max)"); + + b.Property("DisplayName") + .HasColumnType("nvarchar(max)"); + + b.Property("ExtraProperties") + .HasColumnName("ExtraProperties") + .HasColumnType("nvarchar(max)"); + + b.Property("IsDeleted") + .ValueGeneratedOnAdd() + .HasColumnName("IsDeleted") + .HasColumnType("bit") + .HasDefaultValue(false); + + b.Property("IsHidden") + .HasColumnType("bit"); + + b.Property("LastModificationTime") + .HasColumnName("LastModificationTime") + .HasColumnType("datetime2"); + + b.Property("LastModifierId") + .HasColumnName("LastModifierId") + .HasColumnType("uniqueidentifier"); + + b.Property("MediaResources") + .HasColumnType("nvarchar(max)"); + + b.Property("ParentCategoryId") + .HasColumnType("uniqueidentifier"); + + b.Property("TenantId") + .HasColumnName("TenantId") + .HasColumnType("uniqueidentifier"); + + b.HasKey("Id"); + + b.ToTable("ProductsCategories"); + }); + + modelBuilder.Entity("EasyAbp.EShop.Products.ProductCategories.ProductCategory", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("uniqueidentifier"); + + b.Property("CategoryId") + .HasColumnType("uniqueidentifier"); + + b.Property("ConcurrencyStamp") + .IsConcurrencyToken() + .HasColumnName("ConcurrencyStamp") + .HasColumnType("nvarchar(max)"); + + b.Property("CreationTime") + .HasColumnName("CreationTime") + .HasColumnType("datetime2"); + + b.Property("CreatorId") + .HasColumnName("CreatorId") + .HasColumnType("uniqueidentifier"); + + b.Property("DisplayOrder") + .HasColumnType("int"); + + b.Property("ExtraProperties") + .HasColumnName("ExtraProperties") + .HasColumnType("nvarchar(max)"); + + b.Property("LastModificationTime") + .HasColumnName("LastModificationTime") + .HasColumnType("datetime2"); + + b.Property("LastModifierId") + .HasColumnName("LastModifierId") + .HasColumnType("uniqueidentifier"); + + b.Property("ProductId") + .HasColumnType("uniqueidentifier"); + + b.Property("TenantId") + .HasColumnName("TenantId") + .HasColumnType("uniqueidentifier"); + + b.HasKey("Id"); + + b.ToTable("ProductsProductCategories"); + }); + + modelBuilder.Entity("EasyAbp.EShop.Products.ProductDetailHistories.ProductDetailHistory", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("uniqueidentifier"); + + b.Property("ConcurrencyStamp") + .IsConcurrencyToken() + .HasColumnName("ConcurrencyStamp") + .HasColumnType("nvarchar(max)"); + + b.Property("ExtraProperties") + .HasColumnName("ExtraProperties") + .HasColumnType("nvarchar(max)"); + + b.Property("ModificationTime") + .HasColumnType("datetime2"); + + b.Property("ProductDetailId") + .HasColumnType("uniqueidentifier"); + + b.Property("SerializedDto") + .HasColumnType("nvarchar(max)"); + + b.HasKey("Id"); + + b.HasIndex("ModificationTime"); + + b.HasIndex("ProductDetailId"); + + b.ToTable("ProductsProductDetailHistories"); + }); + + modelBuilder.Entity("EasyAbp.EShop.Products.ProductDetails.ProductDetail", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("uniqueidentifier"); + + b.Property("ConcurrencyStamp") + .IsConcurrencyToken() + .HasColumnName("ConcurrencyStamp") + .HasColumnType("nvarchar(max)"); + + b.Property("CreationTime") + .HasColumnName("CreationTime") + .HasColumnType("datetime2"); + + b.Property("CreatorId") + .HasColumnName("CreatorId") + .HasColumnType("uniqueidentifier"); + + b.Property("DeleterId") + .HasColumnName("DeleterId") + .HasColumnType("uniqueidentifier"); + + b.Property("DeletionTime") + .HasColumnName("DeletionTime") + .HasColumnType("datetime2"); + + b.Property("Description") + .HasColumnType("nvarchar(max)"); + + b.Property("ExtraProperties") + .HasColumnName("ExtraProperties") + .HasColumnType("nvarchar(max)"); + + b.Property("IsDeleted") + .ValueGeneratedOnAdd() + .HasColumnName("IsDeleted") + .HasColumnType("bit") + .HasDefaultValue(false); + + b.Property("LastModificationTime") + .HasColumnName("LastModificationTime") + .HasColumnType("datetime2"); + + b.Property("LastModifierId") + .HasColumnName("LastModifierId") + .HasColumnType("uniqueidentifier"); + + b.HasKey("Id"); + + b.ToTable("ProductsProductDetails"); + }); + + modelBuilder.Entity("EasyAbp.EShop.Products.ProductHistories.ProductHistory", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("uniqueidentifier"); + + b.Property("ConcurrencyStamp") + .IsConcurrencyToken() + .HasColumnName("ConcurrencyStamp") + .HasColumnType("nvarchar(max)"); + + b.Property("ExtraProperties") + .HasColumnName("ExtraProperties") + .HasColumnType("nvarchar(max)"); + + b.Property("ModificationTime") + .HasColumnType("datetime2"); + + b.Property("ProductId") + .HasColumnType("uniqueidentifier"); + + b.Property("SerializedDto") + .HasColumnType("nvarchar(max)"); + + b.HasKey("Id"); + + b.HasIndex("ModificationTime"); + + b.HasIndex("ProductId"); + + b.ToTable("ProductsProductHistories"); + }); + + modelBuilder.Entity("EasyAbp.EShop.Products.ProductStores.ProductStore", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("uniqueidentifier"); + + b.Property("ConcurrencyStamp") + .IsConcurrencyToken() + .HasColumnName("ConcurrencyStamp") + .HasColumnType("nvarchar(max)"); + + b.Property("CreationTime") + .HasColumnName("CreationTime") + .HasColumnType("datetime2"); + + b.Property("CreatorId") + .HasColumnName("CreatorId") + .HasColumnType("uniqueidentifier"); + + b.Property("DeleterId") + .HasColumnName("DeleterId") + .HasColumnType("uniqueidentifier"); + + b.Property("DeletionTime") + .HasColumnName("DeletionTime") + .HasColumnType("datetime2"); + + b.Property("ExtraProperties") + .HasColumnName("ExtraProperties") + .HasColumnType("nvarchar(max)"); + + b.Property("IsDeleted") + .ValueGeneratedOnAdd() + .HasColumnName("IsDeleted") + .HasColumnType("bit") + .HasDefaultValue(false); + + b.Property("IsOwner") + .HasColumnType("bit"); + + b.Property("LastModificationTime") + .HasColumnName("LastModificationTime") + .HasColumnType("datetime2"); + + b.Property("LastModifierId") + .HasColumnName("LastModifierId") + .HasColumnType("uniqueidentifier"); + + b.Property("ProductId") + .HasColumnType("uniqueidentifier"); + + b.Property("StoreId") + .HasColumnType("uniqueidentifier"); + + b.Property("TenantId") + .HasColumnName("TenantId") + .HasColumnType("uniqueidentifier"); + + b.HasKey("Id"); + + b.ToTable("ProductsProductStores"); + }); + + modelBuilder.Entity("EasyAbp.EShop.Products.ProductTypes.ProductType", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("uniqueidentifier"); + + b.Property("ConcurrencyStamp") + .IsConcurrencyToken() + .HasColumnName("ConcurrencyStamp") + .HasColumnType("nvarchar(max)"); + + b.Property("CreationTime") + .HasColumnName("CreationTime") + .HasColumnType("datetime2"); + + b.Property("CreatorId") + .HasColumnName("CreatorId") + .HasColumnType("uniqueidentifier"); + + b.Property("DeleterId") + .HasColumnName("DeleterId") + .HasColumnType("uniqueidentifier"); + + b.Property("DeletionTime") + .HasColumnName("DeletionTime") + .HasColumnType("datetime2"); + + b.Property("Description") + .HasColumnType("nvarchar(max)"); + + b.Property("DisplayName") + .HasColumnType("nvarchar(max)"); + + b.Property("ExtraProperties") + .HasColumnName("ExtraProperties") + .HasColumnType("nvarchar(max)"); + + b.Property("IsDeleted") + .ValueGeneratedOnAdd() + .HasColumnName("IsDeleted") + .HasColumnType("bit") + .HasDefaultValue(false); + + b.Property("LastModificationTime") + .HasColumnName("LastModificationTime") + .HasColumnType("datetime2"); + + b.Property("LastModifierId") + .HasColumnName("LastModifierId") + .HasColumnType("uniqueidentifier"); + + b.Property("MultiTenancySide") + .HasColumnType("int"); + + b.Property("Name") + .HasColumnType("nvarchar(max)"); + + b.HasKey("Id"); + + b.ToTable("ProductsProductTypes"); + }); + + modelBuilder.Entity("EasyAbp.EShop.Products.Products.Product", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("uniqueidentifier"); + + b.Property("ConcurrencyStamp") + .IsConcurrencyToken() + .HasColumnName("ConcurrencyStamp") + .HasColumnType("nvarchar(max)"); + + b.Property("CreationTime") + .HasColumnName("CreationTime") + .HasColumnType("datetime2"); + + b.Property("CreatorId") + .HasColumnName("CreatorId") + .HasColumnType("uniqueidentifier"); + + b.Property("DeleterId") + .HasColumnName("DeleterId") + .HasColumnType("uniqueidentifier"); + + b.Property("DeletionTime") + .HasColumnName("DeletionTime") + .HasColumnType("datetime2"); + + b.Property("DisplayName") + .HasColumnType("nvarchar(max)"); + + b.Property("DisplayOrder") + .HasColumnType("int"); + + b.Property("ExtraProperties") + .HasColumnName("ExtraProperties") + .HasColumnType("nvarchar(max)"); + + b.Property("InventoryStrategy") + .HasColumnType("int"); + + b.Property("IsDeleted") + .ValueGeneratedOnAdd() + .HasColumnName("IsDeleted") + .HasColumnType("bit") + .HasDefaultValue(false); + + b.Property("IsHidden") + .HasColumnType("bit"); + + b.Property("IsPublished") + .HasColumnType("bit"); + + b.Property("IsStatic") + .HasColumnType("bit"); + + b.Property("LastModificationTime") + .HasColumnName("LastModificationTime") + .HasColumnType("datetime2"); + + b.Property("LastModifierId") + .HasColumnName("LastModifierId") + .HasColumnType("uniqueidentifier"); + + b.Property("MediaResources") + .HasColumnType("nvarchar(max)"); + + b.Property("ProductDetailId") + .HasColumnType("uniqueidentifier"); + + b.Property("ProductTypeId") + .HasColumnType("uniqueidentifier"); + + b.HasKey("Id"); + + b.ToTable("ProductsProducts"); + }); + + modelBuilder.Entity("EasyAbp.EShop.Products.Products.ProductAttribute", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("uniqueidentifier"); + + b.Property("CreationTime") + .HasColumnName("CreationTime") + .HasColumnType("datetime2"); + + b.Property("CreatorId") + .HasColumnName("CreatorId") + .HasColumnType("uniqueidentifier"); + + b.Property("DeleterId") + .HasColumnName("DeleterId") + .HasColumnType("uniqueidentifier"); + + b.Property("DeletionTime") + .HasColumnName("DeletionTime") + .HasColumnType("datetime2"); + + b.Property("Description") + .HasColumnType("nvarchar(max)"); + + b.Property("DisplayName") + .HasColumnType("nvarchar(max)"); + + b.Property("DisplayOrder") + .HasColumnType("int"); + + b.Property("IsDeleted") + .ValueGeneratedOnAdd() + .HasColumnName("IsDeleted") + .HasColumnType("bit") + .HasDefaultValue(false); + + b.Property("LastModificationTime") + .HasColumnName("LastModificationTime") + .HasColumnType("datetime2"); + + b.Property("LastModifierId") + .HasColumnName("LastModifierId") + .HasColumnType("uniqueidentifier"); + + b.Property("ProductId") + .HasColumnType("uniqueidentifier"); + + b.HasKey("Id"); + + b.HasIndex("ProductId"); + + b.ToTable("ProductsProductAttributes"); + }); + + modelBuilder.Entity("EasyAbp.EShop.Products.Products.ProductAttributeOption", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("uniqueidentifier"); + + b.Property("CreationTime") + .HasColumnName("CreationTime") + .HasColumnType("datetime2"); + + b.Property("CreatorId") + .HasColumnName("CreatorId") + .HasColumnType("uniqueidentifier"); + + b.Property("DeleterId") + .HasColumnName("DeleterId") + .HasColumnType("uniqueidentifier"); + + b.Property("DeletionTime") + .HasColumnName("DeletionTime") + .HasColumnType("datetime2"); + + b.Property("Description") + .HasColumnType("nvarchar(max)"); + + b.Property("DisplayName") + .HasColumnType("nvarchar(max)"); + + b.Property("DisplayOrder") + .HasColumnType("int"); + + b.Property("IsDeleted") + .ValueGeneratedOnAdd() + .HasColumnName("IsDeleted") + .HasColumnType("bit") + .HasDefaultValue(false); + + b.Property("LastModificationTime") + .HasColumnName("LastModificationTime") + .HasColumnType("datetime2"); + + b.Property("LastModifierId") + .HasColumnName("LastModifierId") + .HasColumnType("uniqueidentifier"); + + b.Property("ProductAttributeId") + .HasColumnType("uniqueidentifier"); + + b.HasKey("Id"); + + b.HasIndex("ProductAttributeId"); + + b.ToTable("ProductsProductAttributeOptions"); + }); + + modelBuilder.Entity("EasyAbp.EShop.Products.Products.ProductSku", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("uniqueidentifier"); + + b.Property("CreationTime") + .HasColumnName("CreationTime") + .HasColumnType("datetime2"); + + b.Property("CreatorId") + .HasColumnName("CreatorId") + .HasColumnType("uniqueidentifier"); + + b.Property("Currency") + .HasColumnType("nvarchar(max)"); + + b.Property("DeleterId") + .HasColumnName("DeleterId") + .HasColumnType("uniqueidentifier"); + + b.Property("DeletionTime") + .HasColumnName("DeletionTime") + .HasColumnType("datetime2"); + + b.Property("Inventory") + .HasColumnType("int"); + + b.Property("IsDeleted") + .ValueGeneratedOnAdd() + .HasColumnName("IsDeleted") + .HasColumnType("bit") + .HasDefaultValue(false); + + b.Property("LastModificationTime") + .HasColumnName("LastModificationTime") + .HasColumnType("datetime2"); + + b.Property("LastModifierId") + .HasColumnName("LastModifierId") + .HasColumnType("uniqueidentifier"); + + b.Property("OrderMinQuantity") + .HasColumnType("int"); + + b.Property("OriginalPrice") + .HasColumnType("decimal(18,6)"); + + b.Property("Price") + .HasColumnType("decimal(18,6)"); + + b.Property("ProductDetailId") + .HasColumnType("uniqueidentifier"); + + b.Property("ProductId") + .HasColumnType("uniqueidentifier"); + + b.Property("SerializedAttributeOptionIds") + .HasColumnType("nvarchar(max)"); + + b.Property("Sold") + .HasColumnType("int"); + + b.HasKey("Id"); + + b.HasIndex("ProductId"); + + b.ToTable("ProductsProductSkus"); + }); + + modelBuilder.Entity("EasyAbp.EShop.Stores.Stores.Store", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("uniqueidentifier"); + + b.Property("ConcurrencyStamp") + .IsConcurrencyToken() + .HasColumnName("ConcurrencyStamp") + .HasColumnType("nvarchar(max)"); + + b.Property("CreationTime") + .HasColumnName("CreationTime") + .HasColumnType("datetime2"); + + b.Property("CreatorId") + .HasColumnName("CreatorId") + .HasColumnType("uniqueidentifier"); + + b.Property("DeleterId") + .HasColumnName("DeleterId") + .HasColumnType("uniqueidentifier"); + + b.Property("DeletionTime") + .HasColumnName("DeletionTime") + .HasColumnType("datetime2"); + + b.Property("ExtraProperties") + .HasColumnName("ExtraProperties") + .HasColumnType("nvarchar(max)"); + + b.Property("IsDeleted") + .ValueGeneratedOnAdd() + .HasColumnName("IsDeleted") + .HasColumnType("bit") + .HasDefaultValue(false); + + b.Property("LastModificationTime") + .HasColumnName("LastModificationTime") + .HasColumnType("datetime2"); + + b.Property("LastModifierId") + .HasColumnName("LastModifierId") + .HasColumnType("uniqueidentifier"); + + b.Property("Name") + .HasColumnType("nvarchar(max)"); + + b.Property("TenantId") + .HasColumnName("TenantId") + .HasColumnType("uniqueidentifier"); + + b.HasKey("Id"); + + b.ToTable("StoresStores"); + }); + + modelBuilder.Entity("EasyAbp.PaymentService.Payments.Payment", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("uniqueidentifier"); + + b.Property("ActualPaymentAmount") + .HasColumnType("decimal(18,6)"); + + b.Property("CompletionTime") + .HasColumnType("datetime2"); + + b.Property("ConcurrencyStamp") + .IsConcurrencyToken() + .HasColumnName("ConcurrencyStamp") + .HasColumnType("nvarchar(max)"); + + b.Property("CreationTime") + .HasColumnName("CreationTime") + .HasColumnType("datetime2"); + + b.Property("CreatorId") + .HasColumnName("CreatorId") + .HasColumnType("uniqueidentifier"); + + b.Property("Currency") + .HasColumnType("nvarchar(max)"); + + b.Property("DeleterId") + .HasColumnName("DeleterId") + .HasColumnType("uniqueidentifier"); + + b.Property("DeletionTime") + .HasColumnName("DeletionTime") + .HasColumnType("datetime2"); + + b.Property("ExternalTradingCode") + .HasColumnType("nvarchar(max)"); + + b.Property("ExtraProperties") + .HasColumnName("ExtraProperties") + .HasColumnType("nvarchar(max)"); + + b.Property("IsDeleted") + .ValueGeneratedOnAdd() + .HasColumnName("IsDeleted") + .HasColumnType("bit") + .HasDefaultValue(false); + + b.Property("LastModificationTime") + .HasColumnName("LastModificationTime") + .HasColumnType("datetime2"); + + b.Property("LastModifierId") + .HasColumnName("LastModifierId") + .HasColumnType("uniqueidentifier"); + + b.Property("OriginalPaymentAmount") + .HasColumnType("decimal(18,6)"); + + b.Property("PayeeAccount") + .HasColumnType("nvarchar(max)"); + + b.Property("PaymentDiscount") + .HasColumnType("decimal(18,6)"); + + b.Property("PaymentMethod") + .HasColumnType("nvarchar(max)"); + + b.Property("RefundAmount") + .HasColumnType("decimal(18,6)"); + + b.Property("TenantId") + .HasColumnName("TenantId") + .HasColumnType("uniqueidentifier"); + + b.Property("UserId") + .HasColumnType("uniqueidentifier"); + + b.HasKey("Id"); + + b.ToTable("PaymentServicePayments"); + }); + + modelBuilder.Entity("EasyAbp.PaymentService.Payments.PaymentItem", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("uniqueidentifier"); + + b.Property("ActualPaymentAmount") + .HasColumnType("decimal(18,6)"); + + b.Property("CreationTime") + .HasColumnName("CreationTime") + .HasColumnType("datetime2"); + + b.Property("CreatorId") + .HasColumnName("CreatorId") + .HasColumnType("uniqueidentifier"); + + b.Property("Currency") + .HasColumnType("nvarchar(max)"); + + b.Property("DeleterId") + .HasColumnName("DeleterId") + .HasColumnType("uniqueidentifier"); + + b.Property("DeletionTime") + .HasColumnName("DeletionTime") + .HasColumnType("datetime2"); + + b.Property("IsDeleted") + .ValueGeneratedOnAdd() + .HasColumnName("IsDeleted") + .HasColumnType("bit") + .HasDefaultValue(false); + + b.Property("ItemKey") + .HasColumnType("uniqueidentifier"); + + b.Property("ItemType") + .HasColumnType("nvarchar(max)"); + + b.Property("LastModificationTime") + .HasColumnName("LastModificationTime") + .HasColumnType("datetime2"); + + b.Property("LastModifierId") + .HasColumnName("LastModifierId") + .HasColumnType("uniqueidentifier"); + + b.Property("OriginalPaymentAmount") + .HasColumnType("decimal(18,6)"); + + b.Property("PaymentDiscount") + .HasColumnType("decimal(18,6)"); + + b.Property("PaymentId") + .HasColumnType("uniqueidentifier"); + + b.Property("RefundAmount") + .HasColumnType("decimal(18,6)"); + + b.HasKey("Id"); + + b.HasIndex("PaymentId"); + + b.ToTable("PaymentServicePaymentItems"); + }); + + modelBuilder.Entity("EasyAbp.PaymentService.Refunds.Refund", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("uniqueidentifier"); + + b.Property("ConcurrencyStamp") + .IsConcurrencyToken() + .HasColumnName("ConcurrencyStamp") + .HasColumnType("nvarchar(max)"); + + b.Property("CreationTime") + .HasColumnName("CreationTime") + .HasColumnType("datetime2"); + + b.Property("CreatorId") + .HasColumnName("CreatorId") + .HasColumnType("uniqueidentifier"); + + b.Property("Currency") + .HasColumnType("nvarchar(max)"); + + b.Property("CustomerRemark") + .HasColumnType("nvarchar(max)"); + + b.Property("DeleterId") + .HasColumnName("DeleterId") + .HasColumnType("uniqueidentifier"); + + b.Property("DeletionTime") + .HasColumnName("DeletionTime") + .HasColumnType("datetime2"); + + b.Property("ExternalTradingCode") + .HasColumnType("nvarchar(max)"); + + b.Property("ExtraProperties") + .HasColumnName("ExtraProperties") + .HasColumnType("nvarchar(max)"); + + b.Property("IsDeleted") + .ValueGeneratedOnAdd() + .HasColumnName("IsDeleted") + .HasColumnType("bit") + .HasDefaultValue(false); + + b.Property("LastModificationTime") + .HasColumnName("LastModificationTime") + .HasColumnType("datetime2"); + + b.Property("LastModifierId") + .HasColumnName("LastModifierId") + .HasColumnType("uniqueidentifier"); + + b.Property("PaymentId") + .HasColumnType("uniqueidentifier"); + + b.Property("PaymentItemId") + .HasColumnType("uniqueidentifier"); + + b.Property("RefundAmount") + .HasColumnType("decimal(18,6)"); + + b.Property("RefundPaymentMethod") + .HasColumnType("nvarchar(max)"); + + b.Property("StaffRemark") + .HasColumnType("nvarchar(max)"); + + b.Property("TenantId") + .HasColumnName("TenantId") + .HasColumnType("uniqueidentifier"); + + b.HasKey("Id"); + + b.ToTable("PaymentServiceRefunds"); + }); + + modelBuilder.Entity("Volo.Abp.AuditLogging.AuditLog", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("uniqueidentifier"); + + b.Property("ApplicationName") + .HasColumnName("ApplicationName") + .HasColumnType("nvarchar(96)") + .HasMaxLength(96); + + b.Property("BrowserInfo") + .HasColumnName("BrowserInfo") + .HasColumnType("nvarchar(512)") + .HasMaxLength(512); + + b.Property("ClientId") + .HasColumnName("ClientId") + .HasColumnType("nvarchar(64)") + .HasMaxLength(64); + + b.Property("ClientIpAddress") + .HasColumnName("ClientIpAddress") + .HasColumnType("nvarchar(64)") + .HasMaxLength(64); + + b.Property("ClientName") + .HasColumnName("ClientName") + .HasColumnType("nvarchar(128)") + .HasMaxLength(128); + + b.Property("Comments") + .HasColumnName("Comments") + .HasColumnType("nvarchar(256)") + .HasMaxLength(256); + + b.Property("ConcurrencyStamp") + .IsConcurrencyToken() + .HasColumnName("ConcurrencyStamp") + .HasColumnType("nvarchar(max)"); + + b.Property("CorrelationId") + .HasColumnName("CorrelationId") + .HasColumnType("nvarchar(64)") + .HasMaxLength(64); + + b.Property("Exceptions") + .HasColumnName("Exceptions") + .HasColumnType("nvarchar(4000)") + .HasMaxLength(4000); + + b.Property("ExecutionDuration") + .HasColumnName("ExecutionDuration") + .HasColumnType("int"); + + b.Property("ExecutionTime") + .HasColumnType("datetime2"); + + b.Property("ExtraProperties") + .HasColumnName("ExtraProperties") + .HasColumnType("nvarchar(max)"); + + b.Property("HttpMethod") + .HasColumnName("HttpMethod") + .HasColumnType("nvarchar(16)") + .HasMaxLength(16); + + b.Property("HttpStatusCode") + .HasColumnName("HttpStatusCode") + .HasColumnType("int"); + + b.Property("ImpersonatorTenantId") + .HasColumnName("ImpersonatorTenantId") + .HasColumnType("uniqueidentifier"); + + b.Property("ImpersonatorUserId") + .HasColumnName("ImpersonatorUserId") + .HasColumnType("uniqueidentifier"); + + b.Property("TenantId") + .HasColumnName("TenantId") + .HasColumnType("uniqueidentifier"); + + b.Property("TenantName") + .HasColumnType("nvarchar(max)"); + + b.Property("Url") + .HasColumnName("Url") + .HasColumnType("nvarchar(256)") + .HasMaxLength(256); + + b.Property("UserId") + .HasColumnName("UserId") + .HasColumnType("uniqueidentifier"); + + b.Property("UserName") + .HasColumnName("UserName") + .HasColumnType("nvarchar(256)") + .HasMaxLength(256); + + b.HasKey("Id"); + + b.HasIndex("TenantId", "ExecutionTime"); + + b.HasIndex("TenantId", "UserId", "ExecutionTime"); + + b.ToTable("AbpAuditLogs"); + }); + + modelBuilder.Entity("Volo.Abp.AuditLogging.AuditLogAction", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("uniqueidentifier"); + + b.Property("AuditLogId") + .HasColumnName("AuditLogId") + .HasColumnType("uniqueidentifier"); + + b.Property("ExecutionDuration") + .HasColumnName("ExecutionDuration") + .HasColumnType("int"); + + b.Property("ExecutionTime") + .HasColumnName("ExecutionTime") + .HasColumnType("datetime2"); + + b.Property("ExtraProperties") + .HasColumnName("ExtraProperties") + .HasColumnType("nvarchar(max)"); + + b.Property("MethodName") + .HasColumnName("MethodName") + .HasColumnType("nvarchar(128)") + .HasMaxLength(128); + + b.Property("Parameters") + .HasColumnName("Parameters") + .HasColumnType("nvarchar(2000)") + .HasMaxLength(2000); + + b.Property("ServiceName") + .HasColumnName("ServiceName") + .HasColumnType("nvarchar(256)") + .HasMaxLength(256); + + b.Property("TenantId") + .HasColumnName("TenantId") + .HasColumnType("uniqueidentifier"); + + b.HasKey("Id"); + + b.HasIndex("AuditLogId"); + + b.HasIndex("TenantId", "ServiceName", "MethodName", "ExecutionTime"); + + b.ToTable("AbpAuditLogActions"); + }); + + modelBuilder.Entity("Volo.Abp.AuditLogging.EntityChange", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("uniqueidentifier"); + + b.Property("AuditLogId") + .HasColumnName("AuditLogId") + .HasColumnType("uniqueidentifier"); + + b.Property("ChangeTime") + .HasColumnName("ChangeTime") + .HasColumnType("datetime2"); + + b.Property("ChangeType") + .HasColumnName("ChangeType") + .HasColumnType("tinyint"); + + b.Property("EntityId") + .IsRequired() + .HasColumnName("EntityId") + .HasColumnType("nvarchar(128)") + .HasMaxLength(128); + + b.Property("EntityTenantId") + .HasColumnType("uniqueidentifier"); + + b.Property("EntityTypeFullName") + .IsRequired() + .HasColumnName("EntityTypeFullName") + .HasColumnType("nvarchar(128)") + .HasMaxLength(128); + + b.Property("ExtraProperties") + .HasColumnName("ExtraProperties") + .HasColumnType("nvarchar(max)"); + + b.Property("TenantId") + .HasColumnName("TenantId") + .HasColumnType("uniqueidentifier"); + + b.HasKey("Id"); + + b.HasIndex("AuditLogId"); + + b.HasIndex("TenantId", "EntityTypeFullName", "EntityId"); + + b.ToTable("AbpEntityChanges"); + }); + + modelBuilder.Entity("Volo.Abp.AuditLogging.EntityPropertyChange", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("uniqueidentifier"); + + b.Property("EntityChangeId") + .HasColumnType("uniqueidentifier"); + + b.Property("NewValue") + .HasColumnName("NewValue") + .HasColumnType("nvarchar(512)") + .HasMaxLength(512); + + b.Property("OriginalValue") + .HasColumnName("OriginalValue") + .HasColumnType("nvarchar(512)") + .HasMaxLength(512); + + b.Property("PropertyName") + .IsRequired() + .HasColumnName("PropertyName") + .HasColumnType("nvarchar(128)") + .HasMaxLength(128); + + b.Property("PropertyTypeFullName") + .IsRequired() + .HasColumnName("PropertyTypeFullName") + .HasColumnType("nvarchar(64)") + .HasMaxLength(64); + + b.Property("TenantId") + .HasColumnName("TenantId") + .HasColumnType("uniqueidentifier"); + + b.HasKey("Id"); + + b.HasIndex("EntityChangeId"); + + b.ToTable("AbpEntityPropertyChanges"); + }); + + modelBuilder.Entity("Volo.Abp.BackgroundJobs.BackgroundJobRecord", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("uniqueidentifier"); + + b.Property("ConcurrencyStamp") + .IsConcurrencyToken() + .HasColumnName("ConcurrencyStamp") + .HasColumnType("nvarchar(max)"); + + b.Property("CreationTime") + .HasColumnName("CreationTime") + .HasColumnType("datetime2"); + + b.Property("ExtraProperties") + .HasColumnName("ExtraProperties") + .HasColumnType("nvarchar(max)"); + + b.Property("IsAbandoned") + .ValueGeneratedOnAdd() + .HasColumnType("bit") + .HasDefaultValue(false); + + b.Property("JobArgs") + .IsRequired() + .HasColumnType("nvarchar(max)") + .HasMaxLength(1048576); + + b.Property("JobName") + .IsRequired() + .HasColumnType("nvarchar(128)") + .HasMaxLength(128); + + b.Property("LastTryTime") + .HasColumnType("datetime2"); + + b.Property("NextTryTime") + .HasColumnType("datetime2"); + + b.Property("Priority") + .ValueGeneratedOnAdd() + .HasColumnType("tinyint") + .HasDefaultValue((byte)15); + + b.Property("TryCount") + .ValueGeneratedOnAdd() + .HasColumnType("smallint") + .HasDefaultValue((short)0); + + b.HasKey("Id"); + + b.HasIndex("IsAbandoned", "NextTryTime"); + + b.ToTable("AbpBackgroundJobs"); + }); + + modelBuilder.Entity("Volo.Abp.FeatureManagement.FeatureValue", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("uniqueidentifier"); + + b.Property("Name") + .IsRequired() + .HasColumnType("nvarchar(128)") + .HasMaxLength(128); + + b.Property("ProviderKey") + .HasColumnType("nvarchar(64)") + .HasMaxLength(64); + + b.Property("ProviderName") + .HasColumnType("nvarchar(64)") + .HasMaxLength(64); + + b.Property("Value") + .IsRequired() + .HasColumnType("nvarchar(128)") + .HasMaxLength(128); + + b.HasKey("Id"); + + b.HasIndex("Name", "ProviderName", "ProviderKey"); + + b.ToTable("AbpFeatureValues"); + }); + + modelBuilder.Entity("Volo.Abp.Identity.IdentityClaimType", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("uniqueidentifier"); + + b.Property("ConcurrencyStamp") + .IsConcurrencyToken() + .IsRequired() + .HasColumnName("ConcurrencyStamp") + .HasColumnType("nvarchar(256)") + .HasMaxLength(256); + + b.Property("Description") + .HasColumnType("nvarchar(256)") + .HasMaxLength(256); + + b.Property("ExtraProperties") + .HasColumnName("ExtraProperties") + .HasColumnType("nvarchar(max)"); + + b.Property("IsStatic") + .HasColumnType("bit"); + + b.Property("Name") + .IsRequired() + .HasColumnType("nvarchar(256)") + .HasMaxLength(256); + + b.Property("Regex") + .HasColumnType("nvarchar(512)") + .HasMaxLength(512); + + b.Property("RegexDescription") + .HasColumnType("nvarchar(128)") + .HasMaxLength(128); + + b.Property("Required") + .HasColumnType("bit"); + + b.Property("ValueType") + .HasColumnType("int"); + + b.HasKey("Id"); + + b.ToTable("AbpClaimTypes"); + }); + + modelBuilder.Entity("Volo.Abp.Identity.IdentityRole", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("uniqueidentifier"); + + b.Property("ConcurrencyStamp") + .IsConcurrencyToken() + .IsRequired() + .HasColumnName("ConcurrencyStamp") + .HasColumnType("nvarchar(256)") + .HasMaxLength(256); + + b.Property("ExtraProperties") + .HasColumnName("ExtraProperties") + .HasColumnType("nvarchar(max)"); + + b.Property("IsDefault") + .HasColumnName("IsDefault") + .HasColumnType("bit"); + + b.Property("IsPublic") + .HasColumnName("IsPublic") + .HasColumnType("bit"); + + b.Property("IsStatic") + .HasColumnName("IsStatic") + .HasColumnType("bit"); + + b.Property("Name") + .IsRequired() + .HasColumnType("nvarchar(256)") + .HasMaxLength(256); + + b.Property("NormalizedName") + .IsRequired() + .HasColumnType("nvarchar(256)") + .HasMaxLength(256); + + b.Property("TenantId") + .HasColumnName("TenantId") + .HasColumnType("uniqueidentifier"); + + b.HasKey("Id"); + + b.HasIndex("NormalizedName"); + + b.ToTable("AbpRoles"); + }); + + modelBuilder.Entity("Volo.Abp.Identity.IdentityRoleClaim", b => + { + b.Property("Id") + .HasColumnType("uniqueidentifier"); + + b.Property("ClaimType") + .IsRequired() + .HasColumnType("nvarchar(256)") + .HasMaxLength(256); + + b.Property("ClaimValue") + .HasColumnType("nvarchar(1024)") + .HasMaxLength(1024); + + b.Property("RoleId") + .HasColumnType("uniqueidentifier"); + + b.Property("TenantId") + .HasColumnName("TenantId") + .HasColumnType("uniqueidentifier"); + + b.HasKey("Id"); + + b.HasIndex("RoleId"); + + b.ToTable("AbpRoleClaims"); + }); + + modelBuilder.Entity("Volo.Abp.Identity.IdentityUser", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("uniqueidentifier"); + + b.Property("AccessFailedCount") + .ValueGeneratedOnAdd() + .HasColumnName("AccessFailedCount") + .HasColumnType("int") + .HasDefaultValue(0); + + b.Property("ConcurrencyStamp") + .IsConcurrencyToken() + .HasColumnName("ConcurrencyStamp") + .HasColumnType("nvarchar(max)"); + + b.Property("CreationTime") + .HasColumnName("CreationTime") + .HasColumnType("datetime2"); + + b.Property("CreatorId") + .HasColumnName("CreatorId") + .HasColumnType("uniqueidentifier"); + + b.Property("DeleterId") + .HasColumnName("DeleterId") + .HasColumnType("uniqueidentifier"); + + b.Property("DeletionTime") + .HasColumnName("DeletionTime") + .HasColumnType("datetime2"); + + b.Property("Email") + .IsRequired() + .HasColumnName("Email") + .HasColumnType("nvarchar(256)") + .HasMaxLength(256); + + b.Property("EmailConfirmed") + .ValueGeneratedOnAdd() + .HasColumnName("EmailConfirmed") + .HasColumnType("bit") + .HasDefaultValue(false); + + b.Property("ExtraProperties") + .HasColumnName("ExtraProperties") + .HasColumnType("nvarchar(max)"); + + b.Property("IsDeleted") + .ValueGeneratedOnAdd() + .HasColumnName("IsDeleted") + .HasColumnType("bit") + .HasDefaultValue(false); + + b.Property("LastModificationTime") + .HasColumnName("LastModificationTime") + .HasColumnType("datetime2"); + + b.Property("LastModifierId") + .HasColumnName("LastModifierId") + .HasColumnType("uniqueidentifier"); + + b.Property("LockoutEnabled") + .ValueGeneratedOnAdd() + .HasColumnName("LockoutEnabled") + .HasColumnType("bit") + .HasDefaultValue(false); + + b.Property("LockoutEnd") + .HasColumnType("datetimeoffset"); + + b.Property("Name") + .HasColumnName("Name") + .HasColumnType("nvarchar(64)") + .HasMaxLength(64); + + b.Property("NormalizedEmail") + .IsRequired() + .HasColumnName("NormalizedEmail") + .HasColumnType("nvarchar(256)") + .HasMaxLength(256); + + b.Property("NormalizedUserName") + .IsRequired() + .HasColumnName("NormalizedUserName") + .HasColumnType("nvarchar(256)") + .HasMaxLength(256); + + b.Property("PasswordHash") + .HasColumnName("PasswordHash") + .HasColumnType("nvarchar(256)") + .HasMaxLength(256); + + b.Property("PhoneNumber") + .HasColumnName("PhoneNumber") + .HasColumnType("nvarchar(16)") + .HasMaxLength(16); + + b.Property("PhoneNumberConfirmed") + .ValueGeneratedOnAdd() + .HasColumnName("PhoneNumberConfirmed") + .HasColumnType("bit") + .HasDefaultValue(false); + + b.Property("SecurityStamp") + .IsRequired() + .HasColumnName("SecurityStamp") + .HasColumnType("nvarchar(256)") + .HasMaxLength(256); + + b.Property("Surname") + .HasColumnName("Surname") + .HasColumnType("nvarchar(64)") + .HasMaxLength(64); + + b.Property("TenantId") + .HasColumnName("TenantId") + .HasColumnType("uniqueidentifier"); + + b.Property("TwoFactorEnabled") + .ValueGeneratedOnAdd() + .HasColumnName("TwoFactorEnabled") + .HasColumnType("bit") + .HasDefaultValue(false); + + b.Property("UserName") + .IsRequired() + .HasColumnName("UserName") + .HasColumnType("nvarchar(256)") + .HasMaxLength(256); + + b.HasKey("Id"); + + b.HasIndex("Email"); + + b.HasIndex("NormalizedEmail"); + + b.HasIndex("NormalizedUserName"); + + b.HasIndex("UserName"); + + b.ToTable("AbpUsers"); + }); + + modelBuilder.Entity("Volo.Abp.Identity.IdentityUserClaim", b => + { + b.Property("Id") + .HasColumnType("uniqueidentifier"); + + b.Property("ClaimType") + .IsRequired() + .HasColumnType("nvarchar(256)") + .HasMaxLength(256); + + b.Property("ClaimValue") + .HasColumnType("nvarchar(1024)") + .HasMaxLength(1024); + + b.Property("TenantId") + .HasColumnName("TenantId") + .HasColumnType("uniqueidentifier"); + + b.Property("UserId") + .HasColumnType("uniqueidentifier"); + + b.HasKey("Id"); + + b.HasIndex("UserId"); + + b.ToTable("AbpUserClaims"); + }); + + modelBuilder.Entity("Volo.Abp.Identity.IdentityUserLogin", b => + { + b.Property("UserId") + .HasColumnType("uniqueidentifier"); + + b.Property("LoginProvider") + .HasColumnType("nvarchar(64)") + .HasMaxLength(64); + + b.Property("ProviderDisplayName") + .HasColumnType("nvarchar(128)") + .HasMaxLength(128); + + b.Property("ProviderKey") + .IsRequired() + .HasColumnType("nvarchar(196)") + .HasMaxLength(196); + + b.Property("TenantId") + .HasColumnName("TenantId") + .HasColumnType("uniqueidentifier"); + + b.HasKey("UserId", "LoginProvider"); + + b.HasIndex("LoginProvider", "ProviderKey"); + + b.ToTable("AbpUserLogins"); + }); + + modelBuilder.Entity("Volo.Abp.Identity.IdentityUserRole", b => + { + b.Property("UserId") + .HasColumnType("uniqueidentifier"); + + b.Property("RoleId") + .HasColumnType("uniqueidentifier"); + + b.Property("TenantId") + .HasColumnName("TenantId") + .HasColumnType("uniqueidentifier"); + + b.HasKey("UserId", "RoleId"); + + b.HasIndex("RoleId", "UserId"); + + b.ToTable("AbpUserRoles"); + }); + + modelBuilder.Entity("Volo.Abp.Identity.IdentityUserToken", b => + { + b.Property("UserId") + .HasColumnType("uniqueidentifier"); + + b.Property("LoginProvider") + .HasColumnType("nvarchar(64)") + .HasMaxLength(64); + + b.Property("Name") + .HasColumnType("nvarchar(128)") + .HasMaxLength(128); + + b.Property("TenantId") + .HasColumnName("TenantId") + .HasColumnType("uniqueidentifier"); + + b.Property("Value") + .HasColumnType("nvarchar(max)"); + + b.HasKey("UserId", "LoginProvider", "Name"); + + b.ToTable("AbpUserTokens"); + }); + + modelBuilder.Entity("Volo.Abp.IdentityServer.ApiResources.ApiResource", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("uniqueidentifier"); + + b.Property("ConcurrencyStamp") + .IsConcurrencyToken() + .HasColumnName("ConcurrencyStamp") + .HasColumnType("nvarchar(max)"); + + b.Property("CreationTime") + .HasColumnName("CreationTime") + .HasColumnType("datetime2"); + + b.Property("CreatorId") + .HasColumnName("CreatorId") + .HasColumnType("uniqueidentifier"); + + b.Property("DeleterId") + .HasColumnName("DeleterId") + .HasColumnType("uniqueidentifier"); + + b.Property("DeletionTime") + .HasColumnName("DeletionTime") + .HasColumnType("datetime2"); + + b.Property("Description") + .HasColumnType("nvarchar(1000)") + .HasMaxLength(1000); + + b.Property("DisplayName") + .HasColumnType("nvarchar(200)") + .HasMaxLength(200); + + b.Property("Enabled") + .HasColumnType("bit"); + + b.Property("ExtraProperties") + .HasColumnName("ExtraProperties") + .HasColumnType("nvarchar(max)"); + + b.Property("IsDeleted") + .ValueGeneratedOnAdd() + .HasColumnName("IsDeleted") + .HasColumnType("bit") + .HasDefaultValue(false); + + b.Property("LastModificationTime") + .HasColumnName("LastModificationTime") + .HasColumnType("datetime2"); + + b.Property("LastModifierId") + .HasColumnName("LastModifierId") + .HasColumnType("uniqueidentifier"); + + b.Property("Name") + .IsRequired() + .HasColumnType("nvarchar(200)") + .HasMaxLength(200); + + b.Property("Properties") + .HasColumnType("nvarchar(max)"); + + b.HasKey("Id"); + + b.ToTable("IdentityServerApiResources"); + }); + + modelBuilder.Entity("Volo.Abp.IdentityServer.ApiResources.ApiResourceClaim", b => + { + b.Property("ApiResourceId") + .HasColumnType("uniqueidentifier"); + + b.Property("Type") + .HasColumnType("nvarchar(200)") + .HasMaxLength(200); + + b.HasKey("ApiResourceId", "Type"); + + b.ToTable("IdentityServerApiClaims"); + }); + + modelBuilder.Entity("Volo.Abp.IdentityServer.ApiResources.ApiScope", b => + { + b.Property("ApiResourceId") + .HasColumnType("uniqueidentifier"); + + b.Property("Name") + .HasColumnType("nvarchar(200)") + .HasMaxLength(200); + + b.Property("Description") + .HasColumnType("nvarchar(1000)") + .HasMaxLength(1000); + + b.Property("DisplayName") + .HasColumnType("nvarchar(200)") + .HasMaxLength(200); + + b.Property("Emphasize") + .HasColumnType("bit"); + + b.Property("Required") + .HasColumnType("bit"); + + b.Property("ShowInDiscoveryDocument") + .HasColumnType("bit"); + + b.HasKey("ApiResourceId", "Name"); + + b.ToTable("IdentityServerApiScopes"); + }); + + modelBuilder.Entity("Volo.Abp.IdentityServer.ApiResources.ApiScopeClaim", b => + { + b.Property("ApiResourceId") + .HasColumnType("uniqueidentifier"); + + b.Property("Name") + .HasColumnType("nvarchar(200)") + .HasMaxLength(200); + + b.Property("Type") + .HasColumnType("nvarchar(200)") + .HasMaxLength(200); + + b.HasKey("ApiResourceId", "Name", "Type"); + + b.ToTable("IdentityServerApiScopeClaims"); + }); + + modelBuilder.Entity("Volo.Abp.IdentityServer.ApiResources.ApiSecret", b => + { + b.Property("ApiResourceId") + .HasColumnType("uniqueidentifier"); + + b.Property("Type") + .HasColumnType("nvarchar(250)") + .HasMaxLength(250); + + b.Property("Value") + .HasColumnType("nvarchar(4000)") + .HasMaxLength(4000); + + b.Property("Description") + .HasColumnType("nvarchar(2000)") + .HasMaxLength(2000); + + b.Property("Expiration") + .HasColumnType("datetime2"); + + b.HasKey("ApiResourceId", "Type", "Value"); + + b.ToTable("IdentityServerApiSecrets"); + }); + + modelBuilder.Entity("Volo.Abp.IdentityServer.Clients.Client", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("uniqueidentifier"); + + b.Property("AbsoluteRefreshTokenLifetime") + .HasColumnType("int"); + + b.Property("AccessTokenLifetime") + .HasColumnType("int"); + + b.Property("AccessTokenType") + .HasColumnType("int"); + + b.Property("AllowAccessTokensViaBrowser") + .HasColumnType("bit"); + + b.Property("AllowOfflineAccess") + .HasColumnType("bit"); + + b.Property("AllowPlainTextPkce") + .HasColumnType("bit"); + + b.Property("AllowRememberConsent") + .HasColumnType("bit"); + + b.Property("AlwaysIncludeUserClaimsInIdToken") + .HasColumnType("bit"); + + b.Property("AlwaysSendClientClaims") + .HasColumnType("bit"); + + b.Property("AuthorizationCodeLifetime") + .HasColumnType("int"); + + b.Property("BackChannelLogoutSessionRequired") + .HasColumnType("bit"); + + b.Property("BackChannelLogoutUri") + .HasColumnType("nvarchar(2000)") + .HasMaxLength(2000); + + b.Property("ClientClaimsPrefix") + .HasColumnType("nvarchar(200)") + .HasMaxLength(200); + + b.Property("ClientId") + .IsRequired() + .HasColumnType("nvarchar(200)") + .HasMaxLength(200); + + b.Property("ClientName") + .HasColumnType("nvarchar(200)") + .HasMaxLength(200); + + b.Property("ClientUri") + .HasColumnType("nvarchar(2000)") + .HasMaxLength(2000); + + b.Property("ConcurrencyStamp") + .IsConcurrencyToken() + .HasColumnName("ConcurrencyStamp") + .HasColumnType("nvarchar(max)"); + + b.Property("ConsentLifetime") + .HasColumnType("int"); + + b.Property("CreationTime") + .HasColumnName("CreationTime") + .HasColumnType("datetime2"); + + b.Property("CreatorId") + .HasColumnName("CreatorId") + .HasColumnType("uniqueidentifier"); + + b.Property("DeleterId") + .HasColumnName("DeleterId") + .HasColumnType("uniqueidentifier"); + + b.Property("DeletionTime") + .HasColumnName("DeletionTime") + .HasColumnType("datetime2"); + + b.Property("Description") + .HasColumnType("nvarchar(1000)") + .HasMaxLength(1000); + + b.Property("DeviceCodeLifetime") + .HasColumnType("int"); + + b.Property("EnableLocalLogin") + .HasColumnType("bit"); + + b.Property("Enabled") + .HasColumnType("bit"); + + b.Property("ExtraProperties") + .HasColumnName("ExtraProperties") + .HasColumnType("nvarchar(max)"); + + b.Property("FrontChannelLogoutSessionRequired") + .HasColumnType("bit"); + + b.Property("FrontChannelLogoutUri") + .HasColumnType("nvarchar(2000)") + .HasMaxLength(2000); + + b.Property("IdentityTokenLifetime") + .HasColumnType("int"); + + b.Property("IncludeJwtId") + .HasColumnType("bit"); + + b.Property("IsDeleted") + .ValueGeneratedOnAdd() + .HasColumnName("IsDeleted") + .HasColumnType("bit") + .HasDefaultValue(false); + + b.Property("LastModificationTime") + .HasColumnName("LastModificationTime") + .HasColumnType("datetime2"); + + b.Property("LastModifierId") + .HasColumnName("LastModifierId") + .HasColumnType("uniqueidentifier"); + + b.Property("LogoUri") + .HasColumnType("nvarchar(2000)") + .HasMaxLength(2000); + + b.Property("PairWiseSubjectSalt") + .HasColumnType("nvarchar(200)") + .HasMaxLength(200); + + b.Property("ProtocolType") + .IsRequired() + .HasColumnType("nvarchar(200)") + .HasMaxLength(200); + + b.Property("RefreshTokenExpiration") + .HasColumnType("int"); + + b.Property("RefreshTokenUsage") + .HasColumnType("int"); + + b.Property("RequireClientSecret") + .HasColumnType("bit"); + + b.Property("RequireConsent") + .HasColumnType("bit"); + + b.Property("RequirePkce") + .HasColumnType("bit"); + + b.Property("SlidingRefreshTokenLifetime") + .HasColumnType("int"); + + b.Property("UpdateAccessTokenClaimsOnRefresh") + .HasColumnType("bit"); + + b.Property("UserCodeType") + .HasColumnType("nvarchar(100)") + .HasMaxLength(100); + + b.Property("UserSsoLifetime") + .HasColumnType("int"); + + b.HasKey("Id"); + + b.HasIndex("ClientId"); + + b.ToTable("IdentityServerClients"); + }); + + modelBuilder.Entity("Volo.Abp.IdentityServer.Clients.ClientClaim", b => + { + b.Property("ClientId") + .HasColumnType("uniqueidentifier"); + + b.Property("Type") + .HasColumnType("nvarchar(250)") + .HasMaxLength(250); + + b.Property("Value") + .HasColumnType("nvarchar(250)") + .HasMaxLength(250); + + b.HasKey("ClientId", "Type", "Value"); + + b.ToTable("IdentityServerClientClaims"); + }); + + modelBuilder.Entity("Volo.Abp.IdentityServer.Clients.ClientCorsOrigin", b => + { + b.Property("ClientId") + .HasColumnType("uniqueidentifier"); + + b.Property("Origin") + .HasColumnType("nvarchar(150)") + .HasMaxLength(150); + + b.HasKey("ClientId", "Origin"); + + b.ToTable("IdentityServerClientCorsOrigins"); + }); + + modelBuilder.Entity("Volo.Abp.IdentityServer.Clients.ClientGrantType", b => + { + b.Property("ClientId") + .HasColumnType("uniqueidentifier"); + + b.Property("GrantType") + .HasColumnType("nvarchar(250)") + .HasMaxLength(250); + + b.HasKey("ClientId", "GrantType"); + + b.ToTable("IdentityServerClientGrantTypes"); + }); + + modelBuilder.Entity("Volo.Abp.IdentityServer.Clients.ClientIdPRestriction", b => + { + b.Property("ClientId") + .HasColumnType("uniqueidentifier"); + + b.Property("Provider") + .HasColumnType("nvarchar(200)") + .HasMaxLength(200); + + b.HasKey("ClientId", "Provider"); + + b.ToTable("IdentityServerClientIdPRestrictions"); + }); + + modelBuilder.Entity("Volo.Abp.IdentityServer.Clients.ClientPostLogoutRedirectUri", b => + { + b.Property("ClientId") + .HasColumnType("uniqueidentifier"); + + b.Property("PostLogoutRedirectUri") + .HasColumnType("nvarchar(2000)") + .HasMaxLength(2000); + + b.HasKey("ClientId", "PostLogoutRedirectUri"); + + b.ToTable("IdentityServerClientPostLogoutRedirectUris"); + }); + + modelBuilder.Entity("Volo.Abp.IdentityServer.Clients.ClientProperty", b => + { + b.Property("ClientId") + .HasColumnType("uniqueidentifier"); + + b.Property("Key") + .HasColumnType("nvarchar(250)") + .HasMaxLength(250); + + b.Property("Value") + .IsRequired() + .HasColumnType("nvarchar(2000)") + .HasMaxLength(2000); + + b.HasKey("ClientId", "Key"); + + b.ToTable("IdentityServerClientProperties"); + }); + + modelBuilder.Entity("Volo.Abp.IdentityServer.Clients.ClientRedirectUri", b => + { + b.Property("ClientId") + .HasColumnType("uniqueidentifier"); + + b.Property("RedirectUri") + .HasColumnType("nvarchar(2000)") + .HasMaxLength(2000); + + b.HasKey("ClientId", "RedirectUri"); + + b.ToTable("IdentityServerClientRedirectUris"); + }); + + modelBuilder.Entity("Volo.Abp.IdentityServer.Clients.ClientScope", b => + { + b.Property("ClientId") + .HasColumnType("uniqueidentifier"); + + b.Property("Scope") + .HasColumnType("nvarchar(200)") + .HasMaxLength(200); + + b.HasKey("ClientId", "Scope"); + + b.ToTable("IdentityServerClientScopes"); + }); + + modelBuilder.Entity("Volo.Abp.IdentityServer.Clients.ClientSecret", b => + { + b.Property("ClientId") + .HasColumnType("uniqueidentifier"); + + b.Property("Type") + .HasColumnType("nvarchar(250)") + .HasMaxLength(250); + + b.Property("Value") + .HasColumnType("nvarchar(4000)") + .HasMaxLength(4000); + + b.Property("Description") + .HasColumnType("nvarchar(2000)") + .HasMaxLength(2000); + + b.Property("Expiration") + .HasColumnType("datetime2"); + + b.HasKey("ClientId", "Type", "Value"); + + b.ToTable("IdentityServerClientSecrets"); + }); + + modelBuilder.Entity("Volo.Abp.IdentityServer.Devices.DeviceFlowCodes", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("uniqueidentifier"); + + b.Property("ClientId") + .IsRequired() + .HasColumnType("nvarchar(200)") + .HasMaxLength(200); + + b.Property("ConcurrencyStamp") + .IsConcurrencyToken() + .HasColumnName("ConcurrencyStamp") + .HasColumnType("nvarchar(max)"); + + b.Property("CreationTime") + .HasColumnName("CreationTime") + .HasColumnType("datetime2"); + + b.Property("CreatorId") + .HasColumnName("CreatorId") + .HasColumnType("uniqueidentifier"); + + b.Property("Data") + .IsRequired() + .HasColumnType("nvarchar(max)") + .HasMaxLength(50000); + + b.Property("DeviceCode") + .IsRequired() + .HasColumnType("nvarchar(200)") + .HasMaxLength(200); + + b.Property("Expiration") + .IsRequired() + .HasColumnType("datetime2"); + + b.Property("ExtraProperties") + .HasColumnName("ExtraProperties") + .HasColumnType("nvarchar(max)"); + + b.Property("SubjectId") + .HasColumnType("nvarchar(200)") + .HasMaxLength(200); + + b.Property("UserCode") + .IsRequired() + .HasColumnType("nvarchar(200)") + .HasMaxLength(200); + + b.HasKey("Id"); + + b.HasIndex("DeviceCode") + .IsUnique(); + + b.HasIndex("Expiration"); + + b.HasIndex("UserCode") + .IsUnique(); + + b.ToTable("IdentityServerDeviceFlowCodes"); + }); + + modelBuilder.Entity("Volo.Abp.IdentityServer.Grants.PersistedGrant", b => + { + b.Property("Key") + .HasColumnType("nvarchar(200)") + .HasMaxLength(200); + + b.Property("ClientId") + .IsRequired() + .HasColumnType("nvarchar(200)") + .HasMaxLength(200); + + b.Property("ConcurrencyStamp") + .IsConcurrencyToken() + .HasColumnName("ConcurrencyStamp") + .HasColumnType("nvarchar(max)"); + + b.Property("CreationTime") + .HasColumnType("datetime2"); + + b.Property("Data") + .IsRequired() + .HasColumnType("nvarchar(max)") + .HasMaxLength(50000); + + b.Property("Expiration") + .HasColumnType("datetime2"); + + b.Property("ExtraProperties") + .HasColumnName("ExtraProperties") + .HasColumnType("nvarchar(max)"); + + b.Property("Id") + .HasColumnType("uniqueidentifier"); + + b.Property("SubjectId") + .HasColumnType("nvarchar(200)") + .HasMaxLength(200); + + b.Property("Type") + .IsRequired() + .HasColumnType("nvarchar(50)") + .HasMaxLength(50); + + b.HasKey("Key"); + + b.HasIndex("Expiration"); + + b.HasIndex("SubjectId", "ClientId", "Type"); + + b.ToTable("IdentityServerPersistedGrants"); + }); + + modelBuilder.Entity("Volo.Abp.IdentityServer.IdentityResources.IdentityClaim", b => + { + b.Property("IdentityResourceId") + .HasColumnType("uniqueidentifier"); + + b.Property("Type") + .HasColumnType("nvarchar(200)") + .HasMaxLength(200); + + b.HasKey("IdentityResourceId", "Type"); + + b.ToTable("IdentityServerIdentityClaims"); + }); + + modelBuilder.Entity("Volo.Abp.IdentityServer.IdentityResources.IdentityResource", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("uniqueidentifier"); + + b.Property("ConcurrencyStamp") + .IsConcurrencyToken() + .HasColumnName("ConcurrencyStamp") + .HasColumnType("nvarchar(max)"); + + b.Property("CreationTime") + .HasColumnName("CreationTime") + .HasColumnType("datetime2"); + + b.Property("CreatorId") + .HasColumnName("CreatorId") + .HasColumnType("uniqueidentifier"); + + b.Property("DeleterId") + .HasColumnName("DeleterId") + .HasColumnType("uniqueidentifier"); + + b.Property("DeletionTime") + .HasColumnName("DeletionTime") + .HasColumnType("datetime2"); + + b.Property("Description") + .HasColumnType("nvarchar(1000)") + .HasMaxLength(1000); + + b.Property("DisplayName") + .HasColumnType("nvarchar(200)") + .HasMaxLength(200); + + b.Property("Emphasize") + .HasColumnType("bit"); + + b.Property("Enabled") + .HasColumnType("bit"); + + b.Property("ExtraProperties") + .HasColumnName("ExtraProperties") + .HasColumnType("nvarchar(max)"); + + b.Property("IsDeleted") + .ValueGeneratedOnAdd() + .HasColumnName("IsDeleted") + .HasColumnType("bit") + .HasDefaultValue(false); + + b.Property("LastModificationTime") + .HasColumnName("LastModificationTime") + .HasColumnType("datetime2"); + + b.Property("LastModifierId") + .HasColumnName("LastModifierId") + .HasColumnType("uniqueidentifier"); + + b.Property("Name") + .IsRequired() + .HasColumnType("nvarchar(200)") + .HasMaxLength(200); + + b.Property("Properties") + .HasColumnType("nvarchar(max)"); + + b.Property("Required") + .HasColumnType("bit"); + + b.Property("ShowInDiscoveryDocument") + .HasColumnType("bit"); + + b.HasKey("Id"); + + b.ToTable("IdentityServerIdentityResources"); + }); + + modelBuilder.Entity("Volo.Abp.PermissionManagement.PermissionGrant", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("uniqueidentifier"); + + b.Property("Name") + .IsRequired() + .HasColumnType("nvarchar(128)") + .HasMaxLength(128); + + b.Property("ProviderKey") + .IsRequired() + .HasColumnType("nvarchar(64)") + .HasMaxLength(64); + + b.Property("ProviderName") + .IsRequired() + .HasColumnType("nvarchar(64)") + .HasMaxLength(64); + + b.Property("TenantId") + .HasColumnName("TenantId") + .HasColumnType("uniqueidentifier"); + + b.HasKey("Id"); + + b.HasIndex("Name", "ProviderName", "ProviderKey"); + + b.ToTable("AbpPermissionGrants"); + }); + + modelBuilder.Entity("Volo.Abp.SettingManagement.Setting", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("uniqueidentifier"); + + b.Property("Name") + .IsRequired() + .HasColumnType("nvarchar(128)") + .HasMaxLength(128); + + b.Property("ProviderKey") + .HasColumnType("nvarchar(64)") + .HasMaxLength(64); + + b.Property("ProviderName") + .HasColumnType("nvarchar(64)") + .HasMaxLength(64); + + b.Property("Value") + .IsRequired() + .HasColumnType("nvarchar(2048)") + .HasMaxLength(2048); + + b.HasKey("Id"); + + b.HasIndex("Name", "ProviderName", "ProviderKey"); + + b.ToTable("AbpSettings"); + }); + + modelBuilder.Entity("Volo.Abp.TenantManagement.Tenant", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("uniqueidentifier"); + + b.Property("ConcurrencyStamp") + .IsConcurrencyToken() + .HasColumnName("ConcurrencyStamp") + .HasColumnType("nvarchar(max)"); + + b.Property("CreationTime") + .HasColumnName("CreationTime") + .HasColumnType("datetime2"); + + b.Property("CreatorId") + .HasColumnName("CreatorId") + .HasColumnType("uniqueidentifier"); + + b.Property("DeleterId") + .HasColumnName("DeleterId") + .HasColumnType("uniqueidentifier"); + + b.Property("DeletionTime") + .HasColumnName("DeletionTime") + .HasColumnType("datetime2"); + + b.Property("ExtraProperties") + .HasColumnName("ExtraProperties") + .HasColumnType("nvarchar(max)"); + + b.Property("IsDeleted") + .ValueGeneratedOnAdd() + .HasColumnName("IsDeleted") + .HasColumnType("bit") + .HasDefaultValue(false); + + b.Property("LastModificationTime") + .HasColumnName("LastModificationTime") + .HasColumnType("datetime2"); + + b.Property("LastModifierId") + .HasColumnName("LastModifierId") + .HasColumnType("uniqueidentifier"); + + b.Property("Name") + .IsRequired() + .HasColumnType("nvarchar(64)") + .HasMaxLength(64); + + b.HasKey("Id"); + + b.HasIndex("Name"); + + b.ToTable("AbpTenants"); + }); + + modelBuilder.Entity("Volo.Abp.TenantManagement.TenantConnectionString", b => + { + b.Property("TenantId") + .HasColumnType("uniqueidentifier"); + + b.Property("Name") + .HasColumnType("nvarchar(64)") + .HasMaxLength(64); + + b.Property("Value") + .IsRequired() + .HasColumnType("nvarchar(1024)") + .HasMaxLength(1024); + + b.HasKey("TenantId", "Name"); + + b.ToTable("AbpTenantConnectionStrings"); + }); + + modelBuilder.Entity("EasyAbp.EShop.Orders.Orders.OrderLine", b => + { + b.HasOne("EasyAbp.EShop.Orders.Orders.Order", null) + .WithMany("OrderLines") + .HasForeignKey("OrderId"); + }); + + modelBuilder.Entity("EasyAbp.EShop.Products.Products.ProductAttribute", b => + { + b.HasOne("EasyAbp.EShop.Products.Products.Product", null) + .WithMany("ProductAttributes") + .HasForeignKey("ProductId"); + }); + + modelBuilder.Entity("EasyAbp.EShop.Products.Products.ProductAttributeOption", b => + { + b.HasOne("EasyAbp.EShop.Products.Products.ProductAttribute", null) + .WithMany("ProductAttributeOptions") + .HasForeignKey("ProductAttributeId"); + }); + + modelBuilder.Entity("EasyAbp.EShop.Products.Products.ProductSku", b => + { + b.HasOne("EasyAbp.EShop.Products.Products.Product", null) + .WithMany("ProductSkus") + .HasForeignKey("ProductId"); + }); + + modelBuilder.Entity("EasyAbp.PaymentService.Payments.PaymentItem", b => + { + b.HasOne("EasyAbp.PaymentService.Payments.Payment", null) + .WithMany("PaymentItems") + .HasForeignKey("PaymentId"); + }); + + modelBuilder.Entity("Volo.Abp.AuditLogging.AuditLogAction", b => + { + b.HasOne("Volo.Abp.AuditLogging.AuditLog", null) + .WithMany("Actions") + .HasForeignKey("AuditLogId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); + + modelBuilder.Entity("Volo.Abp.AuditLogging.EntityChange", b => + { + b.HasOne("Volo.Abp.AuditLogging.AuditLog", null) + .WithMany("EntityChanges") + .HasForeignKey("AuditLogId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); + + modelBuilder.Entity("Volo.Abp.AuditLogging.EntityPropertyChange", b => + { + b.HasOne("Volo.Abp.AuditLogging.EntityChange", null) + .WithMany("PropertyChanges") + .HasForeignKey("EntityChangeId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); + + modelBuilder.Entity("Volo.Abp.Identity.IdentityRoleClaim", b => + { + b.HasOne("Volo.Abp.Identity.IdentityRole", null) + .WithMany("Claims") + .HasForeignKey("RoleId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); + + modelBuilder.Entity("Volo.Abp.Identity.IdentityUserClaim", b => + { + b.HasOne("Volo.Abp.Identity.IdentityUser", null) + .WithMany("Claims") + .HasForeignKey("UserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); + + modelBuilder.Entity("Volo.Abp.Identity.IdentityUserLogin", b => + { + b.HasOne("Volo.Abp.Identity.IdentityUser", null) + .WithMany("Logins") + .HasForeignKey("UserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); + + modelBuilder.Entity("Volo.Abp.Identity.IdentityUserRole", b => + { + b.HasOne("Volo.Abp.Identity.IdentityRole", null) + .WithMany() + .HasForeignKey("RoleId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("Volo.Abp.Identity.IdentityUser", null) + .WithMany("Roles") + .HasForeignKey("UserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); + + modelBuilder.Entity("Volo.Abp.Identity.IdentityUserToken", b => + { + b.HasOne("Volo.Abp.Identity.IdentityUser", null) + .WithMany("Tokens") + .HasForeignKey("UserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); + + modelBuilder.Entity("Volo.Abp.IdentityServer.ApiResources.ApiResourceClaim", b => + { + b.HasOne("Volo.Abp.IdentityServer.ApiResources.ApiResource", null) + .WithMany("UserClaims") + .HasForeignKey("ApiResourceId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); + + modelBuilder.Entity("Volo.Abp.IdentityServer.ApiResources.ApiScope", b => + { + b.HasOne("Volo.Abp.IdentityServer.ApiResources.ApiResource", null) + .WithMany("Scopes") + .HasForeignKey("ApiResourceId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); + + modelBuilder.Entity("Volo.Abp.IdentityServer.ApiResources.ApiScopeClaim", b => + { + b.HasOne("Volo.Abp.IdentityServer.ApiResources.ApiScope", null) + .WithMany("UserClaims") + .HasForeignKey("ApiResourceId", "Name") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); + + modelBuilder.Entity("Volo.Abp.IdentityServer.ApiResources.ApiSecret", b => + { + b.HasOne("Volo.Abp.IdentityServer.ApiResources.ApiResource", null) + .WithMany("Secrets") + .HasForeignKey("ApiResourceId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); + + modelBuilder.Entity("Volo.Abp.IdentityServer.Clients.ClientClaim", b => + { + b.HasOne("Volo.Abp.IdentityServer.Clients.Client", null) + .WithMany("Claims") + .HasForeignKey("ClientId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); + + modelBuilder.Entity("Volo.Abp.IdentityServer.Clients.ClientCorsOrigin", b => + { + b.HasOne("Volo.Abp.IdentityServer.Clients.Client", null) + .WithMany("AllowedCorsOrigins") + .HasForeignKey("ClientId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); + + modelBuilder.Entity("Volo.Abp.IdentityServer.Clients.ClientGrantType", b => + { + b.HasOne("Volo.Abp.IdentityServer.Clients.Client", null) + .WithMany("AllowedGrantTypes") + .HasForeignKey("ClientId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); + + modelBuilder.Entity("Volo.Abp.IdentityServer.Clients.ClientIdPRestriction", b => + { + b.HasOne("Volo.Abp.IdentityServer.Clients.Client", null) + .WithMany("IdentityProviderRestrictions") + .HasForeignKey("ClientId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); + + modelBuilder.Entity("Volo.Abp.IdentityServer.Clients.ClientPostLogoutRedirectUri", b => + { + b.HasOne("Volo.Abp.IdentityServer.Clients.Client", null) + .WithMany("PostLogoutRedirectUris") + .HasForeignKey("ClientId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); + + modelBuilder.Entity("Volo.Abp.IdentityServer.Clients.ClientProperty", b => + { + b.HasOne("Volo.Abp.IdentityServer.Clients.Client", null) + .WithMany("Properties") + .HasForeignKey("ClientId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); + + modelBuilder.Entity("Volo.Abp.IdentityServer.Clients.ClientRedirectUri", b => + { + b.HasOne("Volo.Abp.IdentityServer.Clients.Client", null) + .WithMany("RedirectUris") + .HasForeignKey("ClientId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); + + modelBuilder.Entity("Volo.Abp.IdentityServer.Clients.ClientScope", b => + { + b.HasOne("Volo.Abp.IdentityServer.Clients.Client", null) + .WithMany("AllowedScopes") + .HasForeignKey("ClientId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); + + modelBuilder.Entity("Volo.Abp.IdentityServer.Clients.ClientSecret", b => + { + b.HasOne("Volo.Abp.IdentityServer.Clients.Client", null) + .WithMany("ClientSecrets") + .HasForeignKey("ClientId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); + + modelBuilder.Entity("Volo.Abp.IdentityServer.IdentityResources.IdentityClaim", b => + { + b.HasOne("Volo.Abp.IdentityServer.IdentityResources.IdentityResource", null) + .WithMany("UserClaims") + .HasForeignKey("IdentityResourceId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); + + modelBuilder.Entity("Volo.Abp.TenantManagement.TenantConnectionString", b => + { + b.HasOne("Volo.Abp.TenantManagement.Tenant", null) + .WithMany("ConnectionStrings") + .HasForeignKey("TenantId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); +#pragma warning restore 612, 618 + } + } +} diff --git a/samples/EasyMall/aspnet-core/src/EasyMall.EntityFrameworkCore.DbMigrations/Migrations/20200517161833_UsedPaymentServiceModule.cs b/samples/EasyMall/aspnet-core/src/EasyMall.EntityFrameworkCore.DbMigrations/Migrations/20200517161833_UsedPaymentServiceModule.cs new file mode 100644 index 00000000..63fc503e --- /dev/null +++ b/samples/EasyMall/aspnet-core/src/EasyMall.EntityFrameworkCore.DbMigrations/Migrations/20200517161833_UsedPaymentServiceModule.cs @@ -0,0 +1,226 @@ +using System; +using Microsoft.EntityFrameworkCore.Migrations; + +namespace EasyMall.Migrations +{ + public partial class UsedPaymentServiceModule : Migration + { + protected override void Up(MigrationBuilder migrationBuilder) + { + migrationBuilder.DropTable( + name: "PaymentsPaymentItems"); + + migrationBuilder.DropTable( + name: "PaymentsRefunds"); + + migrationBuilder.DropTable( + name: "PaymentsPayments"); + + migrationBuilder.CreateTable( + name: "PaymentServicePayments", + columns: table => new + { + Id = table.Column(nullable: false), + ExtraProperties = table.Column(nullable: true), + ConcurrencyStamp = table.Column(nullable: true), + CreationTime = table.Column(nullable: false), + CreatorId = table.Column(nullable: true), + LastModificationTime = table.Column(nullable: true), + LastModifierId = table.Column(nullable: true), + IsDeleted = table.Column(nullable: false, defaultValue: false), + DeleterId = table.Column(nullable: true), + DeletionTime = table.Column(nullable: true), + TenantId = table.Column(nullable: true), + UserId = table.Column(nullable: false), + PaymentMethod = table.Column(nullable: true), + PayeeAccount = table.Column(nullable: true), + ExternalTradingCode = table.Column(nullable: true), + Currency = table.Column(nullable: true), + OriginalPaymentAmount = table.Column(type: "decimal(18,6)", nullable: false), + PaymentDiscount = table.Column(type: "decimal(18,6)", nullable: false), + ActualPaymentAmount = table.Column(type: "decimal(18,6)", nullable: false), + RefundAmount = table.Column(type: "decimal(18,6)", nullable: false), + CompletionTime = table.Column(nullable: true) + }, + constraints: table => + { + table.PrimaryKey("PK_PaymentServicePayments", x => x.Id); + }); + + migrationBuilder.CreateTable( + name: "PaymentServiceRefunds", + columns: table => new + { + Id = table.Column(nullable: false), + ExtraProperties = table.Column(nullable: true), + ConcurrencyStamp = table.Column(nullable: true), + CreationTime = table.Column(nullable: false), + CreatorId = table.Column(nullable: true), + LastModificationTime = table.Column(nullable: true), + LastModifierId = table.Column(nullable: true), + IsDeleted = table.Column(nullable: false, defaultValue: false), + DeleterId = table.Column(nullable: true), + DeletionTime = table.Column(nullable: true), + TenantId = table.Column(nullable: true), + PaymentId = table.Column(nullable: false), + PaymentItemId = table.Column(nullable: false), + RefundPaymentMethod = table.Column(nullable: true), + ExternalTradingCode = table.Column(nullable: true), + Currency = table.Column(nullable: true), + RefundAmount = table.Column(type: "decimal(18,6)", nullable: false), + CustomerRemark = table.Column(nullable: true), + StaffRemark = table.Column(nullable: true) + }, + constraints: table => + { + table.PrimaryKey("PK_PaymentServiceRefunds", x => x.Id); + }); + + migrationBuilder.CreateTable( + name: "PaymentServicePaymentItems", + columns: table => new + { + Id = table.Column(nullable: false), + CreationTime = table.Column(nullable: false), + CreatorId = table.Column(nullable: true), + LastModificationTime = table.Column(nullable: true), + LastModifierId = table.Column(nullable: true), + IsDeleted = table.Column(nullable: false, defaultValue: false), + DeleterId = table.Column(nullable: true), + DeletionTime = table.Column(nullable: true), + ItemType = table.Column(nullable: true), + ItemKey = table.Column(nullable: false), + Currency = table.Column(nullable: true), + OriginalPaymentAmount = table.Column(type: "decimal(18,6)", nullable: false), + PaymentDiscount = table.Column(type: "decimal(18,6)", nullable: false), + ActualPaymentAmount = table.Column(type: "decimal(18,6)", nullable: false), + RefundAmount = table.Column(type: "decimal(18,6)", nullable: false), + PaymentId = table.Column(nullable: true) + }, + constraints: table => + { + table.PrimaryKey("PK_PaymentServicePaymentItems", x => x.Id); + table.ForeignKey( + name: "FK_PaymentServicePaymentItems_PaymentServicePayments_PaymentId", + column: x => x.PaymentId, + principalTable: "PaymentServicePayments", + principalColumn: "Id", + onDelete: ReferentialAction.Restrict); + }); + + migrationBuilder.CreateIndex( + name: "IX_PaymentServicePaymentItems_PaymentId", + table: "PaymentServicePaymentItems", + column: "PaymentId"); + } + + protected override void Down(MigrationBuilder migrationBuilder) + { + migrationBuilder.DropTable( + name: "PaymentServicePaymentItems"); + + migrationBuilder.DropTable( + name: "PaymentServiceRefunds"); + + migrationBuilder.DropTable( + name: "PaymentServicePayments"); + + migrationBuilder.CreateTable( + name: "PaymentsPayments", + columns: table => new + { + Id = table.Column(type: "uniqueidentifier", nullable: false), + ActualPaymentAmount = table.Column(type: "decimal(18,6)", nullable: false), + CompletionTime = table.Column(type: "datetime2", nullable: true), + ConcurrencyStamp = table.Column(type: "nvarchar(max)", nullable: true), + CreationTime = table.Column(type: "datetime2", nullable: false), + CreatorId = table.Column(type: "uniqueidentifier", nullable: true), + Currency = table.Column(type: "nvarchar(max)", nullable: true), + DeleterId = table.Column(type: "uniqueidentifier", nullable: true), + DeletionTime = table.Column(type: "datetime2", nullable: true), + ExternalTradingCode = table.Column(type: "nvarchar(max)", nullable: true), + ExtraProperties = table.Column(type: "nvarchar(max)", nullable: true), + IsDeleted = table.Column(type: "bit", nullable: false, defaultValue: false), + LastModificationTime = table.Column(type: "datetime2", nullable: true), + LastModifierId = table.Column(type: "uniqueidentifier", nullable: true), + OriginalPaymentAmount = table.Column(type: "decimal(18,6)", nullable: false), + PayeeAccount = table.Column(type: "nvarchar(max)", nullable: true), + PaymentDiscount = table.Column(type: "decimal(18,6)", nullable: false), + PaymentMethod = table.Column(type: "nvarchar(max)", nullable: true), + RefundAmount = table.Column(type: "decimal(18,6)", nullable: false), + TenantId = table.Column(type: "uniqueidentifier", nullable: true), + UserId = table.Column(type: "uniqueidentifier", nullable: false) + }, + constraints: table => + { + table.PrimaryKey("PK_PaymentsPayments", x => x.Id); + }); + + migrationBuilder.CreateTable( + name: "PaymentsRefunds", + columns: table => new + { + Id = table.Column(type: "uniqueidentifier", nullable: false), + ConcurrencyStamp = table.Column(type: "nvarchar(max)", nullable: true), + CreationTime = table.Column(type: "datetime2", nullable: false), + CreatorId = table.Column(type: "uniqueidentifier", nullable: true), + Currency = table.Column(type: "nvarchar(max)", nullable: true), + CustomerRemark = table.Column(type: "nvarchar(max)", nullable: true), + DeleterId = table.Column(type: "uniqueidentifier", nullable: true), + DeletionTime = table.Column(type: "datetime2", nullable: true), + ExternalTradingCode = table.Column(type: "nvarchar(max)", nullable: true), + ExtraProperties = table.Column(type: "nvarchar(max)", nullable: true), + IsDeleted = table.Column(type: "bit", nullable: false, defaultValue: false), + LastModificationTime = table.Column(type: "datetime2", nullable: true), + LastModifierId = table.Column(type: "uniqueidentifier", nullable: true), + OrderId = table.Column(type: "uniqueidentifier", nullable: false), + RefundAmount = table.Column(type: "decimal(18,6)", nullable: false), + RefundPaymentMethod = table.Column(type: "nvarchar(max)", nullable: true), + StaffRemark = table.Column(type: "nvarchar(max)", nullable: true), + StoreId = table.Column(type: "uniqueidentifier", nullable: false), + TenantId = table.Column(type: "uniqueidentifier", nullable: true) + }, + constraints: table => + { + table.PrimaryKey("PK_PaymentsRefunds", x => x.Id); + }); + + migrationBuilder.CreateTable( + name: "PaymentsPaymentItems", + columns: table => new + { + Id = table.Column(type: "uniqueidentifier", nullable: false), + ActualPaymentAmount = table.Column(type: "decimal(18,6)", nullable: false), + CreationTime = table.Column(type: "datetime2", nullable: false), + CreatorId = table.Column(type: "uniqueidentifier", nullable: true), + Currency = table.Column(type: "nvarchar(max)", nullable: true), + DeleterId = table.Column(type: "uniqueidentifier", nullable: true), + DeletionTime = table.Column(type: "datetime2", nullable: true), + IsDeleted = table.Column(type: "bit", nullable: false, defaultValue: false), + ItemKey = table.Column(type: "uniqueidentifier", nullable: false), + ItemType = table.Column(type: "nvarchar(max)", nullable: true), + LastModificationTime = table.Column(type: "datetime2", nullable: true), + LastModifierId = table.Column(type: "uniqueidentifier", nullable: true), + OriginalPaymentAmount = table.Column(type: "decimal(18,6)", nullable: false), + PaymentDiscount = table.Column(type: "decimal(18,6)", nullable: false), + PaymentId = table.Column(type: "uniqueidentifier", nullable: true), + RefundAmount = table.Column(type: "decimal(18,6)", nullable: false) + }, + constraints: table => + { + table.PrimaryKey("PK_PaymentsPaymentItems", x => x.Id); + table.ForeignKey( + name: "FK_PaymentsPaymentItems_PaymentsPayments_PaymentId", + column: x => x.PaymentId, + principalTable: "PaymentsPayments", + principalColumn: "Id", + onDelete: ReferentialAction.Restrict); + }); + + migrationBuilder.CreateIndex( + name: "IX_PaymentsPaymentItems_PaymentId", + table: "PaymentsPaymentItems", + column: "PaymentId"); + } + } +} diff --git a/samples/EasyMall/aspnet-core/src/EasyMall.EntityFrameworkCore.DbMigrations/Migrations/EasyMallMigrationsDbContextModelSnapshot.cs b/samples/EasyMall/aspnet-core/src/EasyMall.EntityFrameworkCore.DbMigrations/Migrations/EasyMallMigrationsDbContextModelSnapshot.cs index 6c4f7fd3..3a07c0e5 100644 --- a/samples/EasyMall/aspnet-core/src/EasyMall.EntityFrameworkCore.DbMigrations/Migrations/EasyMallMigrationsDbContextModelSnapshot.cs +++ b/samples/EasyMall/aspnet-core/src/EasyMall.EntityFrameworkCore.DbMigrations/Migrations/EasyMallMigrationsDbContextModelSnapshot.cs @@ -203,235 +203,6 @@ namespace EasyMall.Migrations b.ToTable("OrdersOrderLines"); }); - modelBuilder.Entity("EasyAbp.EShop.Payments.Payments.Payment", b => - { - b.Property("Id") - .ValueGeneratedOnAdd() - .HasColumnType("uniqueidentifier"); - - b.Property("ActualPaymentAmount") - .HasColumnType("decimal(18,6)"); - - b.Property("CompletionTime") - .HasColumnType("datetime2"); - - b.Property("ConcurrencyStamp") - .IsConcurrencyToken() - .HasColumnName("ConcurrencyStamp") - .HasColumnType("nvarchar(max)"); - - b.Property("CreationTime") - .HasColumnName("CreationTime") - .HasColumnType("datetime2"); - - b.Property("CreatorId") - .HasColumnName("CreatorId") - .HasColumnType("uniqueidentifier"); - - b.Property("Currency") - .HasColumnType("nvarchar(max)"); - - b.Property("DeleterId") - .HasColumnName("DeleterId") - .HasColumnType("uniqueidentifier"); - - b.Property("DeletionTime") - .HasColumnName("DeletionTime") - .HasColumnType("datetime2"); - - b.Property("ExternalTradingCode") - .HasColumnType("nvarchar(max)"); - - b.Property("ExtraProperties") - .HasColumnName("ExtraProperties") - .HasColumnType("nvarchar(max)"); - - b.Property("IsDeleted") - .ValueGeneratedOnAdd() - .HasColumnName("IsDeleted") - .HasColumnType("bit") - .HasDefaultValue(false); - - b.Property("LastModificationTime") - .HasColumnName("LastModificationTime") - .HasColumnType("datetime2"); - - b.Property("LastModifierId") - .HasColumnName("LastModifierId") - .HasColumnType("uniqueidentifier"); - - b.Property("OriginalPaymentAmount") - .HasColumnType("decimal(18,6)"); - - b.Property("PayeeAccount") - .HasColumnType("nvarchar(max)"); - - b.Property("PaymentDiscount") - .HasColumnType("decimal(18,6)"); - - b.Property("PaymentMethod") - .HasColumnType("nvarchar(max)"); - - b.Property("RefundAmount") - .HasColumnType("decimal(18,6)"); - - b.Property("TenantId") - .HasColumnName("TenantId") - .HasColumnType("uniqueidentifier"); - - b.Property("UserId") - .HasColumnType("uniqueidentifier"); - - b.HasKey("Id"); - - b.ToTable("PaymentsPayments"); - }); - - modelBuilder.Entity("EasyAbp.EShop.Payments.Payments.PaymentItem", b => - { - b.Property("Id") - .ValueGeneratedOnAdd() - .HasColumnType("uniqueidentifier"); - - b.Property("ActualPaymentAmount") - .HasColumnType("decimal(18,6)"); - - b.Property("CreationTime") - .HasColumnName("CreationTime") - .HasColumnType("datetime2"); - - b.Property("CreatorId") - .HasColumnName("CreatorId") - .HasColumnType("uniqueidentifier"); - - b.Property("Currency") - .HasColumnType("nvarchar(max)"); - - b.Property("DeleterId") - .HasColumnName("DeleterId") - .HasColumnType("uniqueidentifier"); - - b.Property("DeletionTime") - .HasColumnName("DeletionTime") - .HasColumnType("datetime2"); - - b.Property("IsDeleted") - .ValueGeneratedOnAdd() - .HasColumnName("IsDeleted") - .HasColumnType("bit") - .HasDefaultValue(false); - - b.Property("ItemKey") - .HasColumnType("uniqueidentifier"); - - b.Property("ItemType") - .HasColumnType("nvarchar(max)"); - - b.Property("LastModificationTime") - .HasColumnName("LastModificationTime") - .HasColumnType("datetime2"); - - b.Property("LastModifierId") - .HasColumnName("LastModifierId") - .HasColumnType("uniqueidentifier"); - - b.Property("OriginalPaymentAmount") - .HasColumnType("decimal(18,6)"); - - b.Property("PaymentDiscount") - .HasColumnType("decimal(18,6)"); - - b.Property("PaymentId") - .HasColumnType("uniqueidentifier"); - - b.Property("RefundAmount") - .HasColumnType("decimal(18,6)"); - - b.HasKey("Id"); - - b.HasIndex("PaymentId"); - - b.ToTable("PaymentsPaymentItems"); - }); - - modelBuilder.Entity("EasyAbp.EShop.Payments.Refunds.Refund", b => - { - b.Property("Id") - .ValueGeneratedOnAdd() - .HasColumnType("uniqueidentifier"); - - b.Property("ConcurrencyStamp") - .IsConcurrencyToken() - .HasColumnName("ConcurrencyStamp") - .HasColumnType("nvarchar(max)"); - - b.Property("CreationTime") - .HasColumnName("CreationTime") - .HasColumnType("datetime2"); - - b.Property("CreatorId") - .HasColumnName("CreatorId") - .HasColumnType("uniqueidentifier"); - - b.Property("Currency") - .HasColumnType("nvarchar(max)"); - - b.Property("CustomerRemark") - .HasColumnType("nvarchar(max)"); - - b.Property("DeleterId") - .HasColumnName("DeleterId") - .HasColumnType("uniqueidentifier"); - - b.Property("DeletionTime") - .HasColumnName("DeletionTime") - .HasColumnType("datetime2"); - - b.Property("ExternalTradingCode") - .HasColumnType("nvarchar(max)"); - - b.Property("ExtraProperties") - .HasColumnName("ExtraProperties") - .HasColumnType("nvarchar(max)"); - - b.Property("IsDeleted") - .ValueGeneratedOnAdd() - .HasColumnName("IsDeleted") - .HasColumnType("bit") - .HasDefaultValue(false); - - b.Property("LastModificationTime") - .HasColumnName("LastModificationTime") - .HasColumnType("datetime2"); - - b.Property("LastModifierId") - .HasColumnName("LastModifierId") - .HasColumnType("uniqueidentifier"); - - b.Property("OrderId") - .HasColumnType("uniqueidentifier"); - - b.Property("RefundAmount") - .HasColumnType("decimal(18,6)"); - - b.Property("RefundPaymentMethod") - .HasColumnType("nvarchar(max)"); - - b.Property("StaffRemark") - .HasColumnType("nvarchar(max)"); - - b.Property("StoreId") - .HasColumnType("uniqueidentifier"); - - b.Property("TenantId") - .HasColumnName("TenantId") - .HasColumnType("uniqueidentifier"); - - b.HasKey("Id"); - - b.ToTable("PaymentsRefunds"); - }); - modelBuilder.Entity("EasyAbp.EShop.Products.Categories.Category", b => { b.Property("Id") @@ -1108,6 +879,235 @@ namespace EasyMall.Migrations b.ToTable("StoresStores"); }); + modelBuilder.Entity("EasyAbp.PaymentService.Payments.Payment", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("uniqueidentifier"); + + b.Property("ActualPaymentAmount") + .HasColumnType("decimal(18,6)"); + + b.Property("CompletionTime") + .HasColumnType("datetime2"); + + b.Property("ConcurrencyStamp") + .IsConcurrencyToken() + .HasColumnName("ConcurrencyStamp") + .HasColumnType("nvarchar(max)"); + + b.Property("CreationTime") + .HasColumnName("CreationTime") + .HasColumnType("datetime2"); + + b.Property("CreatorId") + .HasColumnName("CreatorId") + .HasColumnType("uniqueidentifier"); + + b.Property("Currency") + .HasColumnType("nvarchar(max)"); + + b.Property("DeleterId") + .HasColumnName("DeleterId") + .HasColumnType("uniqueidentifier"); + + b.Property("DeletionTime") + .HasColumnName("DeletionTime") + .HasColumnType("datetime2"); + + b.Property("ExternalTradingCode") + .HasColumnType("nvarchar(max)"); + + b.Property("ExtraProperties") + .HasColumnName("ExtraProperties") + .HasColumnType("nvarchar(max)"); + + b.Property("IsDeleted") + .ValueGeneratedOnAdd() + .HasColumnName("IsDeleted") + .HasColumnType("bit") + .HasDefaultValue(false); + + b.Property("LastModificationTime") + .HasColumnName("LastModificationTime") + .HasColumnType("datetime2"); + + b.Property("LastModifierId") + .HasColumnName("LastModifierId") + .HasColumnType("uniqueidentifier"); + + b.Property("OriginalPaymentAmount") + .HasColumnType("decimal(18,6)"); + + b.Property("PayeeAccount") + .HasColumnType("nvarchar(max)"); + + b.Property("PaymentDiscount") + .HasColumnType("decimal(18,6)"); + + b.Property("PaymentMethod") + .HasColumnType("nvarchar(max)"); + + b.Property("RefundAmount") + .HasColumnType("decimal(18,6)"); + + b.Property("TenantId") + .HasColumnName("TenantId") + .HasColumnType("uniqueidentifier"); + + b.Property("UserId") + .HasColumnType("uniqueidentifier"); + + b.HasKey("Id"); + + b.ToTable("PaymentServicePayments"); + }); + + modelBuilder.Entity("EasyAbp.PaymentService.Payments.PaymentItem", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("uniqueidentifier"); + + b.Property("ActualPaymentAmount") + .HasColumnType("decimal(18,6)"); + + b.Property("CreationTime") + .HasColumnName("CreationTime") + .HasColumnType("datetime2"); + + b.Property("CreatorId") + .HasColumnName("CreatorId") + .HasColumnType("uniqueidentifier"); + + b.Property("Currency") + .HasColumnType("nvarchar(max)"); + + b.Property("DeleterId") + .HasColumnName("DeleterId") + .HasColumnType("uniqueidentifier"); + + b.Property("DeletionTime") + .HasColumnName("DeletionTime") + .HasColumnType("datetime2"); + + b.Property("IsDeleted") + .ValueGeneratedOnAdd() + .HasColumnName("IsDeleted") + .HasColumnType("bit") + .HasDefaultValue(false); + + b.Property("ItemKey") + .HasColumnType("uniqueidentifier"); + + b.Property("ItemType") + .HasColumnType("nvarchar(max)"); + + b.Property("LastModificationTime") + .HasColumnName("LastModificationTime") + .HasColumnType("datetime2"); + + b.Property("LastModifierId") + .HasColumnName("LastModifierId") + .HasColumnType("uniqueidentifier"); + + b.Property("OriginalPaymentAmount") + .HasColumnType("decimal(18,6)"); + + b.Property("PaymentDiscount") + .HasColumnType("decimal(18,6)"); + + b.Property("PaymentId") + .HasColumnType("uniqueidentifier"); + + b.Property("RefundAmount") + .HasColumnType("decimal(18,6)"); + + b.HasKey("Id"); + + b.HasIndex("PaymentId"); + + b.ToTable("PaymentServicePaymentItems"); + }); + + modelBuilder.Entity("EasyAbp.PaymentService.Refunds.Refund", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("uniqueidentifier"); + + b.Property("ConcurrencyStamp") + .IsConcurrencyToken() + .HasColumnName("ConcurrencyStamp") + .HasColumnType("nvarchar(max)"); + + b.Property("CreationTime") + .HasColumnName("CreationTime") + .HasColumnType("datetime2"); + + b.Property("CreatorId") + .HasColumnName("CreatorId") + .HasColumnType("uniqueidentifier"); + + b.Property("Currency") + .HasColumnType("nvarchar(max)"); + + b.Property("CustomerRemark") + .HasColumnType("nvarchar(max)"); + + b.Property("DeleterId") + .HasColumnName("DeleterId") + .HasColumnType("uniqueidentifier"); + + b.Property("DeletionTime") + .HasColumnName("DeletionTime") + .HasColumnType("datetime2"); + + b.Property("ExternalTradingCode") + .HasColumnType("nvarchar(max)"); + + b.Property("ExtraProperties") + .HasColumnName("ExtraProperties") + .HasColumnType("nvarchar(max)"); + + b.Property("IsDeleted") + .ValueGeneratedOnAdd() + .HasColumnName("IsDeleted") + .HasColumnType("bit") + .HasDefaultValue(false); + + b.Property("LastModificationTime") + .HasColumnName("LastModificationTime") + .HasColumnType("datetime2"); + + b.Property("LastModifierId") + .HasColumnName("LastModifierId") + .HasColumnType("uniqueidentifier"); + + b.Property("PaymentId") + .HasColumnType("uniqueidentifier"); + + b.Property("PaymentItemId") + .HasColumnType("uniqueidentifier"); + + b.Property("RefundAmount") + .HasColumnType("decimal(18,6)"); + + b.Property("RefundPaymentMethod") + .HasColumnType("nvarchar(max)"); + + b.Property("StaffRemark") + .HasColumnType("nvarchar(max)"); + + b.Property("TenantId") + .HasColumnName("TenantId") + .HasColumnType("uniqueidentifier"); + + b.HasKey("Id"); + + b.ToTable("PaymentServiceRefunds"); + }); + modelBuilder.Entity("Volo.Abp.AuditLogging.AuditLog", b => { b.Property("Id") @@ -2652,13 +2652,6 @@ namespace EasyMall.Migrations .HasForeignKey("OrderId"); }); - modelBuilder.Entity("EasyAbp.EShop.Payments.Payments.PaymentItem", b => - { - b.HasOne("EasyAbp.EShop.Payments.Payments.Payment", null) - .WithMany("PaymentItems") - .HasForeignKey("PaymentId"); - }); - modelBuilder.Entity("EasyAbp.EShop.Products.Products.ProductAttribute", b => { b.HasOne("EasyAbp.EShop.Products.Products.Product", null) @@ -2680,6 +2673,13 @@ namespace EasyMall.Migrations .HasForeignKey("ProductId"); }); + modelBuilder.Entity("EasyAbp.PaymentService.Payments.PaymentItem", b => + { + b.HasOne("EasyAbp.PaymentService.Payments.Payment", null) + .WithMany("PaymentItems") + .HasForeignKey("PaymentId"); + }); + modelBuilder.Entity("Volo.Abp.AuditLogging.AuditLogAction", b => { b.HasOne("Volo.Abp.AuditLogging.AuditLog", null) diff --git a/samples/EasyMall/aspnet-core/src/EasyMall.EntityFrameworkCore/EasyMall.EntityFrameworkCore.csproj b/samples/EasyMall/aspnet-core/src/EasyMall.EntityFrameworkCore/EasyMall.EntityFrameworkCore.csproj index 8ad6f724..fd5e7944 100644 --- a/samples/EasyMall/aspnet-core/src/EasyMall.EntityFrameworkCore/EasyMall.EntityFrameworkCore.csproj +++ b/samples/EasyMall/aspnet-core/src/EasyMall.EntityFrameworkCore/EasyMall.EntityFrameworkCore.csproj @@ -10,11 +10,11 @@ - + diff --git a/samples/EasyMall/aspnet-core/src/EasyMall.EntityFrameworkCore/EntityFrameworkCore/EasyMallEntityFrameworkCoreModule.cs b/samples/EasyMall/aspnet-core/src/EasyMall.EntityFrameworkCore/EntityFrameworkCore/EasyMallEntityFrameworkCoreModule.cs index 5e135dc1..34bdda16 100644 --- a/samples/EasyMall/aspnet-core/src/EasyMall.EntityFrameworkCore/EntityFrameworkCore/EasyMallEntityFrameworkCoreModule.cs +++ b/samples/EasyMall/aspnet-core/src/EasyMall.EntityFrameworkCore/EntityFrameworkCore/EasyMallEntityFrameworkCoreModule.cs @@ -1,9 +1,9 @@ using EasyAbp.EShop.Baskets.EntityFrameworkCore; using EasyAbp.EShop.Orders.EntityFrameworkCore; using EasyAbp.EShop.Payments.EntityFrameworkCore; -using EasyAbp.EShop.Payments.WeChatPay.EntityFrameworkCore; using EasyAbp.EShop.Products.EntityFrameworkCore; using EasyAbp.EShop.Stores.EntityFrameworkCore; +using EasyAbp.PaymentService.WeChatPay.EntityFrameworkCore; using Microsoft.Extensions.DependencyInjection; using Volo.Abp.AuditLogging.EntityFrameworkCore; using Volo.Abp.BackgroundJobs.EntityFrameworkCore; @@ -33,10 +33,10 @@ namespace EasyMall.EntityFrameworkCore typeof(EShopBasketsEntityFrameworkCoreModule), typeof(EShopOrdersEntityFrameworkCoreModule), typeof(EShopPaymentsEntityFrameworkCoreModule), - typeof(EShopPaymentsWeChatPayEntityFrameworkCoreModule), typeof(EShopProductsEntityFrameworkCoreModule), - typeof(EShopStoresEntityFrameworkCoreModule) - )] + typeof(EShopStoresEntityFrameworkCoreModule), + typeof(PaymentServiceWeChatPayEntityFrameworkCoreModule) + )] public class EasyMallEntityFrameworkCoreModule : AbpModule { public override void PreConfigureServices(ServiceConfigurationContext context) diff --git a/samples/EasyMall/aspnet-core/src/EasyMall.HttpApi.Client/EasyMall.HttpApi.Client.csproj b/samples/EasyMall/aspnet-core/src/EasyMall.HttpApi.Client/EasyMall.HttpApi.Client.csproj index 94c7fc38..f9b32542 100644 --- a/samples/EasyMall/aspnet-core/src/EasyMall.HttpApi.Client/EasyMall.HttpApi.Client.csproj +++ b/samples/EasyMall/aspnet-core/src/EasyMall.HttpApi.Client/EasyMall.HttpApi.Client.csproj @@ -10,7 +10,6 @@ - @@ -18,6 +17,7 @@ + diff --git a/samples/EasyMall/aspnet-core/src/EasyMall.HttpApi.Client/EasyMallHttpApiClientModule.cs b/samples/EasyMall/aspnet-core/src/EasyMall.HttpApi.Client/EasyMallHttpApiClientModule.cs index 41124784..57c3a47c 100644 --- a/samples/EasyMall/aspnet-core/src/EasyMall.HttpApi.Client/EasyMallHttpApiClientModule.cs +++ b/samples/EasyMall/aspnet-core/src/EasyMall.HttpApi.Client/EasyMallHttpApiClientModule.cs @@ -1,9 +1,9 @@ using EasyAbp.EShop.Baskets; using EasyAbp.EShop.Orders; using EasyAbp.EShop.Payments; -using EasyAbp.EShop.Payments.WeChatPay; using EasyAbp.EShop.Products; using EasyAbp.EShop.Stores; +using EasyAbp.PaymentService.WeChatPay; using Microsoft.Extensions.DependencyInjection; using Volo.Abp.Account; using Volo.Abp.FeatureManagement; @@ -26,7 +26,8 @@ namespace EasyMall typeof(EShopPaymentsHttpApiClientModule), typeof(EShopPaymentsWeChatPayHttpApiClientModule), typeof(EShopProductsHttpApiClientModule), - typeof(EShopStoresHttpApiClientModule) + typeof(EShopStoresHttpApiClientModule), + typeof(PaymentServiceWeChatPayHttpApiClientModule) )] public class EasyMallHttpApiClientModule : AbpModule { diff --git a/samples/EasyMall/aspnet-core/src/EasyMall.HttpApi/EasyMall.HttpApi.csproj b/samples/EasyMall/aspnet-core/src/EasyMall.HttpApi/EasyMall.HttpApi.csproj index 12e20fce..f7f15ded 100644 --- a/samples/EasyMall/aspnet-core/src/EasyMall.HttpApi/EasyMall.HttpApi.csproj +++ b/samples/EasyMall/aspnet-core/src/EasyMall.HttpApi/EasyMall.HttpApi.csproj @@ -10,7 +10,6 @@ - @@ -18,6 +17,7 @@ + diff --git a/samples/EasyMall/aspnet-core/src/EasyMall.HttpApi/EasyMallHttpApiModule.cs b/samples/EasyMall/aspnet-core/src/EasyMall.HttpApi/EasyMallHttpApiModule.cs index 3974de38..7b9efd67 100644 --- a/samples/EasyMall/aspnet-core/src/EasyMall.HttpApi/EasyMallHttpApiModule.cs +++ b/samples/EasyMall/aspnet-core/src/EasyMall.HttpApi/EasyMallHttpApiModule.cs @@ -1,9 +1,9 @@ using EasyAbp.EShop.Baskets; using EasyAbp.EShop.Orders; using EasyAbp.EShop.Payments; -using EasyAbp.EShop.Payments.WeChatPay; using EasyAbp.EShop.Products; using EasyAbp.EShop.Stores; +using EasyAbp.PaymentService.WeChatPay; using Volo.Abp.Account; using Volo.Abp.FeatureManagement; using Volo.Abp.Identity; @@ -23,10 +23,10 @@ namespace EasyMall typeof(EShopBasketsHttpApiModule), typeof(EShopOrdersHttpApiModule), typeof(EShopPaymentsHttpApiModule), - typeof(EShopPaymentsWeChatPayHttpApiModule), typeof(EShopProductsHttpApiModule), - typeof(EShopStoresHttpApiModule) - )] + typeof(EShopStoresHttpApiModule), + typeof(PaymentServiceWeChatPayHttpApiModule) + )] public class EasyMallHttpApiModule : AbpModule { diff --git a/samples/EasyMall/aspnet-core/src/EasyMall.Web/EasyMall.Web.csproj b/samples/EasyMall/aspnet-core/src/EasyMall.Web/EasyMall.Web.csproj index d2038af8..f51e25f3 100644 --- a/samples/EasyMall/aspnet-core/src/EasyMall.Web/EasyMall.Web.csproj +++ b/samples/EasyMall/aspnet-core/src/EasyMall.Web/EasyMall.Web.csproj @@ -43,13 +43,13 @@ - + diff --git a/samples/EasyMall/aspnet-core/src/EasyMall.Web/EasyMallWebModule.cs b/samples/EasyMall/aspnet-core/src/EasyMall.Web/EasyMallWebModule.cs index d762a70b..00517d3e 100644 --- a/samples/EasyMall/aspnet-core/src/EasyMall.Web/EasyMallWebModule.cs +++ b/samples/EasyMall/aspnet-core/src/EasyMall.Web/EasyMallWebModule.cs @@ -6,12 +6,13 @@ using EasyAbp.EShop.Orders; using EasyAbp.EShop.Orders.Web; using EasyAbp.EShop.Payments; using EasyAbp.EShop.Payments.Web; -using EasyAbp.EShop.Payments.WeChatPay; -using EasyAbp.EShop.Payments.WeChatPay.Web; using EasyAbp.EShop.Products; using EasyAbp.EShop.Products.Web; using EasyAbp.EShop.Stores; using EasyAbp.EShop.Stores.Web; +using EasyAbp.PaymentService; +using EasyAbp.PaymentService.WeChatPay; +using EasyAbp.PaymentService.WeChatPay.Web; using Localization.Resources.AbpUi; using Microsoft.AspNetCore; using Microsoft.AspNetCore.Builder; @@ -65,9 +66,9 @@ namespace EasyMall.Web typeof(EShopBasketsWebModule), typeof(EShopOrdersWebModule), typeof(EShopPaymentsWebModule), - typeof(EShopPaymentsWeChatPayWebModule), typeof(EShopProductsWebModule), - typeof(EShopStoresWebModule) + typeof(EShopStoresWebModule), + typeof(PaymentServiceWeChatPayWebModule) )] public class EasyMallWebModule : AbpModule { @@ -109,9 +110,11 @@ namespace EasyMall.Web options.ConventionalControllers.Create(typeof(EShopBasketsApplicationModule).Assembly); options.ConventionalControllers.Create(typeof(EShopOrdersApplicationModule).Assembly); options.ConventionalControllers.Create(typeof(EShopPaymentsApplicationModule).Assembly); - options.ConventionalControllers.Create(typeof(EShopPaymentsWeChatPayApplicationModule).Assembly); options.ConventionalControllers.Create(typeof(EShopProductsApplicationModule).Assembly); options.ConventionalControllers.Create(typeof(EShopStoresApplicationModule).Assembly); + + options.ConventionalControllers.Create(typeof(PaymentServiceApplicationModule).Assembly); + options.ConventionalControllers.Create(typeof(PaymentServiceWeChatPayApplicationModule).Assembly); }); } @@ -173,12 +176,6 @@ namespace EasyMall.Web options.FileSets.ReplaceEmbeddedByPhysical(Path.Combine(hostingEnvironment.ContentRootPath, $"..{Path.DirectorySeparatorChar}..{Path.DirectorySeparatorChar}..{Path.DirectorySeparatorChar}..{Path.DirectorySeparatorChar}..{Path.DirectorySeparatorChar}modules{Path.DirectorySeparatorChar}EasyAbp.EShop.Payments{Path.DirectorySeparatorChar}src{Path.DirectorySeparatorChar}EasyAbp.EShop.Payments.Application")); options.FileSets.ReplaceEmbeddedByPhysical(Path.Combine(hostingEnvironment.ContentRootPath, $"..{Path.DirectorySeparatorChar}..{Path.DirectorySeparatorChar}..{Path.DirectorySeparatorChar}..{Path.DirectorySeparatorChar}..{Path.DirectorySeparatorChar}modules{Path.DirectorySeparatorChar}EasyAbp.EShop.Payments{Path.DirectorySeparatorChar}src{Path.DirectorySeparatorChar}EasyAbp.EShop.Payments.Web")); - options.FileSets.ReplaceEmbeddedByPhysical(Path.Combine(hostingEnvironment.ContentRootPath, $"..{Path.DirectorySeparatorChar}..{Path.DirectorySeparatorChar}..{Path.DirectorySeparatorChar}..{Path.DirectorySeparatorChar}..{Path.DirectorySeparatorChar}modules{Path.DirectorySeparatorChar}EasyAbp.EShop.Payments.WeChatPay{Path.DirectorySeparatorChar}src{Path.DirectorySeparatorChar}EasyAbp.EShop.Payments.WeChatPay.Domain.Shared")); - options.FileSets.ReplaceEmbeddedByPhysical(Path.Combine(hostingEnvironment.ContentRootPath, $"..{Path.DirectorySeparatorChar}..{Path.DirectorySeparatorChar}..{Path.DirectorySeparatorChar}..{Path.DirectorySeparatorChar}..{Path.DirectorySeparatorChar}modules{Path.DirectorySeparatorChar}EasyAbp.EShop.Payments.WeChatPay{Path.DirectorySeparatorChar}src{Path.DirectorySeparatorChar}EasyAbp.EShop.Payments.WeChatPay.Domain")); - options.FileSets.ReplaceEmbeddedByPhysical(Path.Combine(hostingEnvironment.ContentRootPath, $"..{Path.DirectorySeparatorChar}..{Path.DirectorySeparatorChar}..{Path.DirectorySeparatorChar}..{Path.DirectorySeparatorChar}..{Path.DirectorySeparatorChar}modules{Path.DirectorySeparatorChar}EasyAbp.EShop.Payments.WeChatPay{Path.DirectorySeparatorChar}src{Path.DirectorySeparatorChar}EasyAbp.EShop.Payments.WeChatPay.Application.Contracts")); - options.FileSets.ReplaceEmbeddedByPhysical(Path.Combine(hostingEnvironment.ContentRootPath, $"..{Path.DirectorySeparatorChar}..{Path.DirectorySeparatorChar}..{Path.DirectorySeparatorChar}..{Path.DirectorySeparatorChar}..{Path.DirectorySeparatorChar}modules{Path.DirectorySeparatorChar}EasyAbp.EShop.Payments.WeChatPay{Path.DirectorySeparatorChar}src{Path.DirectorySeparatorChar}EasyAbp.EShop.Payments.WeChatPay.Application")); - options.FileSets.ReplaceEmbeddedByPhysical(Path.Combine(hostingEnvironment.ContentRootPath, $"..{Path.DirectorySeparatorChar}..{Path.DirectorySeparatorChar}..{Path.DirectorySeparatorChar}..{Path.DirectorySeparatorChar}..{Path.DirectorySeparatorChar}modules{Path.DirectorySeparatorChar}EasyAbp.EShop.Payments.WeChatPay{Path.DirectorySeparatorChar}src{Path.DirectorySeparatorChar}EasyAbp.EShop.Payments.WeChatPay.Web")); - options.FileSets.ReplaceEmbeddedByPhysical(Path.Combine(hostingEnvironment.ContentRootPath, $"..{Path.DirectorySeparatorChar}..{Path.DirectorySeparatorChar}..{Path.DirectorySeparatorChar}..{Path.DirectorySeparatorChar}..{Path.DirectorySeparatorChar}modules{Path.DirectorySeparatorChar}EasyAbp.EShop.Products{Path.DirectorySeparatorChar}src{Path.DirectorySeparatorChar}EasyAbp.EShop.Products.Domain.Shared")); options.FileSets.ReplaceEmbeddedByPhysical(Path.Combine(hostingEnvironment.ContentRootPath, $"..{Path.DirectorySeparatorChar}..{Path.DirectorySeparatorChar}..{Path.DirectorySeparatorChar}..{Path.DirectorySeparatorChar}..{Path.DirectorySeparatorChar}modules{Path.DirectorySeparatorChar}EasyAbp.EShop.Products{Path.DirectorySeparatorChar}src{Path.DirectorySeparatorChar}EasyAbp.EShop.Products.Domain")); options.FileSets.ReplaceEmbeddedByPhysical(Path.Combine(hostingEnvironment.ContentRootPath, $"..{Path.DirectorySeparatorChar}..{Path.DirectorySeparatorChar}..{Path.DirectorySeparatorChar}..{Path.DirectorySeparatorChar}..{Path.DirectorySeparatorChar}modules{Path.DirectorySeparatorChar}EasyAbp.EShop.Products{Path.DirectorySeparatorChar}src{Path.DirectorySeparatorChar}EasyAbp.EShop.Products.Application.Contracts"));