mirror of https://github.com/EasyAbp/EShop.git
gdlcf88
3 years ago
121 changed files with 14099 additions and 643 deletions
@ -0,0 +1,16 @@ |
|||
using System; |
|||
|
|||
namespace EasyAbp.EShop.Orders.Orders.Dtos; |
|||
|
|||
public class OrderDiscountDto |
|||
{ |
|||
public Guid OrderLineId { get; set; } |
|||
|
|||
public string Name { get; set; } |
|||
|
|||
public string Key { get; set; } |
|||
|
|||
public string DisplayName { get; set; } |
|||
|
|||
public decimal DiscountedAmount { get; set; } |
|||
} |
|||
@ -1,15 +0,0 @@ |
|||
using System; |
|||
using System.Collections.Generic; |
|||
using System.Threading.Tasks; |
|||
using EasyAbp.EShop.Orders.Orders.Dtos; |
|||
using EasyAbp.EShop.Products.ProductDetails.Dtos; |
|||
using EasyAbp.EShop.Products.Products.Dtos; |
|||
|
|||
namespace EasyAbp.EShop.Orders.Orders |
|||
{ |
|||
public interface INewOrderGenerator |
|||
{ |
|||
Task<Order> GenerateAsync(Guid customerUserId, CreateOrderDto input, Dictionary<Guid, ProductDto> productDict, |
|||
Dictionary<Guid, ProductDetailDto> productDetailDict); |
|||
} |
|||
} |
|||
@ -1,12 +0,0 @@ |
|||
using System.Threading.Tasks; |
|||
using EasyAbp.EShop.Orders.Orders.Dtos; |
|||
using EasyAbp.EShop.Products.Products.Dtos; |
|||
using NodaMoney; |
|||
|
|||
namespace EasyAbp.EShop.Orders.Orders; |
|||
|
|||
public interface IOrderLinePriceOverrider |
|||
{ |
|||
Task<Money?> GetUnitPriceOrNullAsync(CreateOrderDto input, CreateOrderLineDto inputOrderLine, ProductDto product, |
|||
ProductSkuDto productSku, Currency effectiveCurrency); |
|||
} |
|||
@ -1,13 +1,12 @@ |
|||
using System; |
|||
using System.Collections.Generic; |
|||
using EasyAbp.EShop.Orders.Orders.Dtos; |
|||
using EasyAbp.EShop.Products.Products.Dtos; |
|||
|
|||
namespace EasyAbp.EShop.Orders.Orders |
|||
{ |
|||
public class OrderCreationResource |
|||
{ |
|||
public CreateOrderDto Input { get; set; } |
|||
public ICreateOrderInfo Input { get; set; } |
|||
|
|||
public Dictionary<Guid, ProductDto> ProductDictionary { get; set; } |
|||
} |
|||
|
|||
@ -0,0 +1,27 @@ |
|||
using System; |
|||
using System.Collections.Generic; |
|||
using Volo.Abp.ObjectExtending; |
|||
|
|||
namespace EasyAbp.EShop.Orders.Orders; |
|||
|
|||
[Serializable] |
|||
public class CreateOrderInfoModel : ExtensibleObject, ICreateOrderInfo |
|||
{ |
|||
public Guid StoreId { get; set; } |
|||
|
|||
public string CustomerRemark { get; set; } |
|||
|
|||
IEnumerable<ICreateOrderLineInfo> ICreateOrderInfo.OrderLines => OrderLines; |
|||
public List<CreateOrderLineInfoModel> OrderLines { get; set; } |
|||
|
|||
public CreateOrderInfoModel() |
|||
{ |
|||
} |
|||
|
|||
public CreateOrderInfoModel(Guid storeId, string customerRemark, List<CreateOrderLineInfoModel> orderLines) |
|||
{ |
|||
StoreId = storeId; |
|||
CustomerRemark = customerRemark; |
|||
OrderLines = orderLines; |
|||
} |
|||
} |
|||
@ -0,0 +1,25 @@ |
|||
using System; |
|||
using Volo.Abp.ObjectExtending; |
|||
|
|||
namespace EasyAbp.EShop.Orders.Orders; |
|||
|
|||
[Serializable] |
|||
public class CreateOrderLineInfoModel : ExtensibleObject, ICreateOrderLineInfo |
|||
{ |
|||
public Guid ProductId { get; set; } |
|||
|
|||
public Guid ProductSkuId { get; set; } |
|||
|
|||
public int Quantity { get; set; } |
|||
|
|||
public CreateOrderLineInfoModel() |
|||
{ |
|||
} |
|||
|
|||
public CreateOrderLineInfoModel(Guid productId, Guid productSkuId, int quantity) |
|||
{ |
|||
ProductId = productId; |
|||
ProductSkuId = productSkuId; |
|||
Quantity = quantity; |
|||
} |
|||
} |
|||
@ -0,0 +1,12 @@ |
|||
using System.Collections.Generic; |
|||
using EasyAbp.EShop.Stores.Stores; |
|||
using Volo.Abp.Data; |
|||
|
|||
namespace EasyAbp.EShop.Orders.Orders; |
|||
|
|||
public interface ICreateOrderInfo : IMultiStore, IHasExtraProperties |
|||
{ |
|||
string CustomerRemark { get; } |
|||
|
|||
IEnumerable<ICreateOrderLineInfo> OrderLines { get; } |
|||
} |
|||
@ -0,0 +1,13 @@ |
|||
using System; |
|||
using Volo.Abp.Data; |
|||
|
|||
namespace EasyAbp.EShop.Orders.Orders; |
|||
|
|||
public interface ICreateOrderLineInfo : IHasExtraProperties |
|||
{ |
|||
Guid ProductId { get; } |
|||
|
|||
Guid ProductSkuId { get; } |
|||
|
|||
int Quantity { get; } |
|||
} |
|||
@ -1,50 +1,63 @@ |
|||
using System; |
|||
using System.Collections.Generic; |
|||
using EasyAbp.EShop.Stores.Stores; |
|||
using JetBrains.Annotations; |
|||
using Volo.Abp.Data; |
|||
|
|||
namespace EasyAbp.EShop.Orders.Orders |
|||
{ |
|||
public interface IOrder : IMultiStore, IHasExtraProperties |
|||
{ |
|||
Guid Id { get; } |
|||
|
|||
[NotNull] |
|||
string OrderNumber { get; } |
|||
|
|||
|
|||
Guid CustomerUserId { get; } |
|||
|
|||
|
|||
OrderStatus OrderStatus { get; } |
|||
|
|||
[NotNull] |
|||
string Currency { get; } |
|||
|
|||
|
|||
decimal ProductTotalPrice { get; } |
|||
|
|||
|
|||
decimal TotalDiscount { get; } |
|||
|
|||
|
|||
decimal TotalPrice { get; } |
|||
|
|||
|
|||
/// <summary>
|
|||
/// ActualTotalPrice = TotalPrice - TotalDiscount
|
|||
/// </summary>
|
|||
decimal ActualTotalPrice { get; } |
|||
|
|||
decimal RefundAmount { get; } |
|||
|
|||
|
|||
[CanBeNull] |
|||
string CustomerRemark { get; } |
|||
|
|||
|
|||
[CanBeNull] |
|||
string StaffRemark { get; } |
|||
|
|||
|
|||
Guid? PaymentId { get; } |
|||
|
|||
|
|||
DateTime? PaidTime { get; } |
|||
|
|||
|
|||
DateTime? CompletionTime { get; } |
|||
|
|||
|
|||
DateTime? CanceledTime { get; } |
|||
|
|||
|
|||
[CanBeNull] |
|||
string CancellationReason { get; } |
|||
|
|||
|
|||
DateTime? ReducedInventoryAfterPlacingTime { get; } |
|||
|
|||
|
|||
DateTime? ReducedInventoryAfterPaymentTime { get; } |
|||
|
|||
|
|||
DateTime? PaymentExpiration { get; } |
|||
|
|||
IEnumerable<IOrderLine> OrderLines { get; } |
|||
|
|||
IEnumerable<IOrderExtraFee> OrderExtraFees { get; } |
|||
} |
|||
} |
|||
@ -0,0 +1,23 @@ |
|||
using System; |
|||
using JetBrains.Annotations; |
|||
|
|||
namespace EasyAbp.EShop.Orders.Orders |
|||
{ |
|||
public interface IOrderExtraFee |
|||
{ |
|||
Guid OrderId { get; } |
|||
|
|||
[NotNull] |
|||
string Name { get; } |
|||
|
|||
[CanBeNull] |
|||
string Key { get; } |
|||
|
|||
[CanBeNull] |
|||
string DisplayName { get; } |
|||
|
|||
decimal Fee { get; } |
|||
|
|||
decimal RefundAmount { get; } |
|||
} |
|||
} |
|||
@ -0,0 +1,20 @@ |
|||
using System; |
|||
|
|||
namespace EasyAbp.EShop.Orders.Orders |
|||
{ |
|||
[Serializable] |
|||
public class OrderExtraFeeEto : IOrderExtraFee |
|||
{ |
|||
public Guid OrderId { get; set; } |
|||
|
|||
public string Name { get; set; } |
|||
|
|||
public string Key { get; set; } |
|||
|
|||
public string DisplayName { get; set; } |
|||
|
|||
public decimal Fee { get; set; } |
|||
|
|||
public decimal RefundAmount { get; set; } |
|||
} |
|||
} |
|||
@ -0,0 +1,16 @@ |
|||
using System; |
|||
using Volo.Abp; |
|||
|
|||
namespace EasyAbp.EShop.Orders.Orders |
|||
{ |
|||
public class DuplicateOrderDiscountException : BusinessException |
|||
{ |
|||
public DuplicateOrderDiscountException(Guid orderLineId, string discountName, string discountKey) : base( |
|||
OrdersErrorCodes.DuplicateOrderDiscount) |
|||
{ |
|||
WithData(nameof(orderLineId), orderLineId); |
|||
WithData(nameof(discountName), discountName); |
|||
WithData(nameof(discountKey), discountKey); |
|||
} |
|||
} |
|||
} |
|||
@ -0,0 +1,13 @@ |
|||
using System; |
|||
using System.Collections.Generic; |
|||
using System.Threading.Tasks; |
|||
using EasyAbp.EShop.Products.Products; |
|||
|
|||
namespace EasyAbp.EShop.Orders.Orders |
|||
{ |
|||
public interface INewOrderGenerator |
|||
{ |
|||
Task<Order> GenerateAsync(Guid customerUserId, ICreateOrderInfo input, Dictionary<Guid, IProduct> productDict, |
|||
Dictionary<Guid, DateTime> productDetailModificationTimeDict); |
|||
} |
|||
} |
|||
@ -1,12 +1,12 @@ |
|||
using System; |
|||
using System.Collections.Generic; |
|||
using System.Threading.Tasks; |
|||
using EasyAbp.EShop.Products.Products.Dtos; |
|||
using EasyAbp.EShop.Products.Products; |
|||
|
|||
namespace EasyAbp.EShop.Orders.Orders |
|||
{ |
|||
public interface IOrderDiscountProvider |
|||
{ |
|||
Task<Order> DiscountAsync(Order order, Dictionary<Guid, ProductDto> productDict); |
|||
Task<List<OrderDiscountInfoModel>> GetAllAsync(Order order, Dictionary<Guid, IProduct> productDict); |
|||
} |
|||
} |
|||
@ -1,15 +1,14 @@ |
|||
using System; |
|||
using System.Collections.Generic; |
|||
using System.Threading.Tasks; |
|||
using EasyAbp.EShop.Orders.Orders.Dtos; |
|||
using EasyAbp.EShop.Products.Products.Dtos; |
|||
using EasyAbp.EShop.Products.Products; |
|||
using NodaMoney; |
|||
|
|||
namespace EasyAbp.EShop.Orders.Orders |
|||
{ |
|||
public interface IOrderExtraFeeProvider |
|||
{ |
|||
Task<List<OrderExtraFeeInfoModel>> GetListAsync(Guid customerUserId, CreateOrderDto input, |
|||
Dictionary<Guid, ProductDto> productDict, Currency effectiveCurrency); |
|||
Task<List<OrderExtraFeeInfoModel>> GetListAsync(Guid customerUserId, ICreateOrderInfo input, |
|||
Dictionary<Guid, IProduct> productDict, Currency effectiveCurrency); |
|||
} |
|||
} |
|||
@ -0,0 +1,11 @@ |
|||
using System.Threading.Tasks; |
|||
using EasyAbp.EShop.Products.Products; |
|||
using NodaMoney; |
|||
|
|||
namespace EasyAbp.EShop.Orders.Orders; |
|||
|
|||
public interface IOrderLinePriceOverrider |
|||
{ |
|||
Task<Money?> GetUnitPriceOrNullAsync(ICreateOrderInfo input, ICreateOrderLineInfo inputOrderLine, |
|||
IProduct product, IProductSku productSku, Currency effectiveCurrency); |
|||
} |
|||
@ -0,0 +1,48 @@ |
|||
using System; |
|||
using JetBrains.Annotations; |
|||
using Volo.Abp.Domain.Entities; |
|||
|
|||
namespace EasyAbp.EShop.Orders.Orders; |
|||
|
|||
public class OrderDiscount : Entity |
|||
{ |
|||
public virtual Guid OrderId { get; protected set; } |
|||
|
|||
public virtual Guid OrderLineId { get; protected set; } |
|||
|
|||
[NotNull] |
|||
public virtual string Name { get; protected set; } |
|||
|
|||
[CanBeNull] |
|||
public virtual string Key { get; protected set; } |
|||
|
|||
[CanBeNull] |
|||
public virtual string DisplayName { get; protected set; } |
|||
|
|||
public virtual decimal DiscountedAmount { get; protected set; } |
|||
|
|||
protected OrderDiscount() |
|||
{ |
|||
} |
|||
|
|||
public OrderDiscount( |
|||
Guid orderId, |
|||
Guid orderLineId, |
|||
[NotNull] string name, |
|||
[CanBeNull] string key, |
|||
[CanBeNull] string displayName, |
|||
decimal discountedAmount) |
|||
{ |
|||
OrderId = orderId; |
|||
OrderLineId = orderLineId; |
|||
Name = name; |
|||
Key = key; |
|||
DisplayName = displayName; |
|||
DiscountedAmount = discountedAmount; |
|||
} |
|||
|
|||
public override object[] GetKeys() |
|||
{ |
|||
return new object[] { OrderId, OrderLineId, Name, Key }; |
|||
} |
|||
} |
|||
@ -0,0 +1,34 @@ |
|||
using System; |
|||
using JetBrains.Annotations; |
|||
|
|||
namespace EasyAbp.EShop.Orders.Orders; |
|||
|
|||
public class OrderDiscountInfoModel |
|||
{ |
|||
public Guid OrderLineId { get; set; } |
|||
|
|||
[NotNull] |
|||
public string Name { get; set; } |
|||
|
|||
[CanBeNull] |
|||
public string Key { get; set; } |
|||
|
|||
[CanBeNull] |
|||
public string DisplayName { get; set; } |
|||
|
|||
public decimal DiscountedAmount { get; set; } |
|||
|
|||
public OrderDiscountInfoModel( |
|||
Guid orderLineId, |
|||
[NotNull] string name, |
|||
[CanBeNull] string key, |
|||
[CanBeNull] string displayName, |
|||
decimal discountedAmount) |
|||
{ |
|||
OrderLineId = orderLineId; |
|||
Name = name; |
|||
Key = key ?? string.Empty; |
|||
DisplayName = displayName; |
|||
DiscountedAmount = discountedAmount; |
|||
} |
|||
} |
|||
@ -0,0 +1,19 @@ |
|||
using System; |
|||
using System.Collections.Generic; |
|||
using System.Linq; |
|||
using System.Threading.Tasks; |
|||
using EasyAbp.EShop.Products.Products; |
|||
|
|||
namespace EasyAbp.EShop.Orders.Orders; |
|||
|
|||
public class DemoOrderDiscountProvider : IOrderDiscountProvider |
|||
{ |
|||
public Task<List<OrderDiscountInfoModel>> GetAllAsync(Order order, Dictionary<Guid, IProduct> productDict) |
|||
{ |
|||
return Task.FromResult(new List<OrderDiscountInfoModel> |
|||
{ |
|||
new(order.OrderLines.First().Id, "DemoDiscount1", "1", "Demo Discount 1", 0.01m), |
|||
new(order.OrderLines.First().Id, "DemoDiscount2", "2", "Demo Discount 2", 0.1m), |
|||
}); |
|||
} |
|||
} |
|||
@ -0,0 +1,65 @@ |
|||
using System; |
|||
using System.Collections.Generic; |
|||
using System.Linq; |
|||
using System.Threading.Tasks; |
|||
using EasyAbp.EShop.Products.Products; |
|||
using Microsoft.Extensions.DependencyInjection; |
|||
using Shouldly; |
|||
using Xunit; |
|||
|
|||
namespace EasyAbp.EShop.Orders.Orders; |
|||
|
|||
public class OrderDiscountTests : OrdersDomainTestBase |
|||
{ |
|||
protected override void AfterAddApplication(IServiceCollection services) |
|||
{ |
|||
services.AddTransient<IOrderDiscountProvider, DemoOrderDiscountProvider>(); |
|||
base.AfterAddApplication(services); |
|||
} |
|||
|
|||
[Fact] |
|||
public async Task Should_Create_Order_With_Discount() |
|||
{ |
|||
var orderGenerator = GetRequiredService<INewOrderGenerator>(); |
|||
|
|||
var createOrderInfoModel = new CreateOrderInfoModel(OrderTestData.Store1Id, null, |
|||
new List<CreateOrderLineInfoModel> |
|||
{ |
|||
new(OrderTestData.Product1Id, OrderTestData.ProductSku1Id, 2) |
|||
} |
|||
); |
|||
|
|||
var order = await orderGenerator.GenerateAsync(Guid.NewGuid(), createOrderInfoModel, |
|||
new Dictionary<Guid, IProduct> |
|||
{ |
|||
{ |
|||
OrderTestData.Product1Id, new ProductEto |
|||
{ |
|||
Id = OrderTestData.Product1Id, |
|||
ProductSkus = new List<ProductSkuEto> |
|||
{ |
|||
new() |
|||
{ |
|||
Id = OrderTestData.ProductSku1Id, |
|||
AttributeOptionIds = new List<Guid>(), |
|||
Price = 1m, |
|||
Currency = "USD", |
|||
OrderMinQuantity = 1, |
|||
OrderMaxQuantity = 100, |
|||
} |
|||
} |
|||
} |
|||
} |
|||
}, new Dictionary<Guid, DateTime>()); |
|||
|
|||
order.ActualTotalPrice.ShouldBe(1.89m); |
|||
order.TotalDiscount.ShouldBe(0.11m); |
|||
order.OrderDiscounts.Count.ShouldBe(2); |
|||
order.OrderDiscounts.ShouldContain(x => |
|||
x.OrderId == order.Id && x.OrderLineId == order.OrderLines.First().Id && x.Name == "DemoDiscount1" && |
|||
x.Key == "1" && x.DisplayName == "Demo Discount 1" && x.DiscountedAmount == 0.01m); |
|||
order.OrderDiscounts.ShouldContain(x => |
|||
x.OrderId == order.Id && x.OrderLineId == order.OrderLines.First().Id && x.Name == "DemoDiscount2" && |
|||
x.Key == "2" && x.DisplayName == "Demo Discount 2" && x.DiscountedAmount == 0.1m); |
|||
} |
|||
} |
|||
@ -0,0 +1,9 @@ |
|||
using System; |
|||
using System.Collections.Generic; |
|||
|
|||
namespace EasyAbp.EShop.Products.Products; |
|||
|
|||
public interface IHasAttributeOptionIds |
|||
{ |
|||
List<Guid> AttributeOptionIds { get; } |
|||
} |
|||
@ -0,0 +1,9 @@ |
|||
using JetBrains.Annotations; |
|||
|
|||
namespace EasyAbp.EShop.Products.Products; |
|||
|
|||
public interface IHasProductGroupDisplayName |
|||
{ |
|||
[NotNull] |
|||
string ProductGroupDisplayName { get; } |
|||
} |
|||
@ -1,34 +1,11 @@ |
|||
using System; |
|||
using EasyAbp.EShop.Stores.Stores; |
|||
using JetBrains.Annotations; |
|||
using Volo.Abp.Data; |
|||
using System.Collections.Generic; |
|||
|
|||
namespace EasyAbp.EShop.Products.Products |
|||
{ |
|||
public interface IProduct : IHasExtraProperties, IMultiStore |
|||
public interface IProduct : IProductBase |
|||
{ |
|||
string ProductGroupName { get; } |
|||
IEnumerable<IProductAttribute> ProductAttributes { get; } |
|||
|
|||
Guid? ProductDetailId { get; } |
|||
|
|||
string UniqueName { get; } |
|||
|
|||
string DisplayName { get; } |
|||
|
|||
string Overview { get; } |
|||
|
|||
InventoryStrategy InventoryStrategy { get; } |
|||
|
|||
[CanBeNull] string InventoryProviderName { get; } |
|||
|
|||
string MediaResources { get; } |
|||
|
|||
int DisplayOrder { get; } |
|||
|
|||
bool IsPublished { get; } |
|||
|
|||
bool IsStatic { get; } |
|||
|
|||
bool IsHidden { get; } |
|||
IEnumerable<IProductSku> ProductSkus { get; } |
|||
} |
|||
} |
|||
@ -1,13 +1,22 @@ |
|||
using Volo.Abp.Data; |
|||
using System; |
|||
using System.Collections.Generic; |
|||
using JetBrains.Annotations; |
|||
using Volo.Abp.Data; |
|||
|
|||
namespace EasyAbp.EShop.Products.Products |
|||
{ |
|||
public interface IProductAttribute : IHasExtraProperties |
|||
{ |
|||
Guid Id { get; } |
|||
|
|||
[NotNull] |
|||
string DisplayName { get; } |
|||
|
|||
|
|||
[CanBeNull] |
|||
string Description { get; } |
|||
|
|||
|
|||
int DisplayOrder { get; } |
|||
|
|||
IEnumerable<IProductAttributeOption> ProductAttributeOptions { get; } |
|||
} |
|||
} |
|||
@ -1,13 +1,19 @@ |
|||
using Volo.Abp.Data; |
|||
using System; |
|||
using JetBrains.Annotations; |
|||
using Volo.Abp.Data; |
|||
|
|||
namespace EasyAbp.EShop.Products.Products |
|||
{ |
|||
public interface IProductAttributeOption : IHasExtraProperties |
|||
{ |
|||
Guid Id { get; } |
|||
|
|||
[NotNull] |
|||
string DisplayName { get; } |
|||
|
|||
|
|||
[CanBeNull] |
|||
string Description { get; } |
|||
|
|||
|
|||
int DisplayOrder { get; } |
|||
} |
|||
} |
|||
@ -0,0 +1,47 @@ |
|||
using System; |
|||
using EasyAbp.EShop.Stores.Stores; |
|||
using JetBrains.Annotations; |
|||
using Volo.Abp.Data; |
|||
|
|||
namespace EasyAbp.EShop.Products.Products |
|||
{ |
|||
public interface IProductBase : IHasExtraProperties, IMultiStore |
|||
{ |
|||
Guid Id { get; } |
|||
|
|||
[NotNull] |
|||
string ProductGroupName { get; } |
|||
|
|||
Guid? ProductDetailId { get; } |
|||
|
|||
[CanBeNull] |
|||
string UniqueName { get; } |
|||
|
|||
[NotNull] |
|||
string DisplayName { get; } |
|||
|
|||
/// <summary>
|
|||
/// Tell your customer what the product is. It is usually shown in the product list.
|
|||
/// </summary>
|
|||
[CanBeNull] |
|||
string Overview { get; } |
|||
|
|||
InventoryStrategy InventoryStrategy { get; } |
|||
|
|||
[CanBeNull] |
|||
string InventoryProviderName { get; } |
|||
|
|||
[CanBeNull] |
|||
string MediaResources { get; } |
|||
|
|||
int DisplayOrder { get; } |
|||
|
|||
bool IsPublished { get; } |
|||
|
|||
bool IsStatic { get; } |
|||
|
|||
bool IsHidden { get; } |
|||
|
|||
TimeSpan? PaymentExpireIn { get; } |
|||
} |
|||
} |
|||
@ -1,26 +1,32 @@ |
|||
using System; |
|||
using JetBrains.Annotations; |
|||
using Volo.Abp.Data; |
|||
|
|||
namespace EasyAbp.EShop.Products.Products |
|||
{ |
|||
public interface IProductSku : IHasExtraProperties |
|||
public interface IProductSku : IHasAttributeOptionIds, IHasExtraProperties |
|||
{ |
|||
string SerializedAttributeOptionIds { get; } |
|||
|
|||
Guid Id { get; } |
|||
|
|||
[CanBeNull] |
|||
string Name { get; } |
|||
|
|||
|
|||
[NotNull] |
|||
string Currency { get; } |
|||
|
|||
|
|||
decimal? OriginalPrice { get; } |
|||
|
|||
|
|||
decimal Price { get; } |
|||
|
|||
int OrderMinQuantity { get; } |
|||
|
|||
|
|||
int OrderMaxQuantity { get; } |
|||
|
|||
|
|||
TimeSpan? PaymentExpireIn { get; } |
|||
|
|||
[CanBeNull] |
|||
string MediaResources { get; } |
|||
|
|||
|
|||
Guid? ProductDetailId { get; } |
|||
} |
|||
} |
|||
@ -1,10 +1,9 @@ |
|||
using System.Threading.Tasks; |
|||
using EasyAbp.EShop.Products.Products.Dtos; |
|||
|
|||
namespace EasyAbp.EShop.Products.Products |
|||
{ |
|||
public interface IProductSkuDescriptionProvider |
|||
{ |
|||
Task<string> GenerateAsync(ProductDto productDto, ProductSkuDto productSkuDto); |
|||
Task<string> GenerateAsync(IProduct product, IProductSku productSku); |
|||
} |
|||
} |
|||
@ -0,0 +1,24 @@ |
|||
using System; |
|||
using System.Linq; |
|||
|
|||
namespace EasyAbp.EShop.Products.Products; |
|||
|
|||
public static class ProductExtensions |
|||
{ |
|||
public static IProductSku GetSkuById(this IProduct product, Guid skuId) |
|||
{ |
|||
return product.ProductSkus.Single(x => x.Id == skuId); |
|||
} |
|||
|
|||
public static IProductSku FindSkuById(this IProduct product, Guid skuId) |
|||
{ |
|||
return product.ProductSkus.FirstOrDefault(x => x.Id == skuId); |
|||
} |
|||
|
|||
public static TimeSpan? GetSkuPaymentExpireIn(this IProduct product, Guid skuId) |
|||
{ |
|||
var sku = product.GetSkuById(skuId); |
|||
|
|||
return sku.PaymentExpireIn ?? product.PaymentExpireIn; |
|||
} |
|||
} |
|||
@ -1,7 +0,0 @@ |
|||
namespace EasyAbp.EShop.Products.Options.ProductGroups |
|||
{ |
|||
public interface IProductGroup |
|||
{ |
|||
|
|||
} |
|||
} |
|||
@ -1,39 +0,0 @@ |
|||
using System; |
|||
using System.Collections.Generic; |
|||
using System.Linq; |
|||
using System.Threading.Tasks; |
|||
using Volo.Abp.DependencyInjection; |
|||
using Volo.Abp.Json; |
|||
|
|||
namespace EasyAbp.EShop.Products.Products |
|||
{ |
|||
public class AttributeOptionIdsSerializer : IAttributeOptionIdsSerializer, ITransientDependency |
|||
{ |
|||
private readonly IJsonSerializer _jsonSerializer; |
|||
|
|||
public AttributeOptionIdsSerializer(IJsonSerializer jsonSerializer) |
|||
{ |
|||
_jsonSerializer = jsonSerializer; |
|||
} |
|||
|
|||
public async Task<string> FormatAsync(string serializedAttributeOptionIds) |
|||
{ |
|||
return await SerializeAsync(await DeserializeAsync(serializedAttributeOptionIds)); |
|||
} |
|||
|
|||
public Task<string> SerializeAsync(IEnumerable<Guid> attributeOptionIds) |
|||
{ |
|||
if (attributeOptionIds == null) |
|||
{ |
|||
return Task.FromResult(string.Empty); |
|||
} |
|||
|
|||
return Task.FromResult(_jsonSerializer.Serialize(attributeOptionIds.OrderBy(x => x))); |
|||
} |
|||
|
|||
public Task<IEnumerable<Guid>> DeserializeAsync(string serializedAttributeOptionIds) |
|||
{ |
|||
return Task.FromResult(_jsonSerializer.Deserialize<IEnumerable<Guid>>(serializedAttributeOptionIds)); |
|||
} |
|||
} |
|||
} |
|||
@ -1,15 +0,0 @@ |
|||
using System; |
|||
using System.Collections.Generic; |
|||
using System.Threading.Tasks; |
|||
|
|||
namespace EasyAbp.EShop.Products.Products |
|||
{ |
|||
public interface IAttributeOptionIdsSerializer |
|||
{ |
|||
Task<string> FormatAsync(string serializedAttributeOptionIds); |
|||
|
|||
Task<string> SerializeAsync(IEnumerable<Guid> attributeOptionIds); |
|||
|
|||
Task<IEnumerable<Guid>> DeserializeAsync(string serializedAttributeOptionIds); |
|||
} |
|||
} |
|||
@ -0,0 +1,17 @@ |
|||
using System; |
|||
using System.Collections.Generic; |
|||
using System.Linq; |
|||
using Microsoft.EntityFrameworkCore.ChangeTracking; |
|||
|
|||
namespace EasyAbp.EShop.Products.EntityFrameworkCore.AttributeOptionIds; |
|||
|
|||
public class AttributeOptionIdsValueComparer : ValueComparer<List<Guid>> |
|||
{ |
|||
public AttributeOptionIdsValueComparer() |
|||
: base( |
|||
(d1, d2) => d1.SequenceEqual(d2), |
|||
d => d.Aggregate(0, (k, v) => HashCode.Combine(k, v.GetHashCode())), |
|||
d => new List<Guid>(d)) |
|||
{ |
|||
} |
|||
} |
|||
@ -0,0 +1,15 @@ |
|||
using System; |
|||
using System.Collections.Generic; |
|||
using System.Text.Json; |
|||
using Microsoft.EntityFrameworkCore.Storage.ValueConversion; |
|||
|
|||
namespace EasyAbp.EShop.Products.EntityFrameworkCore.AttributeOptionIds; |
|||
|
|||
public class AttributeOptionIdsValueConverter : ValueConverter<List<Guid>, string> |
|||
{ |
|||
public AttributeOptionIdsValueConverter() : base( |
|||
v => JsonSerializer.Serialize(v, (JsonSerializerOptions)null), |
|||
v => JsonSerializer.Deserialize<List<Guid>>(v, (JsonSerializerOptions)null)) |
|||
{ |
|||
} |
|||
} |
|||
@ -0,0 +1,20 @@ |
|||
using System; |
|||
using EasyAbp.EShop.Products.EntityFrameworkCore.AttributeOptionIds; |
|||
using EasyAbp.EShop.Products.Products; |
|||
using Microsoft.EntityFrameworkCore; |
|||
using Microsoft.EntityFrameworkCore.Metadata.Builders; |
|||
|
|||
namespace EasyAbp.EShop.Products.EntityFrameworkCore; |
|||
|
|||
public static class EShopProductsEntityTypeBuilderExtensions |
|||
{ |
|||
public static void TryConfigureAttributeOptionIds(this EntityTypeBuilder b) |
|||
{ |
|||
if (b.Metadata.ClrType.IsAssignableTo<IHasAttributeOptionIds>()) |
|||
{ |
|||
b.Property(nameof(IHasAttributeOptionIds.AttributeOptionIds)) |
|||
.HasConversion<AttributeOptionIdsValueConverter>() |
|||
.Metadata.SetValueComparer(new AttributeOptionIdsValueComparer()); |
|||
} |
|||
} |
|||
} |
|||
Some files were not shown because too many files changed in this diff
Loading…
Reference in new issue