diff --git a/common.props b/common.props index 29d59ab9..a0998084 100644 --- a/common.props +++ b/common.props @@ -1,7 +1,7 @@ latest - 0.4.1 + 0.4.2 $(NoWarn);CS1591 true EasyAbp Team diff --git a/modules/EasyAbp.EShop.Orders/src/EasyAbp.EShop.Orders.Domain.Shared/EasyAbp.EShop.Orders.Domain.Shared.csproj b/modules/EasyAbp.EShop.Orders/src/EasyAbp.EShop.Orders.Domain.Shared/EasyAbp.EShop.Orders.Domain.Shared.csproj index a13f1c5a..c853b56f 100644 --- a/modules/EasyAbp.EShop.Orders/src/EasyAbp.EShop.Orders.Domain.Shared/EasyAbp.EShop.Orders.Domain.Shared.csproj +++ b/modules/EasyAbp.EShop.Orders/src/EasyAbp.EShop.Orders.Domain.Shared/EasyAbp.EShop.Orders.Domain.Shared.csproj @@ -9,6 +9,7 @@ + diff --git a/modules/EasyAbp.EShop.Orders/src/EasyAbp.EShop.Orders.Domain.Shared/EasyAbp/EShop/Orders/EShopOrdersDomainSharedModule.cs b/modules/EasyAbp.EShop.Orders/src/EasyAbp.EShop.Orders.Domain.Shared/EasyAbp/EShop/Orders/EShopOrdersDomainSharedModule.cs index 9b405506..ca015ab3 100644 --- a/modules/EasyAbp.EShop.Orders/src/EasyAbp.EShop.Orders.Domain.Shared/EasyAbp/EShop/Orders/EShopOrdersDomainSharedModule.cs +++ b/modules/EasyAbp.EShop.Orders/src/EasyAbp.EShop.Orders.Domain.Shared/EasyAbp/EShop/Orders/EShopOrdersDomainSharedModule.cs @@ -1,6 +1,7 @@ using Volo.Abp.Modularity; using Volo.Abp.Localization; using EasyAbp.EShop.Orders.Localization; +using EasyAbp.EShop.Stores; using Volo.Abp.Localization.ExceptionHandling; using Volo.Abp.Validation; using Volo.Abp.Validation.Localization; @@ -9,7 +10,8 @@ using Volo.Abp.VirtualFileSystem; namespace EasyAbp.EShop.Orders { [DependsOn( - typeof(AbpValidationModule) + typeof(AbpValidationModule), + typeof(EShopStoresDomainSharedModule) )] public class EShopOrdersDomainSharedModule : AbpModule { diff --git a/modules/EasyAbp.EShop.Orders/src/EasyAbp.EShop.Orders.Domain.Shared/EasyAbp/EShop/Orders/Orders/IOrder.cs b/modules/EasyAbp.EShop.Orders/src/EasyAbp.EShop.Orders.Domain.Shared/EasyAbp/EShop/Orders/Orders/IOrder.cs new file mode 100644 index 00000000..65eb25ab --- /dev/null +++ b/modules/EasyAbp.EShop.Orders/src/EasyAbp.EShop.Orders.Domain.Shared/EasyAbp/EShop/Orders/Orders/IOrder.cs @@ -0,0 +1,40 @@ +using System; +using EasyAbp.EShop.Stores.Stores; + +namespace EasyAbp.EShop.Orders.Orders +{ + public interface IOrder : IMultiStore + { + string OrderNumber { get; } + + Guid CustomerUserId { get; } + + OrderStatus OrderStatus { get; } + + string Currency { get; } + + decimal ProductTotalPrice { get; } + + decimal TotalDiscount { get; } + + decimal TotalPrice { get; } + + decimal RefundedAmount { get; } + + string CustomerRemark { get; } + + string StaffRemark { get; } + + Guid? PaymentId { get; } + + DateTime? PaidTime { get; } + + DateTime? CompletionTime { get; } + + DateTime? CanceledTime { get; } + + DateTime? ReducedInventoryAfterPlacingTime { get; } + + DateTime? ReducedInventoryAfterPaymentTime { get; } + } +} \ No newline at end of file diff --git a/modules/EasyAbp.EShop.Orders/src/EasyAbp.EShop.Orders.Domain.Shared/EasyAbp/EShop/Orders/Orders/IOrderLine.cs b/modules/EasyAbp.EShop.Orders/src/EasyAbp.EShop.Orders.Domain.Shared/EasyAbp/EShop/Orders/Orders/IOrderLine.cs new file mode 100644 index 00000000..aed574ea --- /dev/null +++ b/modules/EasyAbp.EShop.Orders/src/EasyAbp.EShop.Orders.Domain.Shared/EasyAbp/EShop/Orders/Orders/IOrderLine.cs @@ -0,0 +1,31 @@ +using System; + +namespace EasyAbp.EShop.Orders.Orders +{ + public interface IOrderLine + { + Guid ProductId { get; } + + Guid ProductSkuId { get; } + + DateTime ProductModificationTime { get; } + + DateTime ProductDetailModificationTime { get; } + + string ProductName { get; } + + string SkuDescription { get; } + + string MediaResources { get; } + + string Currency { get; } + + decimal UnitPrice { get; } + + decimal TotalPrice { get; } + + decimal TotalDiscount { get; } + + int Quantity { get; } + } +} \ No newline at end of file diff --git a/modules/EasyAbp.EShop.Orders/src/EasyAbp.EShop.Orders.Domain.Shared/EasyAbp/EShop/Orders/Orders/OrderEto.cs b/modules/EasyAbp.EShop.Orders/src/EasyAbp.EShop.Orders.Domain.Shared/EasyAbp/EShop/Orders/Orders/OrderEto.cs index a44ba274..f5a7d231 100644 --- a/modules/EasyAbp.EShop.Orders/src/EasyAbp.EShop.Orders.Domain.Shared/EasyAbp/EShop/Orders/Orders/OrderEto.cs +++ b/modules/EasyAbp.EShop.Orders/src/EasyAbp.EShop.Orders.Domain.Shared/EasyAbp/EShop/Orders/Orders/OrderEto.cs @@ -1,10 +1,11 @@ using System; using System.Collections.Generic; +using Volo.Abp.MultiTenancy; namespace EasyAbp.EShop.Orders.Orders { [Serializable] - public class OrderEto + public class OrderEto : IOrder, IMultiTenant { public Guid Id { get; set; } @@ -31,12 +32,18 @@ namespace EasyAbp.EShop.Orders.Orders public string CustomerRemark { get; set; } public string StaffRemark { get; set; } + + public Guid? PaymentId { get; } public DateTime? PaidTime { get; set; } public DateTime? CompletionTime { get; set; } public DateTime? CanceledTime { get; set; } + + public DateTime? ReducedInventoryAfterPlacingTime { get; } + + public DateTime? ReducedInventoryAfterPaymentTime { get; } public List OrderLines { get; set; } } diff --git a/modules/EasyAbp.EShop.Orders/src/EasyAbp.EShop.Orders.Domain.Shared/EasyAbp/EShop/Orders/Orders/OrderLineEto.cs b/modules/EasyAbp.EShop.Orders/src/EasyAbp.EShop.Orders.Domain.Shared/EasyAbp/EShop/Orders/Orders/OrderLineEto.cs index 0a51c563..867ff334 100644 --- a/modules/EasyAbp.EShop.Orders/src/EasyAbp.EShop.Orders.Domain.Shared/EasyAbp/EShop/Orders/Orders/OrderLineEto.cs +++ b/modules/EasyAbp.EShop.Orders/src/EasyAbp.EShop.Orders.Domain.Shared/EasyAbp/EShop/Orders/Orders/OrderLineEto.cs @@ -3,7 +3,7 @@ namespace EasyAbp.EShop.Orders.Orders { [Serializable] - public class OrderLineEto + public class OrderLineEto : IOrderLine { public Guid Id { get; set; } diff --git a/modules/EasyAbp.EShop.Orders/src/EasyAbp.EShop.Orders.Domain/EasyAbp.EShop.Orders.Domain.csproj b/modules/EasyAbp.EShop.Orders/src/EasyAbp.EShop.Orders.Domain/EasyAbp.EShop.Orders.Domain.csproj index c3dd8971..d3963226 100644 --- a/modules/EasyAbp.EShop.Orders/src/EasyAbp.EShop.Orders.Domain/EasyAbp.EShop.Orders.Domain.csproj +++ b/modules/EasyAbp.EShop.Orders/src/EasyAbp.EShop.Orders.Domain/EasyAbp.EShop.Orders.Domain.csproj @@ -13,7 +13,6 @@ - diff --git a/modules/EasyAbp.EShop.Orders/src/EasyAbp.EShop.Orders.Domain/EasyAbp/EShop/Orders/EShopOrdersDomainModule.cs b/modules/EasyAbp.EShop.Orders/src/EasyAbp.EShop.Orders.Domain/EasyAbp/EShop/Orders/EShopOrdersDomainModule.cs index 39536a17..e1ef593c 100644 --- a/modules/EasyAbp.EShop.Orders/src/EasyAbp.EShop.Orders.Domain/EasyAbp/EShop/Orders/EShopOrdersDomainModule.cs +++ b/modules/EasyAbp.EShop.Orders/src/EasyAbp.EShop.Orders.Domain/EasyAbp/EShop/Orders/EShopOrdersDomainModule.cs @@ -10,9 +10,8 @@ namespace EasyAbp.EShop.Orders { [DependsOn( typeof(AbpAutoMapperModule), - typeof(EShopOrdersDomainSharedModule), - typeof(EShopStoresDomainSharedModule) - )] + typeof(EShopOrdersDomainSharedModule) + )] public class EShopOrdersDomainModule : AbpModule { public override void ConfigureServices(ServiceConfigurationContext context) diff --git a/modules/EasyAbp.EShop.Orders/src/EasyAbp.EShop.Orders.Domain/EasyAbp/EShop/Orders/Orders/Order.cs b/modules/EasyAbp.EShop.Orders/src/EasyAbp.EShop.Orders.Domain/EasyAbp/EShop/Orders/Orders/Order.cs index cbde4c2c..53dca4cf 100644 --- a/modules/EasyAbp.EShop.Orders/src/EasyAbp.EShop.Orders.Domain/EasyAbp/EShop/Orders/Orders/Order.cs +++ b/modules/EasyAbp.EShop.Orders/src/EasyAbp.EShop.Orders.Domain/EasyAbp/EShop/Orders/Orders/Order.cs @@ -1,13 +1,12 @@ using System; using System.Collections.Generic; -using EasyAbp.EShop.Stores.Stores; using JetBrains.Annotations; using Volo.Abp.Domain.Entities.Auditing; using Volo.Abp.MultiTenancy; namespace EasyAbp.EShop.Orders.Orders { - public class Order : FullAuditedAggregateRoot, IMultiTenant, IMultiStore + public class Order : FullAuditedAggregateRoot, IOrder, IMultiTenant { public virtual Guid? TenantId { get; protected set; } diff --git a/modules/EasyAbp.EShop.Orders/src/EasyAbp.EShop.Orders.Domain/EasyAbp/EShop/Orders/Orders/OrderLine.cs b/modules/EasyAbp.EShop.Orders/src/EasyAbp.EShop.Orders.Domain/EasyAbp/EShop/Orders/Orders/OrderLine.cs index 0eb0ab60..c68f3f29 100644 --- a/modules/EasyAbp.EShop.Orders/src/EasyAbp.EShop.Orders.Domain/EasyAbp/EShop/Orders/Orders/OrderLine.cs +++ b/modules/EasyAbp.EShop.Orders/src/EasyAbp.EShop.Orders.Domain/EasyAbp/EShop/Orders/Orders/OrderLine.cs @@ -4,7 +4,7 @@ using Volo.Abp.Domain.Entities.Auditing; namespace EasyAbp.EShop.Orders.Orders { - public class OrderLine : FullAuditedEntity + public class OrderLine : FullAuditedEntity, IOrderLine { public virtual Guid ProductId { get; protected set; }