From 717c7dacca8e543b98944513d1c5fda3561e9c3e Mon Sep 17 00:00:00 2001
From: gdlcf88 <gdlcf88@outlook.com>
Date: Sat, 1 Apr 2023 15:30:40 +0800
Subject: [PATCH] Upgrade to PaymentService v2.5.1

---
 Directory.Build.props                         |  2 +-
 common.props                                  |  2 +-
 .../Payments/Payments/Dtos/PaymentDto.cs      | 13 +++++----
 .../EShop/Payments/Refunds/Dtos/RefundDto.cs  | 11 ++++----
 .../Payments/Payments/EShopPaymentEto.cs      |  5 ++--
 .../EShop/Payments/Refunds/EShopRefundEto.cs  | 21 +++++++-------
 .../EShop/Payments/Payments/Payment.cs        | 28 +++++++++----------
 .../EasyAbp/EShop/Payments/Refunds/Refund.cs  | 24 ++++++++--------
 8 files changed, 55 insertions(+), 51 deletions(-)

diff --git a/Directory.Build.props b/Directory.Build.props
index 54b2c66e..f1b99993 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -3,7 +3,7 @@
 
     <AbpVersion>7.1.0</AbpVersion>
     <EasyAbpAbpTreesModuleVersion>2.10.0</EasyAbpAbpTreesModuleVersion>
-    <EasyAbpPaymentServiceModuleVersion>2.4.0</EasyAbpPaymentServiceModuleVersion>
+    <EasyAbpPaymentServiceModuleVersion>2.5.1</EasyAbpPaymentServiceModuleVersion>
     <EasyAbpAbpTagHelperPlusModuleVersion>1.4.0</EasyAbpAbpTagHelperPlusModuleVersion>
     <EasyAbpBookingServiceModuleVersion>0.5.0</EasyAbpBookingServiceModuleVersion>
     <DaprSdkVersion>1.9.0</DaprSdkVersion>
diff --git a/common.props b/common.props
index cf3d3ead..3f14f88c 100644
--- a/common.props
+++ b/common.props
@@ -1,7 +1,7 @@
 <Project>
   <PropertyGroup>
     <LangVersion>latest</LangVersion>
-    <Version>3.5.0</Version>
+    <Version>3.6.0</Version>
     <NoWarn>$(NoWarn);CS1591</NoWarn>
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
     <Authors>EasyAbp Team</Authors>
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
index 64b0c40c..cd9ee32c 100644
--- 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
@@ -11,9 +11,9 @@ namespace EasyAbp.EShop.Payments.Payments.Dtos
         #region Base properties
 
         public Guid UserId { get; set; }
-        
+
         public string PaymentMethod { get; set; }
-        
+
         public string PayeeAccount { get; set; }
 
         public string ExternalTradingCode { get; set; }
@@ -27,15 +27,16 @@ namespace EasyAbp.EShop.Payments.Payments.Dtos
         public decimal ActualPaymentAmount { get; set; }
 
         public decimal RefundAmount { get; set; }
-        
+
         public decimal PendingRefundAmount { get; set; }
 
         public DateTime? CompletionTime { get; set; }
-        
+
         public DateTime? CanceledTime { get; set; }
-        
+
         #endregion
-        
+
+        IEnumerable<IPaymentItem> IPayment.PaymentItems => PaymentItems;
         public List<PaymentItemDto> 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/Refunds/Dtos/RefundDto.cs b/modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.Application.Contracts/EasyAbp/EShop/Payments/Refunds/Dtos/RefundDto.cs
index 6ba6529c..9c142db9 100644
--- 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
@@ -19,19 +19,20 @@ namespace EasyAbp.EShop.Payments.Refunds.Dtos
         public string Currency { get; set; }
 
         public decimal RefundAmount { get; set; }
-        
+
         public string DisplayReason { get; set; }
 
         public string CustomerRemark { get; set; }
 
         public string StaffRemark { get; set; }
-        
+
         public DateTime? CompletedTime { get; set; }
-        
+
         public DateTime? CanceledTime { get; set; }
-        
+
         #endregion
