Commit 04f69836 authored by gdlcf88's avatar gdlcf88

Added currency properties. Close #4

parent 51e1fe6e
...@@ -26,6 +26,9 @@ namespace EasyAbp.EShop.Baskets.BasketItems ...@@ -26,6 +26,9 @@ namespace EasyAbp.EShop.Baskets.BasketItems
[NotNull] [NotNull]
public virtual string SkuDescription { get; protected set; } 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 UnitPrice { get; protected set; }
public virtual decimal TotalPrice { get; protected set; } public virtual decimal TotalPrice { get; protected set; }
......
...@@ -22,6 +22,9 @@ namespace EasyAbp.EShop.Orders.Orders ...@@ -22,6 +22,9 @@ namespace EasyAbp.EShop.Orders.Orders
public virtual Guid? ShippingMethodId { get; protected set; } 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 Freight { get; protected set; }
public virtual decimal ProductTotalPrice { get; protected set; } public virtual decimal ProductTotalPrice { get; protected set; }
......
...@@ -21,6 +21,9 @@ namespace EasyAbp.EShop.Orders.Orders ...@@ -21,6 +21,9 @@ namespace EasyAbp.EShop.Orders.Orders
[CanBeNull] [CanBeNull]
public virtual string MediaResources { get; protected set; } 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 UnitPrice { get; protected set; }
public virtual decimal TotalPrice { get; protected set; } public virtual decimal TotalPrice { get; protected set; }
......
using System; using System;
using EasyAbp.EShop.Stores.Stores; using EasyAbp.EShop.Stores.Stores;
using JetBrains.Annotations;
using Volo.Abp.Domain.Entities.Auditing; using Volo.Abp.Domain.Entities.Auditing;
using Volo.Abp.MultiTenancy; using Volo.Abp.MultiTenancy;
...@@ -13,6 +14,9 @@ namespace EasyAbp.EShop.Payment.PaymentRecordOrders ...@@ -13,6 +14,9 @@ namespace EasyAbp.EShop.Payment.PaymentRecordOrders
public virtual Guid OrderId { get; protected set; } 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 OriginalPaymentAmount { get; protected set; }
public virtual decimal PaymentDiscount { get; protected set; } public virtual decimal PaymentDiscount { get; protected set; }
......
...@@ -16,6 +16,9 @@ namespace EasyAbp.EShop.Payment.PaymentRecords ...@@ -16,6 +16,9 @@ namespace EasyAbp.EShop.Payment.PaymentRecords
[NotNull] [NotNull]
public virtual string ExternalTradingCode { get; protected set; } 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 OriginalPaymentAmount { get; protected set; }
public virtual decimal PaymentDiscount { get; protected set; } public virtual decimal PaymentDiscount { get; protected set; }
......
...@@ -20,6 +20,9 @@ namespace EasyAbp.EShop.Payment.RefundRecords ...@@ -20,6 +20,9 @@ namespace EasyAbp.EShop.Payment.RefundRecords
[NotNull] [NotNull]
public virtual string ExternalTradingCode { get; protected set; } public virtual string ExternalTradingCode { get; protected set; }
[NotNull]
public virtual string Currency { get; protected set; }
public virtual decimal RefundAmount { get; protected set; } public virtual decimal RefundAmount { get; protected set; }
[CanBeNull] [CanBeNull]
......
...@@ -9,10 +9,13 @@ namespace EasyAbp.EShop.Products.Products ...@@ -9,10 +9,13 @@ namespace EasyAbp.EShop.Products.Products
[NotNull] [NotNull]
public virtual string SerializedAttributeOptionIds { get; protected set; } 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 OriginalPrice { get; protected set; }
public virtual decimal Price { get; protected set; } public virtual decimal Price { get; protected set; }
public virtual int Inventory { get; protected set; } public virtual int Inventory { get; protected set; }
public virtual int Sold { get; protected set; } public virtual int Sold { get; protected set; }
...@@ -24,6 +27,7 @@ namespace EasyAbp.EShop.Products.Products ...@@ -24,6 +27,7 @@ namespace EasyAbp.EShop.Products.Products
public ProductSku( public ProductSku(
Guid id, Guid id,
[NotNull] string serializedAttributeOptionIds, [NotNull] string serializedAttributeOptionIds,
[NotNull] string currency,
decimal originalPrice, decimal originalPrice,
decimal price, decimal price,
int inventory, int inventory,
...@@ -31,6 +35,7 @@ namespace EasyAbp.EShop.Products.Products ...@@ -31,6 +35,7 @@ namespace EasyAbp.EShop.Products.Products
int orderMinQuantity) : base(id) int orderMinQuantity) : base(id)
{ {
SerializedAttributeOptionIds = serializedAttributeOptionIds; SerializedAttributeOptionIds = serializedAttributeOptionIds;
Currency = currency;
OriginalPrice = originalPrice; OriginalPrice = originalPrice;
Price = price; Price = price;
Inventory = inventory; Inventory = inventory;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment