From 0bed0bc97bd6b23dc2da85666d8e5a6f4138b908 Mon Sep 17 00:00:00 2001
From: cheche <717840555@qq.com>
Date: Mon, 18 Mar 2024 10:54:28 +0800
Subject: [PATCH] =?UTF-8?q?fix=20=E8=8E=B7=E5=8F=96=E8=90=A5=E4=B8=9A?=
 =?UTF-8?q?=E7=82=B9=E4=B8=8B=E9=9D=A2=E9=A4=90=E6=AC=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Controller/DishesMenusController.cs       |  5 ++-
 .../Response/GetDishesMenusBookingResponse.cs | 42 +++++++++++++++++++
 .../Dishes/Services/IDishesService.cs         |  3 ++
 .../Services/Implements/DishesService.cs      | 16 +++++++
 .../Order/Request/OrderRequest.cs             |  2 +-
 .../Response/GetMiniProgramOrderResponse.cs   |  2 +-
 6 files changed, 66 insertions(+), 4 deletions(-)
 create mode 100644 Src/Dlhis.Basic/Dishes/Response/GetDishesMenusBookingResponse.cs

diff --git a/Src/Dlhis.Basic/Dishes/Controller/DishesMenusController.cs b/Src/Dlhis.Basic/Dishes/Controller/DishesMenusController.cs
index 297d4f9e..9c3289c4 100644
--- a/Src/Dlhis.Basic/Dishes/Controller/DishesMenusController.cs
+++ b/Src/Dlhis.Basic/Dishes/Controller/DishesMenusController.cs
@@ -7,6 +7,7 @@ using Kurisu.AspNetCore.DataAccess.SqlSugar.Aop;
 using Kurisu.Core.DataAccess.Dto;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
+using Org.BouncyCastle.Asn1.Ocsp;
 
 namespace Dlhis.Basic.Dishes.Controller;
 
@@ -92,9 +93,9 @@ public class DishesMenusController : ControllerBase
     /// </summary>
     /// <returns></returns>
     [HttpGet("setting")]
-    public async Task GetDishesMenusBookingSetting()
+    public async Task<List<GetDishesMenusBookingResponse>> GetDishesMenusBookingSetting(Guid PLaceCode)
     {
-        //todo
+       return await _dishesService.GetDishesMenusBookingSetting(PLaceCode);
     }
 }
 
diff --git a/Src/Dlhis.Basic/Dishes/Response/GetDishesMenusBookingResponse.cs b/Src/Dlhis.Basic/Dishes/Response/GetDishesMenusBookingResponse.cs
new file mode 100644
index 00000000..29fe46b4
--- /dev/null
+++ b/Src/Dlhis.Basic/Dishes/Response/GetDishesMenusBookingResponse.cs
@@ -0,0 +1,42 @@
+using Dlhis.Entity.Canteen.Enums;
+using SqlSugar.DbConvert;
+using SqlSugar;
+
+namespace Dlhis.Basic.Dishes.Response
+{
+    public class GetDishesMenusBookingResponse
+    {
+        /// <summary>
+        /// 餐别Code
+        /// </summary>
+        public Guid ShiftCode { get; set; }
+
+        /// <summary>
+        /// 餐别手工号
+        /// </summary>
+        public string ShiftCustomCode { get; set; }
+
+        /// <summary>
+        /// 餐次
+        /// </summary>
+        public ShiftEnumType ShiftType { get; set; }
+
+        /// <summary>
+        /// 经营开始时间
+        /// </summary>
+        public TimeOnly Start { get; set; }
+
+        /// <summary>
+        /// 经营结束时间
+        /// </summary>
+        public TimeOnly End { get; set; }
+
+        /// <summary>
+        /// 序号
+        /// </summary>
+        public int Sequence { get; set; }
+
+
+        public string TenantId { get; set; }
+    }
+}
diff --git a/Src/Dlhis.Basic/Dishes/Services/IDishesService.cs b/Src/Dlhis.Basic/Dishes/Services/IDishesService.cs
index 8398263a..6155d573 100644
--- a/Src/Dlhis.Basic/Dishes/Services/IDishesService.cs
+++ b/Src/Dlhis.Basic/Dishes/Services/IDishesService.cs
@@ -9,4 +9,7 @@ public interface IDishesService : IScopeDependency
     Task<Pagination<DishesResponse>> GetDishesPageAsync(DishesPageRequest request);
 
     Task SaveDishesAsync(DishesSaveRequest request);
+
+    Task<List<GetDishesMenusBookingResponse>> GetDishesMenusBookingSetting(Guid PLaceCode);
+    
 }
diff --git a/Src/Dlhis.Basic/Dishes/Services/Implements/DishesService.cs b/Src/Dlhis.Basic/Dishes/Services/Implements/DishesService.cs
index 4c202176..f0520772 100644
--- a/Src/Dlhis.Basic/Dishes/Services/Implements/DishesService.cs
+++ b/Src/Dlhis.Basic/Dishes/Services/Implements/DishesService.cs
@@ -1,5 +1,6 @@
 using Dlhis.Basic.Dishes.Request;
 using Dlhis.Basic.Dishes.Response;
+using Dlhis.Entity.Basic.Entity;
 using Dlhis.Entity.Canteen.Entities;
 using Kurisu.AspNetCore.Utils.Extensions;
 using Kurisu.Core.DataAccess.Dto;
@@ -47,4 +48,19 @@ public class DishesService : IDishesService
             await _dbContext.UpdateAsync(entity);
         }
     }
+
+    public async Task<List<GetDishesMenusBookingResponse>> GetDishesMenusBookingSetting(Guid PLaceCode)
+    {
+        var shift = await _dbContext.Queryable<BusinessPlaceShiftRelationshipEntity>()
+            .Where(x => x.PlaceCode == PLaceCode)
+            .FirstAsync();
+
+        var res=  await _dbContext.Queryable<BusinessShiftMealRelationshipEntity>()
+            .Where(x => x.ShiftCode == shift.ShiftCode)
+            .Select<GetDishesMenusBookingResponse>()
+            .ToListAsync();
+
+        return res;
+    }
+
 }
diff --git a/Src/Dlhis.Canteen/Order/Request/OrderRequest.cs b/Src/Dlhis.Canteen/Order/Request/OrderRequest.cs
index 28481cb8..a8bfac36 100644
--- a/Src/Dlhis.Canteen/Order/Request/OrderRequest.cs
+++ b/Src/Dlhis.Canteen/Order/Request/OrderRequest.cs
@@ -45,6 +45,6 @@ namespace Dlhis.Canteen.Order.Request
         /// <summary>
         /// 支付方式
         /// </summary>
-        public CanteenPayEnumType PayType { get; set; }
+        public BalanceRecordSourceEnumType PayType { get; set; }
     }
 }
diff --git a/Src/Dlhis.Canteen/Order/Response/GetMiniProgramOrderResponse.cs b/Src/Dlhis.Canteen/Order/Response/GetMiniProgramOrderResponse.cs
index a0a28732..bb4f4fbc 100644
--- a/Src/Dlhis.Canteen/Order/Response/GetMiniProgramOrderResponse.cs
+++ b/Src/Dlhis.Canteen/Order/Response/GetMiniProgramOrderResponse.cs
@@ -100,7 +100,7 @@ namespace Dlhis.Canteen.Order.Response
         /// <summary>
         /// 支付方式
         /// </summary>
-        public CanteenPayEnumType PayType { get; set; }
+        public BalanceRecordSourceEnumType PayType { get; set; }
 
         /// <summary>
         /// 支付方式CN