Use ExtensibleObject

Directory.Build.props

@@ -3,7 +3,7 @@
 
     <AbpVersion>5.0.1</AbpVersion>
     <EasyAbpAbpTreesModuleVersion>2.5.1</EasyAbpAbpTreesModuleVersion>
-    <EasyAbpPaymentServiceModuleVersion>2.0.1</EasyAbpPaymentServiceModuleVersion>
+    <EasyAbpPaymentServiceModuleVersion>2.0.4</EasyAbpPaymentServiceModuleVersion>
     <EasyAbpAbpTagHelperPlusModuleVersion>0.8.1</EasyAbpAbpTagHelperPlusModuleVersion>
 
   </PropertyGroup>

common.props

@@ -1,7 +1,7 @@
 <Project>
   <PropertyGroup>
     <LangVersion>latest</LangVersion>
-    <Version>2.4.0</Version>
+    <Version>2.4.1</Version>
     <NoWarn>$(NoWarn);CS1591</NoWarn>
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
     <Authors>EasyAbp Team</Authors>

modules/EasyAbp.EShop.Orders/src/EasyAbp.EShop.Orders.Application.Contracts/EasyAbp/EShop/Orders/Orders/Dtos/OrderLineDto.cs

@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.Text.Json.Serialization;
 using Volo.Abp.Application.Dtos;
 using Volo.Abp.Data;
 
@@ -46,6 +47,7 @@ namespace EasyAbp.EShop.Orders.Orders.Dtos
         
         public decimal RefundAmount { get; set; }
         
+        [JsonInclude]
         public ExtraPropertyDictionary ExtraProperties { get; set; }
     }
 }

modules/EasyAbp.EShop.Orders/src/EasyAbp.EShop.Orders.Domain.Shared/EasyAbp/EShop/Orders/Orders/OrderEto.cs

@@ -3,11 +3,12 @@ using System.Collections.Generic;
 using Volo.Abp.Auditing;
 using Volo.Abp.Data;
 using Volo.Abp.MultiTenancy;
