From 1738e52d8d6907c34da588790f89a78a3b544ac4 Mon Sep 17 00:00:00 2001
From: liguoyang <Ligy.97@foxmail.com>
Date: Wed, 10 Jan 2024 19:10:38 +0800
Subject: [PATCH] =?UTF-8?q?fix=20=E5=8C=BA=E9=97=B4=E5=88=A4=E6=96=AD?=
 =?UTF-8?q?=E4=B8=B4=E6=97=B6=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Order/Services/Implements/OrderService.cs        | 12 +++++++-----
 Src/Dlhis.Canteen/Order/TimePeriodExtensions.cs      |  4 +++-
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/Src/Dlhis.Canteen/Order/Services/Implements/OrderService.cs b/Src/Dlhis.Canteen/Order/Services/Implements/OrderService.cs
index 5f723f87..9172292d 100644
--- a/Src/Dlhis.Canteen/Order/Services/Implements/OrderService.cs
+++ b/Src/Dlhis.Canteen/Order/Services/Implements/OrderService.cs
@@ -57,13 +57,15 @@ public class OrderService : IOrderService
             Start = x.Start,
             End = x.End,
 
-        }.IsPresent(request.CostDateTime));
+        }.IsPresent1(request.CostDateTime));
 
         //根据档案号
         var canteenUser = await _dbContext.Queryable<CanteenUserEntity>()
             .Where(x => x.UserNo == request.UserUniqueNo || x.UserCode == request.UserUniqueNo)
             .FirstAsync();
 
+        canteenUser.ThrowIfNull($"{request.DeviceUniqueNo}不存在,无法就餐");
+
         var gafinfo = await _dbContext.Queryable<GainfoEntity>()
             .Where(x => x.No == canteenUser.UserNo)
             .FirstAsync();
@@ -75,8 +77,8 @@ public class OrderService : IOrderService
 
         var shiftTimePeriod = new TimePeriod()
         {
-            Start = shift.Start,
-            End = shift.End
+            Start = shift?.Start,
+            End = shift?.End
         };
 
         //成本日期 todo 优化
@@ -148,7 +150,7 @@ public class OrderService : IOrderService
         DateTime costDateTime)
     {
         var order = await _dbContext.Queryable<CanteenOrderEntity>().Where(x => x.Id == orderId).FirstAsync();
-        
+
         await Verify(settings, shifts, costDateTime, order);//校验
 
         for (int i = 0; i < 5; i++)
@@ -205,7 +207,7 @@ public class OrderService : IOrderService
                 Start = x.Start,
                 End = x.End,
 
-            }.IsPresent(costDateTime)).ThrowIfNull("当前非就餐时间,无法消费");
+            }.IsPresent1(costDateTime)).ThrowIfNull("当前非就餐时间,无法消费");
         }
 
         var beginOfDay = DateTime.Today;
diff --git a/Src/Dlhis.Canteen/Order/TimePeriodExtensions.cs b/Src/Dlhis.Canteen/Order/TimePeriodExtensions.cs
index a1d2b197..b1912390 100644
--- a/Src/Dlhis.Canteen/Order/TimePeriodExtensions.cs
+++ b/Src/Dlhis.Canteen/Order/TimePeriodExtensions.cs
@@ -8,7 +8,7 @@ namespace Dlhis.Canteen.Order;
 /// </summary>
 public static class TimePeriodExtensions
 {
-    public static bool IsPresent(this TimePeriod period, DateTime dateTime)
+    public static bool IsPresent1(this TimePeriod period, DateTime dateTime)
     {
         int hour = dateTime.Hour;
         int minute = dateTime.Minute;
@@ -24,6 +24,8 @@ public static class TimePeriodExtensions
             {
                 return minute < period.End.Value.Minute;
             }
+
+            return true;
         }
 
         return false;