mirror of https://github.com/EasyAbp/EShop.git
gdlcf88
4 years ago
16 changed files with 447 additions and 69 deletions
@ -0,0 +1,52 @@ |
|||
using System.Threading.Tasks; |
|||
using EasyAbp.EShop.Products.Products; |
|||
using EasyAbp.EShop.Products.Products.Dtos; |
|||
using Volo.Abp.DependencyInjection; |
|||
|
|||
namespace EasyAbp.EShop.Plugins.Baskets.BasketItems; |
|||
|
|||
public class BasicBasketItemProductInfoUpdater : IBasketItemProductInfoUpdater, ITransientDependency |
|||
{ |
|||
protected IProductSkuDescriptionProvider ProductSkuDescriptionProvider { get; } |
|||
|
|||
public BasicBasketItemProductInfoUpdater(IProductSkuDescriptionProvider productSkuDescriptionProvider) |
|||
{ |
|||
ProductSkuDescriptionProvider = productSkuDescriptionProvider; |
|||
} |
|||
|
|||
public virtual async Task UpdateProductDataAsync(int targetQuantity, IBasketItem item, ProductDto productDto) |
|||
{ |
|||
var productSkuDto = productDto.FindSkuById(item.ProductSkuId); |
|||
|
|||
if (productSkuDto == null) |
|||
{ |
|||
item.SetIsInvalid(true); |
|||
|
|||
return; |
|||
} |
|||
|
|||
item.UpdateProductData(targetQuantity, new ProductDataModel |
|||
{ |
|||
MediaResources = productSkuDto.MediaResources ?? productDto.MediaResources, |
|||
ProductUniqueName = productDto.UniqueName, |
|||
ProductDisplayName = productDto.DisplayName, |
|||
SkuName = productSkuDto.Name, |
|||
SkuDescription = await ProductSkuDescriptionProvider.GenerateAsync(productDto, productSkuDto), |
|||
Currency = productSkuDto.Currency, |
|||
UnitPrice = productSkuDto.DiscountedPrice, |
|||
TotalPrice = productSkuDto.DiscountedPrice * item.Quantity, |
|||
TotalDiscount = (productSkuDto.Price - productSkuDto.DiscountedPrice) * item.Quantity, |
|||
Inventory = productSkuDto.Inventory |
|||
}); |
|||
|
|||
if (productDto.InventoryStrategy != InventoryStrategy.NoNeed && targetQuantity > productSkuDto.Inventory) |
|||
{ |
|||
item.SetIsInvalid(true); |
|||
} |
|||
|
|||
if (!productDto.IsPublished) |
|||
{ |
|||
item.SetIsInvalid(true); |
|||
} |
|||
} |
|||
} |
|||
@ -0,0 +1,9 @@ |
|||
using System.Threading.Tasks; |
|||
using EasyAbp.EShop.Products.Products.Dtos; |
|||
|
|||
namespace EasyAbp.EShop.Plugins.Baskets.BasketItems; |
|||
|
|||
public interface IBasketItemProductInfoUpdater |
|||
{ |
|||
Task UpdateProductDataAsync(int targetQuantity, IBasketItem item, ProductDto productDto); |
|||
} |
|||
@ -1,12 +0,0 @@ |
|||
using EasyAbp.EShop.Products.ProductInventories; |
|||
using EasyAbp.EShop.Products.Products; |
|||
using Volo.Abp.Domain.Entities.Events.Distributed; |
|||
using Volo.Abp.EventBus.Distributed; |
|||
|
|||
namespace EasyAbp.EShop.Plugins.Baskets.BasketItems |
|||
{ |
|||
public interface IProductUpdateRecorder |
|||
{ |
|||
|
|||
} |
|||
} |
|||
@ -0,0 +1,6 @@ |
|||
namespace EasyAbp.EShop.Plugins.Baskets.ProductUpdates; |
|||
|
|||
public interface IProductUpdateRecorder |
|||
{ |
|||
|
|||
} |
|||
@ -0,0 +1,20 @@ |
|||
<Project Sdk="Microsoft.NET.Sdk"> |
|||
|
|||
<Import Project="..\..\..\..\common.props" /> |
|||
|
|||
<PropertyGroup> |
|||
<TargetFramework>net6.0</TargetFramework> |
|||
<RootNamespace /> |
|||
</PropertyGroup> |
|||
|
|||
<ItemGroup> |
|||
<ProjectReference Include="..\..\..\Baskets\src\EasyAbp.EShop.Plugins.Baskets.Application\EasyAbp.EShop.Plugins.Baskets.Application.csproj" /> |
|||
<ProjectReference Include="..\EasyAbp.EShop.Plugins.Booking.Application.Contracts\EasyAbp.EShop.Plugins.Booking.Application.Contracts.csproj" /> |
|||
</ItemGroup> |
|||
|
|||
<ItemGroup> |
|||
<PackageReference Include="Volo.Abp.Caching" Version="$(AbpVersion)" /> |
|||
<PackageReference Include="EasyAbp.BookingService.Application.Contracts" Version="$(EasyAbpBookingServiceModuleVersion)" /> |
|||
</ItemGroup> |
|||
|
|||
</Project> |
|||
@ -0,0 +1,121 @@ |
|||
using System; |
|||
using System.Collections.Generic; |
|||
using System.Linq; |
|||
using System.Threading.Tasks; |
|||
using EasyAbp.BookingService.AssetOccupancies; |
|||
using EasyAbp.BookingService.AssetOccupancies.Dtos; |
|||
using EasyAbp.EShop.Plugins.Baskets.BasketItems; |
|||
using EasyAbp.EShop.Plugins.Baskets.Booking.ObjectExtending; |
|||
using EasyAbp.EShop.Plugins.Booking.BookingProductGroupDefinitions; |
|||
using EasyAbp.EShop.Products.Products.Dtos; |
|||
using Microsoft.Extensions.Caching.Distributed; |
|||
using Volo.Abp.Caching; |
|||
using Volo.Abp.DependencyInjection; |
|||
using Volo.Abp.Users; |
|||
|
|||
namespace EasyAbp.EShop.Plugins.Baskets.Booking.BasketItems; |
|||
|
|||
public class BookingBasketItemProductInfoUpdater : IBasketItemProductInfoUpdater, ITransientDependency |
|||
{ |
|||
protected List<string> ProductGroupNames { get; set; } |
|||
protected bool? AllowedToUpdate { get; set; } |
|||
|
|||
protected ICurrentUser CurrentUser { get; } |
|||
protected IDistributedCache<BookingBasketItemUpdatedCacheItem> Cache { get; } |
|||
protected IAssetOccupancyAppService AssetOccupancyAppService { get; } |
|||
protected IBookingProductGroupDefinitionAppService DefinitionAppService { get; } |
|||
|
|||
public BookingBasketItemProductInfoUpdater( |
|||
ICurrentUser currentUser, |
|||
IDistributedCache<BookingBasketItemUpdatedCacheItem> cache, |
|||
IAssetOccupancyAppService assetOccupancyAppService, |
|||
IBookingProductGroupDefinitionAppService definitionAppService) |
|||
{ |
|||
CurrentUser = currentUser; |
|||
Cache = cache; |
|||
AssetOccupancyAppService = assetOccupancyAppService; |
|||
DefinitionAppService = definitionAppService; |
|||
} |
|||
|
|||
public virtual async Task UpdateProductDataAsync(int targetQuantity, IBasketItem item, ProductDto productDto) |
|||
{ |
|||
if (!await IsAllowedToUpdateAsync(item, productDto) || |
|||
!await IsBookingProductGroupAsync(productDto.ProductGroupName)) |
|||
{ |
|||
return; |
|||
} |
|||
|
|||
var assetId = item.FindBookingAssetId(); |
|||
var assetCategoryId = item.FindBookingAssetCategoryId(); |
|||
|
|||
if (assetId is not null) |
|||
{ |
|||
try |
|||
{ |
|||
await AssetOccupancyAppService.CheckCreateAsync(new CreateAssetOccupancyDto |
|||
{ |
|||
AssetId = assetId.Value, |
|||
Volume = item.GetBookingVolume(), |
|||
Date = item.GetBookingDate(), |
|||
StartingTime = item.GetBookingStartingTime(), |
|||
Duration = item.GetBookingDuration() |
|||
}); |
|||
} |
|||
catch |
|||
{ |
|||
item.SetIsInvalid(true); |
|||
} |
|||
} |
|||
else |
|||
{ |
|||
try |
|||
{ |
|||
await AssetOccupancyAppService.CheckCreateByCategoryIdAsync(new CreateAssetOccupancyByCategoryIdDto |
|||
{ |
|||
AssetCategoryId = assetCategoryId!.Value, |
|||
Volume = item.GetBookingVolume(), |
|||
Date = item.GetBookingDate(), |
|||
StartingTime = item.GetBookingStartingTime(), |
|||
Duration = item.GetBookingDuration() |
|||
}); |
|||
} |
|||
catch |
|||
{ |
|||
item.SetIsInvalid(true); |
|||
} |
|||
} |
|||
|
|||
} |
|||
|
|||
protected virtual async Task<bool> IsAllowedToUpdateAsync(IBasketItem item, ProductDto productDto) |
|||
{ |
|||
if (AllowedToUpdate.HasValue) |
|||
{ |
|||
return AllowedToUpdate.Value; |
|||
} |
|||
|
|||
var key = GetCacheItemKey(item, productDto); |
|||
|
|||
AllowedToUpdate = await Cache.GetAsync(key) is null; |
|||
|
|||
await Cache.SetAsync(key, new BookingBasketItemUpdatedCacheItem(), new DistributedCacheEntryOptions |
|||
{ |
|||
AbsoluteExpirationRelativeToNow = TimeSpan.FromSeconds(30) |
|||
}); |
|||
|
|||
return AllowedToUpdate.Value; |
|||
} |
|||
|
|||
protected virtual string GetCacheItemKey(IBasketItem item, ProductDto productDto) |
|||
{ |
|||
return CurrentUser.GetId().ToString(); |
|||
} |
|||
|
|||
protected virtual async Task<bool> IsBookingProductGroupAsync(string productGroupName) |
|||
{ |
|||
ProductGroupNames ??= |
|||
(await DefinitionAppService.GetListAsync()).Items.Select(x => x.ProductGroupName).ToList(); |
|||
|
|||
return ProductGroupNames.Contains(productGroupName); |
|||
} |
|||
} |
|||
@ -0,0 +1,6 @@ |
|||
namespace EasyAbp.EShop.Plugins.Baskets.Booking.BasketItems; |
|||
|
|||
public class BookingBasketItemUpdatedCacheItem |
|||
{ |
|||
|
|||
} |
|||
@ -0,0 +1,19 @@ |
|||
using EasyAbp.EShop.Orders; |
|||
using EasyAbp.EShop.Plugins.Baskets.Booking.ObjectExtending; |
|||
using Volo.Abp.Caching; |
|||
using Volo.Abp.Modularity; |
|||
|
|||
namespace EasyAbp.EShop.Plugins.Baskets.Booking; |
|||
|
|||
[DependsOn( |
|||
typeof(AbpCachingModule), |
|||
typeof(EShopPluginsBasketsApplicationModule), |
|||
typeof(EShopOrdersApplicationContractsModule) |
|||
)] |
|||
public class EShopPluginsBasketsBookingApplicationModule : AbpModule |
|||
{ |
|||
public override void PreConfigureServices(ServiceConfigurationContext context) |
|||
{ |
|||
EShopPluginsBasketsBookingObjectExtensions.Configure(); |
|||
} |
|||
} |
|||
@ -0,0 +1,20 @@ |
|||
namespace EasyAbp.EShop.Plugins.Baskets.Booking.ObjectExtending; |
|||
|
|||
public class BookingBasketItemProperties |
|||
{ |
|||
public const string BasketItemBookingAssetId = "BookingAssetId"; |
|||
|
|||
public const string BasketItemBookingAssetCategoryId = "BookingAssetCategoryId"; |
|||
|
|||
public const string BasketItemBookingPeriodSchemeId = "BookingPeriodSchemeId"; |
|||
|
|||
public const string BasketItemBookingPeriodId = "BookingPeriodId"; |
|||
|
|||
public const string BasketItemBookingDate = "BookingDate"; |
|||
|
|||
public const string BasketItemBookingStartingTime = "BookingStartingTime"; |
|||
|
|||
public const string BasketItemBookingDuration = "BookingDuration"; |
|||
|
|||
public const string BasketItemBookingAssetOccupancyId = "BookingAssetOccupancyId"; |
|||
} |
|||
@ -0,0 +1,55 @@ |
|||
using System; |
|||
using EasyAbp.EShop.Orders; |
|||
using EasyAbp.EShop.Plugins.Baskets.BasketItems; |
|||
using EasyAbp.EShop.Plugins.Baskets.BasketItems.Dtos; |
|||
using Volo.Abp.ObjectExtending; |
|||
using Volo.Abp.Threading; |
|||
|
|||
namespace EasyAbp.EShop.Plugins.Baskets.Booking.ObjectExtending; |
|||
|
|||
public static class EShopPluginsBasketsBookingObjectExtensions |
|||
{ |
|||
private static readonly OneTimeRunner OneTimeRunner = new OneTimeRunner(); |
|||
|
|||
public static void Configure() |
|||
{ |
|||
OneTimeRunner.Run(() => |
|||
{ |
|||
/* You can configure extension properties to entities or other object types |
|||
* defined in the depended modules. |
|||
* |
|||
* If you are using EF Core and want to map the entity extension properties to new |
|||
* table fields in the database, then configure them in the EShopSampleEfCoreEntityExtensionMappings |
|||
* |
|||
* Example: |
|||
* |
|||
* ObjectExtensionManager.Instance |
|||
* .AddOrUpdateProperty<IdentityRole, string>("Title"); |
|||
* |
|||
* See the documentation for more: |
|||
* https://docs.abp.io/en/abp/latest/Object-Extensions
|
|||
*/ |
|||
|
|||
ObjectExtensionManager.Instance |
|||
.AddOrUpdate( |
|||
new[] |
|||
{ |
|||
typeof(BasketItem), |
|||
typeof(BasketItemDto), |
|||
typeof(CreateBasketItemDto), |
|||
typeof(UpdateBasketItemDto) |
|||
}, |
|||
config => |
|||
{ |
|||
config.AddOrUpdateProperty<Guid?>(BookingBasketItemProperties.BasketItemBookingAssetId); |
|||
config.AddOrUpdateProperty<Guid?>(BookingBasketItemProperties.BasketItemBookingAssetCategoryId); |
|||
config.AddOrUpdateProperty<Guid?>(BookingBasketItemProperties.BasketItemBookingPeriodSchemeId); |
|||
config.AddOrUpdateProperty<Guid?>(BookingBasketItemProperties.BasketItemBookingPeriodId); |
|||
config.AddOrUpdateProperty<DateTime?>(BookingBasketItemProperties.BasketItemBookingDate); |
|||
config.AddOrUpdateProperty<TimeSpan?>(BookingBasketItemProperties.BasketItemBookingStartingTime); |
|||
config.AddOrUpdateProperty<TimeSpan?>(BookingBasketItemProperties.BasketItemBookingDuration); |
|||
} |
|||
); |
|||
}); |
|||
} |
|||
} |
|||
@ -0,0 +1,97 @@ |
|||
using System; |
|||
using EasyAbp.EShop.Orders; |
|||
using EasyAbp.EShop.Plugins.Baskets.BasketItems; |
|||
using Volo.Abp; |
|||
using Volo.Abp.Data; |
|||
|
|||
namespace EasyAbp.EShop.Plugins.Baskets.Booking.ObjectExtending; |
|||
|
|||
public static class OrderLineExtensions |
|||
{ |
|||
public static Guid? FindBookingAssetId(this IBasketItem basketItem) |
|||
{ |
|||
return basketItem.GetProperty<Guid?>(BookingOrderProperties.OrderLineBookingAssetId); |
|||
} |
|||
|
|||
public static Guid GetBookingAssetId(this IBasketItem basketItem) |
|||
{ |
|||
return Check.NotNull(FindBookingAssetId(basketItem), |
|||
BookingOrderProperties.OrderLineBookingAssetId)!.Value; |
|||
} |
|||
|
|||
public static Guid? FindBookingAssetCategoryId(this IBasketItem basketItem) |
|||
{ |
|||
return basketItem.GetProperty<Guid?>(BookingOrderProperties.OrderLineBookingAssetCategoryId); |
|||
} |
|||
|
|||
public static Guid GetBookingAssetCategoryId(this IBasketItem basketItem) |
|||
{ |
|||
return Check.NotNull(FindBookingAssetCategoryId(basketItem), |
|||
BookingOrderProperties.OrderLineBookingAssetCategoryId)!.Value; |
|||
} |
|||
|
|||
public static Guid? FindBookingPeriodSchemeId(this IBasketItem basketItem) |
|||
{ |
|||
return basketItem.GetProperty<Guid?>(BookingOrderProperties.OrderLineBookingPeriodSchemeId); |
|||
} |
|||
|
|||
public static Guid GetBookingPeriodSchemeId(this IBasketItem basketItem) |
|||
{ |
|||
return Check.NotNull(FindBookingPeriodSchemeId(basketItem), |
|||
BookingOrderProperties.OrderLineBookingPeriodSchemeId)!.Value; |
|||
} |
|||
|
|||
public static Guid? FindBookingPeriodId(this IBasketItem basketItem) |
|||
{ |
|||
return basketItem.GetProperty<Guid?>(BookingOrderProperties.OrderLineBookingPeriodId); |
|||
} |
|||
|
|||
public static Guid GetBookingPeriodId(this IBasketItem basketItem) |
|||
{ |
|||
return Check.NotNull(FindBookingPeriodId(basketItem), |
|||
BookingOrderProperties.OrderLineBookingPeriodId)!.Value; |
|||
} |
|||
|
|||
public static int? FindBookingVolume(this IBasketItem basketItem) |
|||
{ |
|||
return basketItem.Quantity; |
|||
} |
|||
|
|||
public static int GetBookingVolume(this IBasketItem basketItem) |
|||
{ |
|||
return FindBookingVolume(basketItem)!.Value; |
|||
} |
|||
|
|||
public static DateTime? FindBookingDate(this IBasketItem basketItem) |
|||
{ |
|||
return basketItem.FindDateTimeProperty(BookingOrderProperties.OrderLineBookingDate); |
|||
} |
|||
|
|||
public static DateTime GetBookingDate(this IBasketItem basketItem) |
|||
{ |
|||
return Check.NotNull(FindBookingDate(basketItem), |
|||
BookingOrderProperties.OrderLineBookingDate)!.Value; |
|||
} |
|||
|
|||
public static TimeSpan? FindBookingStartingTime(this IBasketItem basketItem) |
|||
{ |
|||
return basketItem.FindTimeSpanProperty(BookingOrderProperties.OrderLineBookingStartingTime); |
|||
} |
|||
|
|||
public static TimeSpan GetBookingStartingTime(this IBasketItem basketItem) |
|||
{ |
|||
return Check.NotNull(FindBookingStartingTime(basketItem), |
|||
BookingOrderProperties.OrderLineBookingStartingTime)!.Value; |
|||
} |
|||
|
|||
public static TimeSpan? FindBookingDuration(this IBasketItem basketItem) |
|||
{ |
|||
return basketItem.FindTimeSpanProperty(BookingOrderProperties.OrderLineBookingDuration); |
|||
} |
|||
|
|||
public static TimeSpan GetBookingDuration(this IBasketItem basketItem) |
|||
{ |
|||
return Check.NotNull(FindBookingDuration(basketItem), |
|||
BookingOrderProperties.OrderLineBookingDuration)!.Value; |
|||
} |
|||
} |
|||
Loading…
Reference in new issue