From c743d2d1c5fb0dcfca1562b2ef3cc743df7d4849 Mon Sep 17 00:00:00 2001 From: cheche <717840555@qq.com> Date: Mon, 18 Mar 2024 11:48:38 +0800 Subject: [PATCH] =?UTF-8?q?fix=20GetDishesMenusBookingResponse=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Controller/DishesMenusController.cs | 4 +- .../Request/GetDishesMenusBookingRequest.cs | 9 ++++ .../BusinessShiftMealRelationshipResponse.cs | 10 ---- .../Dishes/Response/DishesMenuPageResponse.cs | 52 ++++++++++++++++++- .../Response/GetDishesMenusBookingResponse.cs | 4 ++ .../Dishes/Services/IDishesService.cs | 2 +- .../Services/Implements/DishesService.cs | 24 +++++++-- Src/Dlhis.Basic/appsettings.Development.json | 1 + Src/Dlhis.Basic/appsettings.json | 1 + 9 files changed, 90 insertions(+), 17 deletions(-) create mode 100644 Src/Dlhis.Basic/Dishes/Request/GetDishesMenusBookingRequest.cs diff --git a/Src/Dlhis.Basic/Dishes/Controller/DishesMenusController.cs b/Src/Dlhis.Basic/Dishes/Controller/DishesMenusController.cs index 5d22c254..2bbb924e 100644 --- a/Src/Dlhis.Basic/Dishes/Controller/DishesMenusController.cs +++ b/Src/Dlhis.Basic/Dishes/Controller/DishesMenusController.cs @@ -93,9 +93,9 @@ public class DishesMenusController : ControllerBase /// /// [HttpGet("setting")] - public async Task GetDishesMenusBookingSetting(Guid PLaceCode) + public async Task GetDishesMenusBookingSetting(GetDishesMenusBookingRequest request) { - return await _dishesService.GetDishesMenusBookingSetting(PLaceCode); + return await _dishesService.GetDishesMenusBookingSetting(request); } } diff --git a/Src/Dlhis.Basic/Dishes/Request/GetDishesMenusBookingRequest.cs b/Src/Dlhis.Basic/Dishes/Request/GetDishesMenusBookingRequest.cs new file mode 100644 index 00000000..af71ee69 --- /dev/null +++ b/Src/Dlhis.Basic/Dishes/Request/GetDishesMenusBookingRequest.cs @@ -0,0 +1,9 @@ +namespace Dlhis.Basic.Dishes.Request +{ + public class GetDishesMenusBookingRequest + { + public Guid PlaceCode { get; set; } + + public string Factory { get; set; } + } +} diff --git a/Src/Dlhis.Basic/Dishes/Response/BusinessShiftMealRelationshipResponse.cs b/Src/Dlhis.Basic/Dishes/Response/BusinessShiftMealRelationshipResponse.cs index 85b71c88..e36c7b28 100644 --- a/Src/Dlhis.Basic/Dishes/Response/BusinessShiftMealRelationshipResponse.cs +++ b/Src/Dlhis.Basic/Dishes/Response/BusinessShiftMealRelationshipResponse.cs @@ -19,16 +19,6 @@ namespace Dlhis.Basic.Dishes.Response /// public ShiftEnumType ShiftType { get; set; } - /// - /// 经营开始时间 - /// - public TimeOnly Start { get; set; } - - /// - /// 经营结束时间 - /// - public TimeOnly End { get; set; } - /// /// 序号 /// diff --git a/Src/Dlhis.Basic/Dishes/Response/DishesMenuPageResponse.cs b/Src/Dlhis.Basic/Dishes/Response/DishesMenuPageResponse.cs index 4f2c3a1a..5fd05151 100644 --- a/Src/Dlhis.Basic/Dishes/Response/DishesMenuPageResponse.cs +++ b/Src/Dlhis.Basic/Dishes/Response/DishesMenuPageResponse.cs @@ -1,6 +1,56 @@ -namespace Dlhis.Basic.Dishes.Response; +using Dlhis.Entity.Canteen.Enums; +using SqlSugar.DbConvert; +using SqlSugar; + +namespace Dlhis.Basic.Dishes.Response; public class DishesMenuPageResponse { + /// + /// 菜单编码 + /// + public string CustomCode { get; set; } + /// + /// 菜单类型 + /// + public CanteenMenuEnumType Type { get; set; } + + /// + /// 所属营业点 + /// + public Guid BusinessPlaceCode { get; set; } + + /// + /// 营业日期 + /// + public DateTime Date { get; set; } + + + /// + /// 餐次 + /// + public ShiftEnumType ShiftType { get; set; } + + + /// + /// 菜品编码 + /// + public string DishesCode { get; set; } + + /// + /// 剩余数量 + /// + public int Number { get; set; } + + + /// + /// 单价 + /// + public decimal? Price { get; set; } + + /// + /// 是否启用 + /// + public bool Enable { get; set; } } diff --git a/Src/Dlhis.Basic/Dishes/Response/GetDishesMenusBookingResponse.cs b/Src/Dlhis.Basic/Dishes/Response/GetDishesMenusBookingResponse.cs index 87c5b76d..5d21e26f 100644 --- a/Src/Dlhis.Basic/Dishes/Response/GetDishesMenusBookingResponse.cs +++ b/Src/Dlhis.Basic/Dishes/Response/GetDishesMenusBookingResponse.cs @@ -7,5 +7,9 @@ namespace Dlhis.Basic.Dishes.Response public class GetDishesMenusBookingResponse { public List BusinessShiftMealRelationships { get; set; } + + public DateTime ServiceTime { get; set; } + + public List PayType { get; set; } } } diff --git a/Src/Dlhis.Basic/Dishes/Services/IDishesService.cs b/Src/Dlhis.Basic/Dishes/Services/IDishesService.cs index 3d7338d0..f4398736 100644 --- a/Src/Dlhis.Basic/Dishes/Services/IDishesService.cs +++ b/Src/Dlhis.Basic/Dishes/Services/IDishesService.cs @@ -10,6 +10,6 @@ public interface IDishesService : IScopeDependency Task SaveDishesAsync(DishesSaveRequest request); - Task GetDishesMenusBookingSetting(Guid PLaceCode); + Task GetDishesMenusBookingSetting(GetDishesMenusBookingRequest request); } diff --git a/Src/Dlhis.Basic/Dishes/Services/Implements/DishesService.cs b/Src/Dlhis.Basic/Dishes/Services/Implements/DishesService.cs index bda18ed8..e09fdeba 100644 --- a/Src/Dlhis.Basic/Dishes/Services/Implements/DishesService.cs +++ b/Src/Dlhis.Basic/Dishes/Services/Implements/DishesService.cs @@ -2,21 +2,25 @@ using Dlhis.Basic.Dishes.Response; using Dlhis.Entity.Basic.Entity; using Dlhis.Entity.Canteen.Entities; +using Dlhis.Entity.Canteen.Enums; using Kurisu.AspNetCore.Utils.Extensions; using Kurisu.Core.DataAccess.Dto; using Kurisu.SqlSugar.Extensions; using Kurisu.SqlSugar.Services; using Mapster; +using System.Collections.Generic; namespace Dlhis.Basic.Dishes.Services.Implements; public class DishesService : IDishesService { private readonly IDbContext _dbContext; + private readonly IConfiguration _configuration; - public DishesService(IDbContext dbContext) + public DishesService(IDbContext dbContext, IConfiguration configuration) { _dbContext = dbContext; + _configuration = configuration; } public async Task> GetDishesPageAsync(DishesPageRequest request) @@ -49,19 +53,33 @@ public class DishesService : IDishesService } } - public async Task GetDishesMenusBookingSetting(Guid PLaceCode) + public async Task GetDishesMenusBookingSetting(GetDishesMenusBookingRequest request) { var shift = await _dbContext.Queryable() - .Where(x => x.PlaceCode == PLaceCode) + .Where(x => x.PlaceCode == request.PlaceCode) .FirstAsync(); + shift.ThrowIfNull($"营业点{request.PlaceCode}吗，没有餐别!"); var BusinessShiftMealRelationships= await _dbContext.Queryable() .Where(x => x.ShiftCode == shift.ShiftCode) .Select() .ToListAsync(); + + // 读取配置中的时间 + var eightThirtyPmStr = _configuration["EightThirtyPM"]; + DateTime.TryParseExact(eightThirtyPmStr, "HH:mm:ss", null, System.Globalization.DateTimeStyles.None, out var dateTime); + + var payTypes = new List { BalanceRecordSourceEnumType.Cash }; + if (shift.TenantId == request.Factory) + { + payTypes.Add(BalanceRecordSourceEnumType.LocalTenantSubsidies); + } + var res = new GetDishesMenusBookingResponse { BusinessShiftMealRelationships = BusinessShiftMealRelationships, + ServiceTime = dateTime, + PayType = payTypes }; return res; } diff --git a/Src/Dlhis.Basic/appsettings.Development.json b/Src/Dlhis.Basic/appsettings.Development.json index 7d904fe7..0701613f 100644 --- a/Src/Dlhis.Basic/appsettings.Development.json +++ b/Src/Dlhis.Basic/appsettings.Development.json @@ -5,6 +5,7 @@ "Microsoft.AspNetCore": "Warning" } }, + "EightThirtyPM": "20:30:00", "InternalRequest": { "CommonRequestUrl": "http://localhost:5001", "SysRequestUrl": "http://localhost:5003" diff --git a/Src/Dlhis.Basic/appsettings.json b/Src/Dlhis.Basic/appsettings.json index 7c564ae2..2fb5ccec 100644 --- a/Src/Dlhis.Basic/appsettings.json +++ b/Src/Dlhis.Basic/appsettings.json @@ -5,6 +5,7 @@ "Microsoft.AspNetCore": "Warning" } }, + "EightThirtyPM": "20:30:00", "AllowedHosts": "*", "InternalRequest": { "CommonRequestUrl": "http://common",