+using Volo.Abp.ObjectExtending;
 
 namespace EasyAbp.EShop.Orders.Orders
 {
     [Serializable]
-    public class OrderEto : IOrder, IFullAuditedObject, IMultiTenant
+    public class OrderEto : ExtensibleObject, IOrder, IFullAuditedObject, IMultiTenant
     {
         public Guid Id { get; set; }
         
@@ -55,7 +56,6 @@ namespace EasyAbp.EShop.Orders.Orders
 
         public List<OrderLineEto> OrderLines { get; set; }
         
-        public ExtraPropertyDictionary ExtraProperties { get; set; }
         public DateTime CreationTime { get; set; }
         
         public Guid? CreatorId { get; set; }

modules/EasyAbp.EShop.Orders/src/EasyAbp.EShop.Orders.Domain.Shared/EasyAbp/EShop/Orders/Orders/OrderLineEto.cs

@@ -1,10 +1,10 @@
 using System;
 using Volo.Abp.Data;
+using Volo.Abp.ObjectExtending;
 
 namespace EasyAbp.EShop.Orders.Orders
 {
-    [Serializable]
-    public class OrderLineEto : IOrderLine
+    public class OrderLineEto : ExtensibleObject, IOrderLine
     {
         public Guid Id { get; set; }
 
@@ -45,7 +45,5 @@ namespace EasyAbp.EShop.Orders.Orders
         public int RefundedQuantity { get; set; }
         
         public decimal RefundAmount { get; set; }
-        
-        public ExtraPropertyDictionary ExtraProperties { get; set; }
     }
 }

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

@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.Text.Json.Serialization;
 using JetBrains.Annotations;
 using Volo.Abp.Data;
 using Volo.Abp.Domain.Entities.Auditing;
@@ -54,6 +55,7 @@ namespace EasyAbp.EShop.Orders.Orders
         
         public virtual decimal RefundAmount { get; protected set; }
         
+        [JsonInclude]
         public virtual ExtraPropertyDictionary ExtraProperties { get; protected set; }
 
         protected OrderLine()

modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.Domain.Shared/EasyAbp/EShop/Payments/Payments/EShopPaymentEto.cs

@@ -3,11 +3,11 @@ using System.Collections.Generic;
 using EasyAbp.PaymentService.Payments;
 using Volo.Abp.Data;
 using Volo.Abp.MultiTenancy;
+using Volo.Abp.ObjectExtending;
 
 namespace EasyAbp.EShop.Payments.Payments
 {
-    [Serializable]
-    public class EShopPaymentEto : IPayment, IMultiTenant
+    public class EShopPaymentEto : ExtensibleObject, IPayment, IMultiTenant
     {
         #region Base properties
 
@@ -39,8 +39,6 @@ namespace EasyAbp.EShop.Payments.Payments
 
         public DateTime? CanceledTime { get; set; }
 
-        public ExtraPropertyDictionary ExtraProperties { get; set; }
-        
         #endregion
 
         public List<EShopPaymentItemEto> PaymentItems { get; set; } = new List<EShopPaymentItemEto>();

modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.Domain.Shared/EasyAbp/EShop/Payments/Payments/EShopPaymentItemEto.cs

@@ -2,11 +2,11 @@
 using System.Collections.Generic;
 using EasyAbp.PaymentService.Payments;
 using Volo.Abp.Data;
+using Volo.Abp.ObjectExtending;
 
 namespace EasyAbp.EShop.Payments.Payments
 {
-    [Serializable]
-    public class EShopPaymentItemEto : IPaymentItem
+    public class EShopPaymentItemEto : ExtensibleObject, IPaymentItem
     {
         #region Base properties
 
@@ -26,8 +26,6 @@ namespace EasyAbp.EShop.Payments.Payments
         
         public decimal PendingRefundAmount { get; set; }
         
-        public ExtraPropertyDictionary ExtraProperties { get; set; }
-        
         #endregion
         
         public Guid StoreId { get; set; }

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

@@ -3,11 +3,11 @@ using System.Collections.Generic;
 using EasyAbp.PaymentService.Refunds;
 using Volo.Abp.Data;
 using Volo.Abp.MultiTenancy;
+using Volo.Abp.ObjectExtending;
 
 namespace EasyAbp.EShop.Payments.Refunds
 {
-    [Serializable]
-    public class EShopRefundEto : IRefund, IMultiTenant
+    public class EShopRefundEto : ExtensibleObject, IRefund, IMultiTenant
     {
         #region Base properties
 
@@ -34,8 +34,6 @@ namespace EasyAbp.EShop.Payments.Refunds
         public DateTime? CompletedTime { get; set; }
         
         public DateTime? CanceledTime { get; set; }
-
-        public ExtraPropertyDictionary ExtraProperties { get; set; }
         
         #endregion
 

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

@@ -2,11 +2,11 @@
 using System.Collections.Generic;
 using EasyAbp.PaymentService.Refunds;
 using Volo.Abp.Data;
+using Volo.Abp.ObjectExtending;
 
 namespace EasyAbp.EShop.Payments.Refunds
 {
-    [Serializable]
-    public class EShopRefundItemEto : IRefundItem
+    public class EShopRefundItemEto : ExtensibleObject, IRefundItem
     {
         #region Base properties
 
@@ -20,8 +20,6 @@ namespace EasyAbp.EShop.Payments.Refunds
         
         public string StaffRemark { get; set; }
         
-        public ExtraPropertyDictionary ExtraProperties { get; set; }
-        
         #endregion
         
         public Guid StoreId { get; set; }

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

@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.Text.Json.Serialization;
 using EasyAbp.EShop.Stores.Stores;
 using EasyAbp.PaymentService.Payments;
 using JetBrains.Annotations;
@@ -27,6 +28,7 @@ namespace EasyAbp.EShop.Payments.Payments
         
         public virtual decimal PendingRefundAmount { get; protected set; }
         
+        [JsonInclude]
         public virtual ExtraPropertyDictionary ExtraProperties { get; protected set; }
 
         #endregion

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

@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.Text.Json.Serialization;
 using EasyAbp.EShop.Stores.Stores;
 using EasyAbp.PaymentService.Refunds;
 using Volo.Abp.Data;
@@ -19,6 +20,7 @@ namespace EasyAbp.EShop.Payments.Refunds
         
         public virtual string StaffRemark { get; protected set; }
 
+        [JsonInclude]
         public virtual ExtraPropertyDictionary ExtraProperties { get; set; }
 
         #endregion

modules/EasyAbp.EShop.Products/src/EasyAbp.EShop.Products.Domain.Shared/EasyAbp/EShop/Products/Products/ProductAttributeEto.cs

@@ -1,11 +1,11 @@
 using System;
 using System.Collections.Generic;
 using Volo.Abp.Data;
+using Volo.Abp.ObjectExtending;
 
 namespace EasyAbp.EShop.Products.Products
 {
-    [Serializable]
-    public class ProductAttributeEto : IProductAttribute
+    public class ProductAttributeEto : ExtensibleObject, IProductAttribute
     {
         public Guid Id { get; set; }
 
@@ -16,7 +16,5 @@ namespace EasyAbp.EShop.Products.Products
         public int DisplayOrder { get; set; }
         
         public ICollection<ProductAttributeOptionEto> ProductAttributeOptions { get; set; }
-        
-        public ExtraPropertyDictionary ExtraProperties { get; set; }
     }
 }

modules/EasyAbp.EShop.Products/src/EasyAbp.EShop.Products.Domain.Shared/EasyAbp/EShop/Products/Products/ProductAttributeOptionEto.cs

@@ -1,10 +1,11 @@
 using System;
 using Volo.Abp.Data;
+using Volo.Abp.ObjectExtending;
 
 namespace EasyAbp.EShop.Products.Products
 {
     [Serializable]
-    public class ProductAttributeOptionEto : IProductAttributeOption
+    public class ProductAttributeOptionEto : ExtensibleObject, IProductAttributeOption
     {
         public Guid Id { get; set; }
 
@@ -13,7 +14,5 @@ namespace EasyAbp.EShop.Products.Products
         public string Description { get; set; }
         
         public int DisplayOrder { get; set; }
-        
-        public ExtraPropertyDictionary ExtraProperties { get; set; }
     }
 }

modules/EasyAbp.EShop.Products/src/EasyAbp.EShop.Products.Domain.Shared/EasyAbp/EShop/Products/Products/ProductEto.cs

@@ -2,11 +2,11 @@
 using System.Collections.Generic;
 using Volo.Abp.Data;
 using Volo.Abp.MultiTenancy;
+using Volo.Abp.ObjectExtending;
 
 namespace EasyAbp.EShop.Products.Products
 {
-    [Serializable]
-    public class ProductEto : IProduct, IMultiTenant
+    public class ProductEto : ExtensibleObject, IProduct, IMultiTenant
     {
         public Guid? TenantId { get; set; }
 
@@ -34,8 +34,6 @@ namespace EasyAbp.EShop.Products.Products
 
         public bool IsHidden { get; set; }
         
-        public ExtraPropertyDictionary ExtraProperties { get; set; }
-        
         public ICollection<ProductAttributeEto> ProductAttributes { get; set; }
         
         public ICollection<ProductSkuEto> ProductSkus { get; set; }

modules/EasyAbp.EShop.Products/src/EasyAbp.EShop.Products.Domain.Shared/EasyAbp/EShop/Products/Products/ProductSkuEto.cs

@@ -1,10 +1,10 @@
 using System;
 using Volo.Abp.Data;
+using Volo.Abp.ObjectExtending;
 
 namespace EasyAbp.EShop.Products.Products
 {
-    [Serializable]
-    public class ProductSkuEto : IProductSku
+    public class ProductSkuEto : ExtensibleObject, IProductSku
     {
         public Guid Id { get; set; }
 
@@ -25,7 +25,5 @@ namespace EasyAbp.EShop.Products.Products
         public string MediaResources { get; set; }
 
         public Guid? ProductDetailId { get; set; }
-        
-        public ExtraPropertyDictionary ExtraProperties { get; set; }
     }
 }

modules/EasyAbp.EShop.Products/src/EasyAbp.EShop.Products.Domain/EasyAbp/EShop/Products/Products/ProductAttribute.cs

@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.Text.Json.Serialization;
 using JetBrains.Annotations;
 using Volo.Abp.Data;
 using Volo.Abp.Domain.Entities.Auditing;
@@ -16,6 +17,7 @@ namespace EasyAbp.EShop.Products.Products
         
         public virtual int DisplayOrder { get; protected set; }
 
+        [JsonInclude]
         public virtual ExtraPropertyDictionary ExtraProperties { get; protected set; }
 
         public virtual List<ProductAttributeOption> ProductAttributeOptions { get; protected set; }

modules/EasyAbp.EShop.Products/src/EasyAbp.EShop.Products.Domain/EasyAbp/EShop/Products/Products/ProductAttributeOption.cs

@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.Text.Json.Serialization;
 using JetBrains.Annotations;
 using Volo.Abp.Data;
 using Volo.Abp.Domain.Entities.Auditing;
@@ -16,6 +17,7 @@ namespace EasyAbp.EShop.Products.Products
         
         public virtual int DisplayOrder { get; protected set; }
 
+        [JsonInclude]
         public virtual ExtraPropertyDictionary ExtraProperties { get; protected set; }
 
         protected ProductAttributeOption()

modules/EasyAbp.EShop.Products/src/EasyAbp.EShop.Products.Domain/EasyAbp/EShop/Products/Products/ProductSku.cs

@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.Text.Json.Serialization;
 using JetBrains.Annotations;
 using Volo.Abp.Data;
 using Volo.Abp.Domain.Entities.Auditing;
@@ -32,6 +33,7 @@ namespace EasyAbp.EShop.Products.Products
 
         public virtual Guid? ProductDetailId { get; protected set; }
         
+        [JsonInclude]
         public virtual ExtraPropertyDictionary ExtraProperties { get; protected set; }
 
         protected ProductSku()