From db6473fabdf131f698864ff9b74d90512ccfc616 Mon Sep 17 00:00:00 2001
From: gdlcf88 <gdlcf88@outlook.com>
Date: Wed, 2 Sep 2020 17:51:00 +0800
Subject: [PATCH] Add ExtraProperties to IProductSku

---
 common.props                                      |  2 +-
 .../EShop/Payments/Payments/PaymentItem.cs        |  1 +
 .../EasyAbp/EShop/Payments/Refunds/RefundItem.cs  |  4 +++-
 .../EShop/Products/Products/Dtos/ProductSkuDto.cs |  5 ++++-
 .../EShop/Products/Products/IProductSku.cs        |  3 ++-
 .../EShop/Products/Products/ProductSkuEto.cs      |  3 +++
 .../EasyAbp/EShop/Products/Products/ProductSku.cs | 15 +++++++++++++--
 7 files changed, 27 insertions(+), 6 deletions(-)

diff --git a/common.props b/common.props
index c60015b3..d4d43eae 100644
--- a/common.props
+++ b/common.props
@@ -1,7 +1,7 @@
 <Project>
   <PropertyGroup>
     <LangVersion>latest</LangVersion>
-    <Version>0.13.1</Version>
+    <Version>0.14.0</Version>
     <NoWarn>$(NoWarn);CS1591</NoWarn>
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
     <Authors>EasyAbp Team</Authors>
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
index 0fdadb94..47402644 100644
--- 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
@@ -41,6 +41,7 @@ namespace EasyAbp.EShop.Payments.Payments
         private PaymentItem()
         {
             ExtraProperties = new Dictionary<string, object>();
+            this.SetDefaultsForExtraProperties();
         }
     }
 }
diff --git a/modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.Domain/EasyAbp/EShop/Payments/Refunds/RefundItem.cs b/modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.Domain/EasyAbp/EShop/Payments/Refunds/RefundItem.cs
index 3d7f0502..f1d51ea7 100644
--- a/modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.Domain/EasyAbp/EShop/Payments/Refunds/RefundItem.cs
+++ b/modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.Domain/EasyAbp/EShop/Payments/Refunds/RefundItem.cs
@@ -31,8 +31,10 @@ namespace EasyAbp.EShop.Payments.Refunds
 
         protected RefundItem()
         {
-            ExtraProperties = new Dictionary<string, object>();
             RefundItemOrderLines = new List<RefundItemOrderLine>();
+            
+            ExtraProperties = new Dictionary<string, object>();
+            this.SetDefaultsForExtraProperties();
         }
         
         public void SetStoreId(Guid storeId)
diff --git a/modules/EasyAbp.EShop.Products/src/EasyAbp.EShop.Products.Application.Contracts/EasyAbp/EShop/Products/Products/Dtos/ProductSkuDto.cs b/modules/EasyAbp.EShop.Products/src/EasyAbp.EShop.Products.Application.Contracts/EasyAbp/EShop/Products/Products/Dtos/ProductSkuDto.cs
index fdad70fc..070382bf 100644
--- a/modules/EasyAbp.EShop.Products/src/EasyAbp.EShop.Products.Application.Contracts/EasyAbp/EShop/Products/Products/Dtos/ProductSkuDto.cs
+++ b/modules/EasyAbp.EShop.Products/src/EasyAbp.EShop.Products.Application.Contracts/EasyAbp/EShop/Products/Products/Dtos/ProductSkuDto.cs
@@ -1,10 +1,11 @@
 using System;
 using System.Collections.Generic;
 using Volo.Abp.Application.Dtos;
+using Volo.Abp.Data;
 
 namespace EasyAbp.EShop.Products.Products.Dtos
 {
-    public class ProductSkuDto : FullAuditedEntityDto<Guid>
+    public class ProductSkuDto : FullAuditedEntityDto<Guid>, IHasExtraProperties
     {
         public List<Guid> AttributeOptionIds { get; set; }
         
@@ -32,5 +33,7 @@ namespace EasyAbp.EShop.Products.Products.Dtos
         public string MediaResources { get; set; }
         
         public Guid? ProductDetailId { get; set; }
+        
+        public Dictionary<string, object> ExtraProperties { get; set; }
     }
 }
