diff --git a/server/HoneyBox/src/HoneyBox.Admin.Business/Models/Goods/GoodsModels.cs b/server/HoneyBox/src/HoneyBox.Admin.Business/Models/Goods/GoodsModels.cs index 38567257..e027af6e 100644 --- a/server/HoneyBox/src/HoneyBox.Admin.Business/Models/Goods/GoodsModels.cs +++ b/server/HoneyBox/src/HoneyBox.Admin.Business/Models/Goods/GoodsModels.cs @@ -335,9 +335,9 @@ public class GoodsDetailResponse : GoodsListResponse public int LockIs { get; set; } /// - /// 锁定时间 + /// 锁定时间(秒) /// - public DateTime? LockTime { get; set; } + public int? LockTime { get; set; } /// /// 是否支持积分 0-否 1-是 diff --git a/server/HoneyBox/src/HoneyBox.Core/Services/OrderService.cs b/server/HoneyBox/src/HoneyBox.Core/Services/OrderService.cs index 645bba37..4848cd5c 100644 --- a/server/HoneyBox/src/HoneyBox.Core/Services/OrderService.cs +++ b/server/HoneyBox/src/HoneyBox.Core/Services/OrderService.cs @@ -969,9 +969,9 @@ public class OrderService : IOrderService // 12. 处理锁箱(一番赏、全局赏、追踪赏) if (goods.Type == 1 || goods.Type == 6 || goods.Type == 11) { - if (goods.LockIs == 1 && goods.LockTime.HasValue) + if (goods.LockIs == 1 && goods.LockTime.HasValue && goods.LockTime.Value > 0) { - await HandleBoxLockingAsync(userId, request.GoodsId, num, request.PrizeNum, (int)goods.LockTime.Value.TimeOfDay.TotalSeconds); + await HandleBoxLockingAsync(userId, request.GoodsId, num, request.PrizeNum, goods.LockTime.Value); } } diff --git a/server/HoneyBox/src/HoneyBox.Model/Entities/Good.cs b/server/HoneyBox/src/HoneyBox.Model/Entities/Good.cs index f1280e8c..5956c37a 100644 --- a/server/HoneyBox/src/HoneyBox.Model/Entities/Good.cs +++ b/server/HoneyBox/src/HoneyBox.Model/Entities/Good.cs @@ -54,9 +54,9 @@ public partial class Good public byte LockIs { get; set; } /// - /// 锁定时间 + /// 锁定时间(秒) /// - public DateTime? LockTime { get; set; } + public int? LockTime { get; set; } /// /// 是否支持优惠券 0-否 1-是