-        
+
+        IEnumerable<IRefundItem> IRefund.RefundItems => RefundItems;
         public List<RefundItemDto> RefundItems { 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/EShopPaymentEto.cs b/modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.Domain.Shared/EasyAbp/EShop/Payments/Payments/EShopPaymentEto.cs
index 188ff539..4092e5e8 100644
--- a/modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.Domain.Shared/EasyAbp/EShop/Payments/Payments/EShopPaymentEto.cs
+++ b/modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.Domain.Shared/EasyAbp/EShop/Payments/Payments/EShopPaymentEto.cs
@@ -14,7 +14,7 @@ namespace EasyAbp.EShop.Payments.Payments
         public Guid Id { get; set; }
 
         public Guid? TenantId { get; set; }
-        
+
         public Guid UserId { get; set; }
 
         public string PaymentMethod { get; set; }
@@ -41,6 +41,7 @@ namespace EasyAbp.EShop.Payments.Payments
 
         #endregion
 
-        public List<EShopPaymentItemEto> PaymentItems { get; set; } = new List<EShopPaymentItemEto>();
+        IEnumerable<IPaymentItem> IPayment.PaymentItems => PaymentItems;
+        public List<EShopPaymentItemEto> PaymentItems { get; set; } = new();
     }
 }
\ No newline at end of file
diff --git a/modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.Domain.Shared/EasyAbp/EShop/Payments/Refunds/EShopRefundEto.cs b/modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.Domain.Shared/EasyAbp/EShop/Payments/Refunds/EShopRefundEto.cs
index 11f3595a..1fa8900e 100644
--- a/modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.Domain.Shared/EasyAbp/EShop/Payments/Refunds/EShopRefundEto.cs
+++ b/modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.Domain.Shared/EasyAbp/EShop/Payments/Refunds/EShopRefundEto.cs
@@ -16,27 +16,28 @@ namespace EasyAbp.EShop.Payments.Refunds
         public Guid? TenantId { get; set; }
 
         public Guid PaymentId { get; set; }
-        
+
         public string RefundPaymentMethod { get; set; }
-        
+
         public string ExternalTradingCode { get; set; }
-        
+
         public string Currency { get; set; }
-        
+
         public decimal RefundAmount { get; set; }
-        
+
         public string DisplayReason { get; set; }
 
         public string CustomerRemark { get; set; }
-        
+
         public string StaffRemark { get; set; }
-        
+
         public DateTime? CompletedTime { get; set; }
-        
+
         public DateTime? CanceledTime { get; set; }
-        
+
         #endregion
 
-        public List<EShopRefundItemEto> RefundItems { get; set; } = new List<EShopRefundItemEto>();
+        IEnumerable<IRefundItem> IRefund.RefundItems => RefundItems;
+        public List<EShopRefundItemEto> RefundItems { get; set; } = new();
     }
 }
\ 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
index 8e3276e0..e1c42c61 100644
--- 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
@@ -10,44 +10,44 @@ namespace EasyAbp.EShop.Payments.Payments
     public class Payment : FullAuditedAggregateRoot<Guid>, IPayment, IMultiTenant
     {
         #region Base properties
-        
+
         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 decimal PendingRefundAmount { get; protected set; }
 
         public virtual DateTime? CompletionTime { get; protected set; }
-        
+
         public virtual DateTime? CanceledTime { get; protected set; }
-        
+
+        IEnumerable<IPaymentItem> IPayment.PaymentItems => PaymentItems;
         public virtual List<PaymentItem> PaymentItems { get; protected set; }
-        
+
         #endregion
 
         protected Payment()
         {
-            
         }
 
         public void SetPaymentItems(List<PaymentItem> paymentItems)
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
index 6149292f..167a49b5 100644
--- 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
@@ -12,41 +12,41 @@ namespace EasyAbp.EShop.Payments.Refunds
         #region Base properties
 
         public virtual Guid? TenantId { get; protected set; }
-        
+
         public virtual Guid PaymentId { 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; }
-        
+
         public virtual string DisplayReason { get; protected set; }
 
         [CanBeNull]
         public virtual string CustomerRemark { get; protected set; }
-        
+
         [CanBeNull]
         public virtual string StaffRemark { get; protected set; }
 
         public virtual DateTime? CompletedTime { get; protected set; }
-        
+
         public virtual DateTime? CanceledTime { get; protected set; }
-        
+
         #endregion
-        
+
+        IEnumerable<IRefundItem> IRefund.RefundItems => RefundItems;
         public virtual List<RefundItem> RefundItems { get; protected set; }
 
         protected Refund()
         {
-            
         }
-        
+
         public void SetRefundItems(List<RefundItem> refundItems)
         {
             RefundItems = refundItems;