From 89291c8ea5f95845b55b499fddc4b828c991f215 Mon Sep 17 00:00:00 2001 From: liguoyang Date: Wed, 14 Aug 2024 15:07:08 +0800 Subject: [PATCH] =?UTF-8?q?feat=20=E7=94=B5=E5=AD=90=E9=A4=90=E5=88=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Src/Dlhis.Basic/Organization/Request/GainfoPageRequest.cs | 2 +- Src/Dlhis.Canteen/Order/Services/Implements/OrderService.cs | 3 --- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/Src/Dlhis.Basic/Organization/Request/GainfoPageRequest.cs b/Src/Dlhis.Basic/Organization/Request/GainfoPageRequest.cs index 162af652..69cef6c5 100644 --- a/Src/Dlhis.Basic/Organization/Request/GainfoPageRequest.cs +++ b/Src/Dlhis.Basic/Organization/Request/GainfoPageRequest.cs @@ -23,7 +23,7 @@ public class GainfoPageRequest : PageDto, IValidatableObject /// [EnumDataType(typeof(GainfoSearchEnumType))] public GainfoSearchEnumType SearchType { get; set; } - + public bool IsSearchAll { get; set; } public IEnumerable Validate(ValidationContext validationContext) diff --git a/Src/Dlhis.Canteen/Order/Services/Implements/OrderService.cs b/Src/Dlhis.Canteen/Order/Services/Implements/OrderService.cs index e117305a..99d7f1ab 100644 --- a/Src/Dlhis.Canteen/Order/Services/Implements/OrderService.cs +++ b/Src/Dlhis.Canteen/Order/Services/Implements/OrderService.cs @@ -613,7 +613,6 @@ public class OrderService : BaseOrderService, IOrderService { if (request.ThirdNo.IsPresent()) { - var redisCache = _serviceProvider.GetService(); await using var handler = await redisCache.LockAsync($"consume:device:{request.ThirdNo}"); @@ -676,7 +675,6 @@ public class OrderService : BaseOrderService, IOrderService Msg = message }; } - async Task ToCheckAbleOfflineConsumeAsync(string thirdNo) { var order = await DbContext.Queryable() @@ -714,7 +712,6 @@ public class OrderService : BaseOrderService, IOrderService var current = await DbContext.Queryable() .Where(x => x.No == no && x.IdNo == idNo).SingleAsync(); (nowDate >= current.Start && nowDate <= current.End).ThrowIfFalse("餐券已过期"); - var time = DateTimeOffset.FromUnixTimeMilliseconds(Convert.ToInt64(ts.Reverse().Join(string.Empty))).ToLocalTime().DateTime; (time.AddMinutes(60) >= DateTime.Now).ThrowIfFalse("二维码已过期");