From 31aadba3ff7d9a192a0a630268b779daa71eb1b0 Mon Sep 17 00:00:00 2001 From: gdlcf88 <47396430@qq.com> Date: Sun, 3 May 2020 17:10:36 +0800 Subject: [PATCH] Change PaymentRecordOrder to an entity --- .../PaymentRecords/PaymentRecord.cs | 3 +++ .../PaymentRecordOrder.cs | 10 ++-------- 2 files changed, 5 insertions(+), 8 deletions(-) rename modules/EasyAbp.EShop.Payment/src/EasyAbp.EShop.Payment.Domain/{PaymentRecordOrders => PaymentRecords}/PaymentRecordOrder.cs (62%) diff --git a/modules/EasyAbp.EShop.Payment/src/EasyAbp.EShop.Payment.Domain/PaymentRecords/PaymentRecord.cs b/modules/EasyAbp.EShop.Payment/src/EasyAbp.EShop.Payment.Domain/PaymentRecords/PaymentRecord.cs index bed9b3a3..33ddc884 100644 --- a/modules/EasyAbp.EShop.Payment/src/EasyAbp.EShop.Payment.Domain/PaymentRecords/PaymentRecord.cs +++ b/modules/EasyAbp.EShop.Payment/src/EasyAbp.EShop.Payment.Domain/PaymentRecords/PaymentRecord.cs @@ -1,4 +1,5 @@ using System; +using System.Collections.Generic; using EasyAbp.EShop.Stores.Stores; using JetBrains.Annotations; using Volo.Abp.Domain.Entities.Auditing; @@ -26,5 +27,7 @@ namespace EasyAbp.EShop.Payment.PaymentRecords public virtual decimal ActualPaymentAmount { get; protected set; } public virtual decimal RefundAmount { get; protected set; } + + public virtual List PaymentRecordOrders { get; protected set; } } } \ No newline at end of file diff --git a/modules/EasyAbp.EShop.Payment/src/EasyAbp.EShop.Payment.Domain/PaymentRecordOrders/PaymentRecordOrder.cs b/modules/EasyAbp.EShop.Payment/src/EasyAbp.EShop.Payment.Domain/PaymentRecords/PaymentRecordOrder.cs similarity index 62% rename from modules/EasyAbp.EShop.Payment/src/EasyAbp.EShop.Payment.Domain/PaymentRecordOrders/PaymentRecordOrder.cs rename to modules/EasyAbp.EShop.Payment/src/EasyAbp.EShop.Payment.Domain/PaymentRecords/PaymentRecordOrder.cs index 748f75be..47c3e8b2 100644 --- a/modules/EasyAbp.EShop.Payment/src/EasyAbp.EShop.Payment.Domain/PaymentRecordOrders/PaymentRecordOrder.cs +++ b/modules/EasyAbp.EShop.Payment/src/EasyAbp.EShop.Payment.Domain/PaymentRecords/PaymentRecordOrder.cs @@ -1,17 +1,11 @@ using System; -using EasyAbp.EShop.Stores.Stores; using JetBrains.Annotations; using Volo.Abp.Domain.Entities.Auditing; -using Volo.Abp.MultiTenancy; -namespace EasyAbp.EShop.Payment.PaymentRecordOrders +namespace EasyAbp.EShop.Payment.PaymentRecords { - public class PaymentRecordOrder : FullAuditedEntity, IMultiTenant, IMultiStore + public class PaymentRecordOrder : FullAuditedEntity { - public virtual Guid? TenantId { get; protected set; } - - public virtual Guid StoreId { get; protected set; } - public virtual Guid OrderId { get; protected set; } [NotNull]