From 0124fa4bc9b1ef9bdd3b70fbfe6b693911426b79 Mon Sep 17 00:00:00 2001
From: cheche <717840555@qq.com>
Date: Mon, 18 Mar 2024 14:44:15 +0800
Subject: [PATCH] =?UTF-8?q?fix=20=E8=8E=B7=E5=8F=96=E8=AE=A2=E9=A4=90?=
 =?UTF-8?q?=E6=9C=80=E6=99=9A=E6=97=B6=E9=97=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Services/Implements/DishesService.cs      | 54 ++++++++++++-------
 Src/Dlhis.Basic/appsettings.json              |  1 -
 .../Response/GetMiniProgramOrderResponse.cs   | 24 +++------
 3 files changed, 42 insertions(+), 37 deletions(-)

diff --git a/Src/Dlhis.Basic/Dishes/Services/Implements/DishesService.cs b/Src/Dlhis.Basic/Dishes/Services/Implements/DishesService.cs
index dc6f7ea4..7a7245ce 100644
--- a/Src/Dlhis.Basic/Dishes/Services/Implements/DishesService.cs
+++ b/Src/Dlhis.Basic/Dishes/Services/Implements/DishesService.cs
@@ -8,6 +8,7 @@ using Kurisu.Core.DataAccess.Dto;
 using Kurisu.SqlSugar.Extensions;
 using Kurisu.SqlSugar.Services;
 using Mapster;
+using System;
 
 namespace Dlhis.Basic.Dishes.Services.Implements;
 
@@ -60,33 +61,46 @@ public class DishesService : IDishesService
 
     public async Task<GetDishesMenusBookingResponse> GetDishesMenusBookingSetting(GetDishesMenusBookingRequest request)
     {
-        var shift = await _dbContext.Queryable<BusinessPlaceShiftRelationshipEntity>()
+        try
+        {
+            var shift = await _dbContext.Queryable<BusinessPlaceShiftRelationshipEntity>()
             .Where(x => x.PlaceCode == request.PlaceCode)
             .FirstAsync();
-        shift.ThrowIfNull($"营业点{request.PlaceCode}吗，没有餐别!");
 
-        var BusinessShiftMealRelationships = await _dbContext.Queryable<BusinessShiftMealRelationshipEntity>()
-            .Where(x => x.ShiftCode == shift.ShiftCode)
-            .Select<BusinessShiftMealRelationshipResponse>()
-            .ToListAsync();
+            var BusinessShiftMealRelationships = await _dbContext.Queryable<BusinessShiftMealRelationshipEntity>()
+                .Where(x => x.ShiftCode == shift.ShiftCode)
+                .Select<BusinessShiftMealRelationshipResponse>()
+                .ToListAsync();
 
-        // 读取配置中的时间
-        var eightThirtyPmStr = _configuration["EightThirtyPM"];
-        DateTime.TryParseExact(eightThirtyPmStr, "HH:mm:ss", null, DateTimeStyles.None, out var dateTime);
+            // 读取最晚订餐的时间
+            var strDatetime = await _dbContext.Queryable<CanteenSettingEntity>()
+                .Where(x => x.UniqueType == CanteenSettingUnqiueEnumType.Tenant  && x.Item == CanteenSettingItemEnumType.BookingDeadline && x.Enable)
+                .Select(x => x.Value)
+                .FirstAsync();
 
-        var payTypes = new List<BalanceRecordSourceEnumType> { BalanceRecordSourceEnumType.Cash };
-        if (shift.TenantId == request.Factory)
-        {
-            payTypes.Add(BalanceRecordSourceEnumType.LocalTenantSubsidies);
+            DateTime dateTime;
+            DateTime.TryParseExact(strDatetime, "HH:mm:ss", null, System.Globalization.DateTimeStyles.None,  out dateTime);
+
+
+            var payTypes = new List<BalanceRecordSourceEnumType> { BalanceRecordSourceEnumType.Cash };
+            if (shift.TenantId == request.Factory)
+            {
+                payTypes.Add(BalanceRecordSourceEnumType.LocalTenantSubsidies);
+            }
+
+            var res = new GetDishesMenusBookingResponse
+            {
+                BusinessShiftMealRelationships = BusinessShiftMealRelationships,
+                ServiceTime = dateTime,
+                PayType = payTypes
+            };
+            return res;
         }
-
-        var res = new GetDishesMenusBookingResponse
+        catch (Exception ex)
         {
-            BusinessShiftMealRelationships = BusinessShiftMealRelationships,
-            ServiceTime = dateTime,
-            PayType = payTypes
-        };
-        return res;
+            return new GetDishesMenusBookingResponse();
+        }
+        
     }
 
 }
diff --git a/Src/Dlhis.Basic/appsettings.json b/Src/Dlhis.Basic/appsettings.json
index 2fb5ccec..7c564ae2 100644
--- a/Src/Dlhis.Basic/appsettings.json
+++ b/Src/Dlhis.Basic/appsettings.json
@@ -5,7 +5,6 @@
       "Microsoft.AspNetCore": "Warning"
     }
   },
-  "EightThirtyPM": "20:30:00",
   "AllowedHosts": "*",
   "InternalRequest": {
     "CommonRequestUrl": "http://common",
diff --git a/Src/Dlhis.Canteen/Order/Response/GetMiniProgramOrderResponse.cs b/Src/Dlhis.Canteen/Order/Response/GetMiniProgramOrderResponse.cs
index 37998819..423ddb92 100644
--- a/Src/Dlhis.Canteen/Order/Response/GetMiniProgramOrderResponse.cs
+++ b/Src/Dlhis.Canteen/Order/Response/GetMiniProgramOrderResponse.cs
@@ -110,24 +110,16 @@ public class GetMiniProgramOrderResponse
         /// </summary>
         public MiniProgramOrderStatusEnumType OrderStatus { get; set; }
 
-    /// <summary>
-    /// 订单状态CN
-    /// </summary>
-    public string OrderStatusCN => OrderStatus.GetDescription();
+        /// <summary>
+        /// 订单状态CN
+        /// </summary>
+        public string OrderStatusCN => OrderStatus.GetDescription();
 
-    /// <summary>
-    /// 订单类型
-    /// </summary>
-    public CanteenMenuEnumType OrderType { get; set; }
 
-    /// <summary>
-    /// 订单类型CN
-    /// </summary>
-    public string OrderTypeCN => OrderType.GetDescription();
 
-    /// <summary>
-    /// 总金额
-    /// </summary>
-    public decimal TotalAmount { get; set; }
+        /// <summary>
+        /// 总金额
+        /// </summary>
+        public decimal TotalAmount { get; set; }
 
 }