\ No newline at end of file
diff --git a/modules/EasyAbp.EShop.Products/src/EasyAbp.EShop.Products.Domain.Shared/EasyAbp/EShop/Products/Products/IProductSku.cs b/modules/EasyAbp.EShop.Products/src/EasyAbp.EShop.Products.Domain.Shared/EasyAbp/EShop/Products/Products/IProductSku.cs
index 0d1117cc..920945c9 100644
--- a/modules/EasyAbp.EShop.Products/src/EasyAbp.EShop.Products.Domain.Shared/EasyAbp/EShop/Products/Products/IProductSku.cs
+++ b/modules/EasyAbp.EShop.Products/src/EasyAbp.EShop.Products.Domain.Shared/EasyAbp/EShop/Products/Products/IProductSku.cs
@@ -1,8 +1,9 @@
 using System;
+using Volo.Abp.Data;
 
 namespace EasyAbp.EShop.Products.Products
 {
-    public interface IProductSku
+    public interface IProductSku : IHasExtraProperties
     {
         string SerializedAttributeOptionIds { get; }
         
diff --git a/modules/EasyAbp.EShop.Products/src/EasyAbp.EShop.Products.Domain.Shared/EasyAbp/EShop/Products/Products/ProductSkuEto.cs b/modules/EasyAbp.EShop.Products/src/EasyAbp.EShop.Products.Domain.Shared/EasyAbp/EShop/Products/Products/ProductSkuEto.cs
index a244f4cd..fbdef2d4 100644
--- a/modules/EasyAbp.EShop.Products/src/EasyAbp.EShop.Products.Domain.Shared/EasyAbp/EShop/Products/Products/ProductSkuEto.cs
+++ b/modules/EasyAbp.EShop.Products/src/EasyAbp.EShop.Products.Domain.Shared/EasyAbp/EShop/Products/Products/ProductSkuEto.cs
@@ -1,4 +1,5 @@
 using System;
+using System.Collections.Generic;
 
 namespace EasyAbp.EShop.Products.Products
 {
@@ -23,5 +24,7 @@ namespace EasyAbp.EShop.Products.Products
         public string MediaResources { get; set; }
 
         public Guid? ProductDetailId { get; set; }
+        
+        public Dictionary<string, object> ExtraProperties { get; set; }
     }
 }
\ No newline at end of file
diff --git a/modules/EasyAbp.EShop.Products/src/EasyAbp.EShop.Products.Domain/EasyAbp/EShop/Products/Products/ProductSku.cs b/modules/EasyAbp.EShop.Products/src/EasyAbp.EShop.Products.Domain/EasyAbp/EShop/Products/Products/ProductSku.cs
index d7fc2f0c..cc82b56b 100644
--- a/modules/EasyAbp.EShop.Products/src/EasyAbp.EShop.Products.Domain/EasyAbp/EShop/Products/Products/ProductSku.cs
+++ b/modules/EasyAbp.EShop.Products/src/EasyAbp.EShop.Products.Domain/EasyAbp/EShop/Products/Products/ProductSku.cs
@@ -1,5 +1,7 @@
 using System;
+using System.Collections.Generic;
 using JetBrains.Annotations;
+using Volo.Abp.Data;
 using Volo.Abp.Domain.Entities.Auditing;
 
 namespace EasyAbp.EShop.Products.Products
@@ -26,9 +28,15 @@ namespace EasyAbp.EShop.Products.Products
         [CanBeNull]
         public virtual string MediaResources { get; protected set; }
 
-        public Guid? ProductDetailId { get; set; }
+        public virtual Guid? ProductDetailId { get; protected set; }
+        
+        public virtual Dictionary<string, object> ExtraProperties { get; protected set; }
 
-        protected ProductSku() {}
+        protected ProductSku()
+        {
+            ExtraProperties = new Dictionary<string, object>();
+            this.SetDefaultsForExtraProperties();
+        }
         
         public ProductSku(
             Guid id,
@@ -51,6 +59,9 @@ namespace EasyAbp.EShop.Products.Products
             OrderMaxQuantity = orderMaxQuantity;
             MediaResources = mediaResources;
             ProductDetailId = productDetailId;
+            
+            ExtraProperties = new Dictionary<string, object>();
+            this.SetDefaultsForExtraProperties();
         }
 
         public void TrimCode()