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 /// /// [HttpGet("setting")] - public async Task GetDishesMenusBookingSetting() + public async Task> 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 + { + /// + /// 餐别Code + /// + public Guid ShiftCode { get; set; } + + /// + /// 餐别手工号 + /// + public string ShiftCustomCode { get; set; } + + /// + /// 餐次 + /// + public ShiftEnumType ShiftType { get; set; } + + /// + /// 经营开始时间 + /// + public TimeOnly Start { get; set; } + + /// + /// 经营结束时间 + /// + public TimeOnly End { get; set; } + + /// + /// 序号 + /// + 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> GetDishesPageAsync(DishesPageRequest request); Task SaveDishesAsync(DishesSaveRequest request); + + Task> 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> GetDishesMenusBookingSetting(Guid PLaceCode) + { + var shift = await _dbContext.Queryable() + .Where(x => x.PlaceCode == PLaceCode) + .FirstAsync(); + + var res= await _dbContext.Queryable() + .Where(x => x.ShiftCode == shift.ShiftCode) + .Select() + .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 /// /// 支付方式 /// - 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 /// /// 支付方式 /// - public CanteenPayEnumType PayType { get; set; } + public BalanceRecordSourceEnumType PayType { get; set; } /// /// 支付方式CN