From ae946a0bcc97b1140fb2a3ccd6dfbc50d600e97b Mon Sep 17 00:00:00 2001
From: liguoyang <Ligy.97@foxmail.com>
Date: Thu, 18 Jan 2024 15:43:45 +0800
Subject: [PATCH] =?UTF-8?q?fix=20=E6=97=B6=E9=97=B4=E5=8C=BA=E9=97=B4?=
 =?UTF-8?q?=E5=88=A4=E6=96=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Order/TimePeriodExtensions.cs             | 27 +++++++++++++++++++
 1 file changed, 27 insertions(+)

diff --git a/Src/Dlhis.Canteen/Order/TimePeriodExtensions.cs b/Src/Dlhis.Canteen/Order/TimePeriodExtensions.cs
index b1912390..b400f354 100644
--- a/Src/Dlhis.Canteen/Order/TimePeriodExtensions.cs
+++ b/Src/Dlhis.Canteen/Order/TimePeriodExtensions.cs
@@ -10,6 +10,8 @@ public static class TimePeriodExtensions
 {
     public static bool IsPresent1(this TimePeriod period, DateTime dateTime)
     {
+        return period.IsPresent2(dateTime);
+
         int hour = dateTime.Hour;
         int minute = dateTime.Minute;
         IReadOnlyList<int> hourPeriod = GetHourPeriod();
@@ -57,4 +59,29 @@ public static class TimePeriodExtensions
             return list;
         }
     }
+
+    public static bool IsPresent2(this TimePeriod period, DateTime dateTime)
+    {
+        var start = DateTime.Now;
+        var end = DateTime.Now;
+
+        if (period.IsCrossDay())
+        {
+            //第二天
+            if (dateTime.Hour >= 0)
+            {
+                start = DateTime.Today.AddDays(-1).Add(period.Start.Value.ToTimeSpan());
+                end = DateTime.Today.Add(period.End.Value.ToTimeSpan());
+            }
+        }
+        else
+        {
+            start = DateTime.Today.Add(period.Start.Value.ToTimeSpan());
+            end = DateTime.Today.Add(period.End.Value.ToTimeSpan());
+        }
+
+
+
+        return dateTime >= start && dateTime <= end;
+    }
 }