From 6fa62b07204235e6331b1a8d5940756455f9cd56 Mon Sep 17 00:00:00 2001
From: Jadyn <jadyn.wong@live.com>
Date: Tue, 12 Jul 2022 17:08:58 +0800
Subject: [PATCH] Improvement FlashSales

---
 .../FlashSalePlans/Dtos/FlashSalePlanPreOrderDto.cs           | 2 +-
 .../FlashSales/FlashSalePlans/FlashSalePlanAppService.cs      | 2 +-
 ...llBackInventoryCreateFlashSaleOrderCompleteEventHandler.cs | 1 -
 .../FlashSaleResults/FlashSaleResultFailedReason.cs           | 4 ++--
 4 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/plugins/FlashSales/src/EasyAbp.EShop.Plugins.FlashSales.Application.Contracts/EasyAbp/EShop/Plugins/FlashSales/FlashSalePlans/Dtos/FlashSalePlanPreOrderDto.cs b/plugins/FlashSales/src/EasyAbp.EShop.Plugins.FlashSales.Application.Contracts/EasyAbp/EShop/Plugins/FlashSales/FlashSalePlans/Dtos/FlashSalePlanPreOrderDto.cs
index 54ffa8f0..ccfdea14 100644
--- a/plugins/FlashSales/src/EasyAbp.EShop.Plugins.FlashSales.Application.Contracts/EasyAbp/EShop/Plugins/FlashSales/FlashSalePlans/Dtos/FlashSalePlanPreOrderDto.cs
+++ b/plugins/FlashSales/src/EasyAbp.EShop.Plugins.FlashSales.Application.Contracts/EasyAbp/EShop/Plugins/FlashSales/FlashSalePlans/Dtos/FlashSalePlanPreOrderDto.cs
@@ -7,5 +7,5 @@ public class FlashSalePlanPreOrderDto : ExtensibleEntityDto
 {
     public DateTime ExpiresTime { get; set; }
 
-    public double Expires { get; set; }
+    public double ExpiresInSeconds { get; set; }
 }
diff --git a/plugins/FlashSales/src/EasyAbp.EShop.Plugins.FlashSales.Application/EasyAbp/EShop/Plugins/FlashSales/FlashSalePlans/FlashSalePlanAppService.cs b/plugins/FlashSales/src/EasyAbp.EShop.Plugins.FlashSales.Application/EasyAbp/EShop/Plugins/FlashSales/FlashSalePlans/FlashSalePlanAppService.cs
index 50da39eb..49d27aee 100644
--- a/plugins/FlashSales/src/EasyAbp.EShop.Plugins.FlashSales.Application/EasyAbp/EShop/Plugins/FlashSales/FlashSalePlans/FlashSalePlanAppService.cs
+++ b/plugins/FlashSales/src/EasyAbp.EShop.Plugins.FlashSales.Application/EasyAbp/EShop/Plugins/FlashSales/FlashSalePlans/FlashSalePlanAppService.cs
@@ -198,7 +198,7 @@ public class FlashSalePlanAppService :
 
         await SetPreOrderCacheAsync(plan, product, productSku, expiresTime);
 
-        return new FlashSalePlanPreOrderDto { ExpiresTime = Clock.Normalize(expiresTime.LocalDateTime), Expires = Options.PreOrderExpires.TotalSeconds };
+        return new FlashSalePlanPreOrderDto { ExpiresTime = Clock.Normalize(expiresTime.LocalDateTime), ExpiresInSeconds = Options.PreOrderExpires.TotalSeconds };
     }
 
     public virtual async Task<bool> OrderAsync(Guid id, CreateOrderInput input)
diff --git a/plugins/FlashSales/src/EasyAbp.EShop.Plugins.FlashSales.Application/EasyAbp/EShop/Plugins/FlashSales/FlashSalePlans/RollBackInventoryCreateFlashSaleOrderCompleteEventHandler.cs b/plugins/FlashSales/src/EasyAbp.EShop.Plugins.FlashSales.Application/EasyAbp/EShop/Plugins/FlashSales/FlashSalePlans/RollBackInventoryCreateFlashSaleOrderCompleteEventHandler.cs
index 295b3baf..42bcfbf4 100644
--- a/plugins/FlashSales/src/EasyAbp.EShop.Plugins.FlashSales.Application/EasyAbp/EShop/Plugins/FlashSales/FlashSalePlans/RollBackInventoryCreateFlashSaleOrderCompleteEventHandler.cs
+++ b/plugins/FlashSales/src/EasyAbp.EShop.Plugins.FlashSales.Application/EasyAbp/EShop/Plugins/FlashSales/FlashSalePlans/RollBackInventoryCreateFlashSaleOrderCompleteEventHandler.cs
@@ -31,7 +31,6 @@ public class RollBackInventoryCreateFlashSaleOrderCompleteEventHandler : IDistri
         ProductAppService = productAppService;
     }
 
-    [UnitOfWork(true)]
     public virtual async Task HandleEventAsync(CreateFlashSaleOrderCompleteEto eventData)
     {
         if (eventData.Success)
diff --git a/plugins/FlashSales/src/EasyAbp.EShop.Plugins.FlashSales.Domain.Shared/EasyAbp/EShop/Plugins/FlashSales/FlashSaleResults/FlashSaleResultFailedReason.cs b/plugins/FlashSales/src/EasyAbp.EShop.Plugins.FlashSales.Domain.Shared/EasyAbp/EShop/Plugins/FlashSales/FlashSaleResults/FlashSaleResultFailedReason.cs
index 7d2891e3..f4ef7845 100644
--- a/plugins/FlashSales/src/EasyAbp.EShop.Plugins.FlashSales.Domain.Shared/EasyAbp/EShop/Plugins/FlashSales/FlashSaleResults/FlashSaleResultFailedReason.cs
+++ b/plugins/FlashSales/src/EasyAbp.EShop.Plugins.FlashSales.Domain.Shared/EasyAbp/EShop/Plugins/FlashSales/FlashSaleResults/FlashSaleResultFailedReason.cs
@@ -2,7 +2,7 @@
 
 public static class FlashSaleResultFailedReason
 {
-    public const string InsufficientInventory = nameof(InsufficientInventory);
+    public const string InsufficientInventory = "InsufficientInventory";
 
-    public const string InvalidHashToken = nameof(InvalidHashToken);
+    public const string InvalidHashToken = "InvalidHashToken";
 }