diff --git a/modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.Abstractions/EasyAbp.EShop.Payments.Abstractions.csproj b/modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.Abstractions/EasyAbp.EShop.Payments.Abstractions.csproj deleted file mode 100644 index adfc58a8..00000000 --- a/modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.Abstractions/EasyAbp.EShop.Payments.Abstractions.csproj +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - netstandard2.0 - - - - diff --git a/modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.Abstractions/EasyAbp/EShop/Payments/IPaymentServiceProvider.cs b/modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.Abstractions/EasyAbp/EShop/Payments/IPaymentServiceProvider.cs deleted file mode 100644 index 5712acd9..00000000 --- a/modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.Abstractions/EasyAbp/EShop/Payments/IPaymentServiceProvider.cs +++ /dev/null @@ -1,7 +0,0 @@ -namespace EasyAbp.EShop.Payments -{ - public interface IPaymentsServiceProvider - { - - } -} \ No newline at end of file diff --git a/modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.Abstractions/FodyWeavers.xml b/modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.Abstractions/FodyWeavers.xml deleted file mode 100644 index be0de3a9..00000000 --- a/modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.Abstractions/FodyWeavers.xml +++ /dev/null @@ -1,3 +0,0 @@ - - - \ No newline at end of file diff --git a/modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.Abstractions/FodyWeavers.xsd b/modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.Abstractions/FodyWeavers.xsd deleted file mode 100644 index 3f3946e2..00000000 --- a/modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.Abstractions/FodyWeavers.xsd +++ /dev/null @@ -1,30 +0,0 @@ - - - - - - - - - - - - - - - 'true' to run assembly verification (PEVerify) on the target assembly after all weavers have been executed. - - - - - A comma-separated list of error codes that can be safely ignored in assembly verification. - - - - - 'false' to turn off automatic generation of the XML Schema file. - - - - - \ No newline at end of file diff --git a/modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.Domain/FreePaymentServiceProvider.cs b/modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.Domain/FreePaymentServiceProvider.cs index 739f2384..5bacae0a 100644 --- a/modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.Domain/FreePaymentServiceProvider.cs +++ b/modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.Domain/FreePaymentServiceProvider.cs @@ -1,7 +1,17 @@ -namespace EasyAbp.EShop.Payments +using System.Collections.Generic; +using System.Threading.Tasks; +using EasyAbp.EShop.Payments.Payments; +using Microsoft.Extensions.DependencyInjection; +using Volo.Abp.DependencyInjection; + +namespace EasyAbp.EShop.Payments { - public class FreePaymentsServiceProvider : IPaymentsServiceProvider + [Dependency(ServiceLifetime.Transient, TryRegister = true)] + public class FreePaymentServiceProvider : IPaymentServiceProvider { - + public async Task PayForOrderAsync(Payment payment, Dictionary extraProperties = null) + { + throw new System.NotImplementedException(); + } } } \ No newline at end of file diff --git a/modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.Domain/PaymentRecords/PaymentRecord.cs b/modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.Domain/PaymentRecords/PaymentRecord.cs deleted file mode 100644 index c99085da..00000000 --- a/modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.Domain/PaymentRecords/PaymentRecord.cs +++ /dev/null @@ -1,33 +0,0 @@ -using System; -using System.Collections.Generic; -using EasyAbp.EShop.Stores.Stores; -using JetBrains.Annotations; -using Volo.Abp.Domain.Entities.Auditing; -using Volo.Abp.MultiTenancy; - -namespace EasyAbp.EShop.Payments.PaymentsRecords -{ - public class PaymentsRecord : FullAuditedAggregateRoot, IMultiTenant - { - public virtual Guid? TenantId { get; protected set; } - - [NotNull] - public virtual string PaymentsMethod { get; protected set; } - - [NotNull] - public virtual string ExternalTradingCode { get; protected set; } - - [NotNull] - public virtual string Currency { get; protected set; } - - public virtual decimal OriginalPaymentsAmount { get; protected set; } - - public virtual decimal PaymentsDiscount { get; protected set; } - - public virtual decimal ActualPaymentsAmount { get; protected set; } - - public virtual decimal RefundAmount { get; protected set; } - - public virtual List PaymentsRecordOrders { get; protected set; } - } -} \ No newline at end of file diff --git a/modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.Domain/Payments/IPaymentServiceProvider.cs b/modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.Domain/Payments/IPaymentServiceProvider.cs new file mode 100644 index 00000000..a80cbea2 --- /dev/null +++ b/modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.Domain/Payments/IPaymentServiceProvider.cs @@ -0,0 +1,11 @@ +using System; +using System.Collections.Generic; +using System.Threading.Tasks; + +namespace EasyAbp.EShop.Payments.Payments +{ + public interface IPaymentServiceProvider + { + Task PayForOrderAsync(Payment payment, Dictionary extraProperties = null); + } +} \ No newline at end of file diff --git a/modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.Domain/Payments/Payment.cs b/modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.Domain/Payments/Payment.cs new file mode 100644 index 00000000..6ec98903 --- /dev/null +++ b/modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.Domain/Payments/Payment.cs @@ -0,0 +1,32 @@ +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; } + + [NotNull] + public virtual string PaymentMethod { get; protected set; } + + [NotNull] + 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 List PaymentOrders { get; protected set; } + } +} \ No newline at end of file diff --git a/modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.Domain/PaymentRecords/PaymentRecordOrder.cs b/modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.Domain/Payments/PaymentOrder.cs similarity index 50% rename from modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.Domain/PaymentRecords/PaymentRecordOrder.cs rename to modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.Domain/Payments/PaymentOrder.cs index 0ff03a88..f5518519 100644 --- a/modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.Domain/PaymentRecords/PaymentRecordOrder.cs +++ b/modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.Domain/Payments/PaymentOrder.cs @@ -2,20 +2,20 @@ using JetBrains.Annotations; using Volo.Abp.Domain.Entities.Auditing; -namespace EasyAbp.EShop.Payments.PaymentsRecords +namespace EasyAbp.EShop.Payments.Payments { - public class PaymentsRecordOrder : FullAuditedEntity + public class PaymentOrder : FullAuditedEntity { public virtual Guid OrderId { get; protected set; } [NotNull] public virtual string Currency { get; protected set; } - public virtual decimal OriginalPaymentsAmount { get; protected set; } + public virtual decimal OriginalPaymentAmount { get; protected set; } - public virtual decimal PaymentsDiscount { get; protected set; } + public virtual decimal PaymentDiscount { get; protected set; } - public virtual decimal ActualPaymentsAmount { get; protected set; } + public virtual decimal ActualPaymentAmount { get; protected set; } public virtual decimal RefundAmount { get; protected set; } } diff --git a/samples/EasyMall/aspnet-core/EasyMall.sln b/samples/EasyMall/aspnet-core/EasyMall.sln index e01744bc..2abe7129 100644 --- a/samples/EasyMall/aspnet-core/EasyMall.sln +++ b/samples/EasyMall/aspnet-core/EasyMall.sln @@ -221,8 +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("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EasyAbp.EShop.Payments.Abstractions", "..\..\..\modules\EasyAbp.EShop.Payments\src\EasyAbp.EShop.Payments.Abstractions\EasyAbp.EShop.Payments.Abstractions.csproj", "{4813F498-8331-4C1D-9E6F-47E9CFB803C1}" -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}" @@ -631,10 +629,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 - {4813F498-8331-4C1D-9E6F-47E9CFB803C1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {4813F498-8331-4C1D-9E6F-47E9CFB803C1}.Debug|Any CPU.Build.0 = Debug|Any CPU - {4813F498-8331-4C1D-9E6F-47E9CFB803C1}.Release|Any CPU.ActiveCfg = Release|Any CPU - {4813F498-8331-4C1D-9E6F-47E9CFB803C1}.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 @@ -806,7 +800,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} - {4813F498-8331-4C1D-9E6F-47E9CFB803C1} = {3D87E511-7315-4D3B-B994-A8CEDAF47CBF} {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}