diff --git a/modules/EasyAbp.EShop.Baskets/src/EasyAbp.EShop.Baskets.Domain/BasketItems/BasketItem.cs b/modules/EasyAbp.EShop.Baskets/src/EasyAbp.EShop.Baskets.Domain/BasketItems/BasketItem.cs index 782c9a51..a17c721a 100644 --- a/modules/EasyAbp.EShop.Baskets/src/EasyAbp.EShop.Baskets.Domain/BasketItems/BasketItem.cs +++ b/modules/EasyAbp.EShop.Baskets/src/EasyAbp.EShop.Baskets.Domain/BasketItems/BasketItem.cs @@ -26,6 +26,9 @@ namespace EasyAbp.EShop.Baskets.BasketItems [NotNull] public virtual string SkuDescription { get; protected set; } + [NotNull] + public virtual string Currency { get; protected set; } + public virtual decimal UnitPrice { get; protected set; } public virtual decimal TotalPrice { get; protected set; } diff --git a/modules/EasyAbp.EShop.Orders/src/EasyAbp.EShop.Orders.Domain/Orders/Order.cs b/modules/EasyAbp.EShop.Orders/src/EasyAbp.EShop.Orders.Domain/Orders/Order.cs index 2db9d985..c8977101 100644 --- a/modules/EasyAbp.EShop.Orders/src/EasyAbp.EShop.Orders.Domain/Orders/Order.cs +++ b/modules/EasyAbp.EShop.Orders/src/EasyAbp.EShop.Orders.Domain/Orders/Order.cs @@ -22,6 +22,9 @@ namespace EasyAbp.EShop.Orders.Orders public virtual Guid? ShippingMethodId { get; protected set; } + [NotNull] + public virtual string Currency { get; protected set; } + public virtual decimal Freight { get; protected set; } public virtual decimal ProductTotalPrice { get; protected set; } diff --git a/modules/EasyAbp.EShop.Orders/src/EasyAbp.EShop.Orders.Domain/Orders/OrderLine.cs b/modules/EasyAbp.EShop.Orders/src/EasyAbp.EShop.Orders.Domain/Orders/OrderLine.cs index d10e39b0..2b019e3a 100644 --- a/modules/EasyAbp.EShop.Orders/src/EasyAbp.EShop.Orders.Domain/Orders/OrderLine.cs +++ b/modules/EasyAbp.EShop.Orders/src/EasyAbp.EShop.Orders.Domain/Orders/OrderLine.cs @@ -21,6 +21,9 @@ namespace EasyAbp.EShop.Orders.Orders [CanBeNull] public virtual string MediaResources { get; protected set; } + [NotNull] + public virtual string Currency { get; protected set; } + public virtual decimal UnitPrice { get; protected set; } public virtual decimal TotalPrice { get; protected set; } 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/PaymentRecordOrders/PaymentRecordOrder.cs index b582556a..d362cc7d 100644 --- a/modules/EasyAbp.EShop.Payment/src/EasyAbp.EShop.Payment.Domain/PaymentRecordOrders/PaymentRecordOrder.cs +++ b/modules/EasyAbp.EShop.Payment/src/EasyAbp.EShop.Payment.Domain/PaymentRecordOrders/PaymentRecordOrder.cs @@ -1,5 +1,6 @@ using System; using EasyAbp.EShop.Stores.Stores; +using JetBrains.Annotations; using Volo.Abp.Domain.Entities.Auditing; using Volo.Abp.MultiTenancy; @@ -13,6 +14,9 @@ namespace EasyAbp.EShop.Payment.PaymentRecordOrders public virtual Guid OrderId { 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; } 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 404d00b9..bed9b3a3 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 @@ -16,6 +16,9 @@ namespace EasyAbp.EShop.Payment.PaymentRecords [NotNull] 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; } diff --git a/modules/EasyAbp.EShop.Payment/src/EasyAbp.EShop.Payment.Domain/RefundRecords/RefundRecord.cs b/modules/EasyAbp.EShop.Payment/src/EasyAbp.EShop.Payment.Domain/RefundRecords/RefundRecord.cs index 3df79a56..7aba1f9b 100644 --- a/modules/EasyAbp.EShop.Payment/src/EasyAbp.EShop.Payment.Domain/RefundRecords/RefundRecord.cs +++ b/modules/EasyAbp.EShop.Payment/src/EasyAbp.EShop.Payment.Domain/RefundRecords/RefundRecord.cs @@ -20,6 +20,9 @@ namespace EasyAbp.EShop.Payment.RefundRecords [NotNull] public virtual string ExternalTradingCode { get; protected set; } + [NotNull] + public virtual string Currency { get; protected set; } + public virtual decimal RefundAmount { get; protected set; } [CanBeNull] 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 296de828..5005f1e1 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 @@ -9,10 +9,13 @@ namespace EasyAbp.EShop.Products.Products [NotNull] public virtual string SerializedAttributeOptionIds { get; protected set; } + [NotNull] + public virtual string Currency { get; protected set; } + public virtual decimal OriginalPrice { get; protected set; } public virtual decimal Price { get; protected set; } - + public virtual int Inventory { get; protected set; } public virtual int Sold { get; protected set; } @@ -24,6 +27,7 @@ namespace EasyAbp.EShop.Products.Products public ProductSku( Guid id, [NotNull] string serializedAttributeOptionIds, + [NotNull] string currency, decimal originalPrice, decimal price, int inventory, @@ -31,6 +35,7 @@ namespace EasyAbp.EShop.Products.Products int orderMinQuantity) : base(id) { SerializedAttributeOptionIds = serializedAttributeOptionIds; + Currency = currency; OriginalPrice = originalPrice; Price = price; Inventory = inventory;