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 @@
7.1.0
2.10.0
- 2.4.0
+ 2.5.1
1.4.0
0.5.0
1.9.0
diff --git a/common.props b/common.props
index cf3d3ead..3f14f88c 100644
--- a/common.props
+++ b/common.props
@@ -1,7 +1,7 @@
latest
- 3.5.0
+ 3.6.0
$(NoWarn);CS1591
true
EasyAbp Team
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 IPayment.PaymentItems => PaymentItems;
public List 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 IRefund.RefundItems => RefundItems;
public List 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 PaymentItems { get; set; } = new List();
+ IEnumerable IPayment.PaymentItems => PaymentItems;
+ public List 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 RefundItems { get; set; } = new List();
+ IEnumerable IRefund.RefundItems => RefundItems;
+ public List 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, 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 IPayment.PaymentItems => PaymentItems;
public virtual List PaymentItems { get; protected set; }
-
+
#endregion
protected Payment()
{
-
}
public void SetPaymentItems(List 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 IRefund.RefundItems => RefundItems;
public virtual List RefundItems { get; protected set; }
protected Refund()
{
-
}
-
+
public void SetRefundItems(List refundItems)
{
RefundItems = refundItems;