From 53dd000f34cd81ef3602d6c3bdf0deca82895b2c Mon Sep 17 00:00:00 2001 From: cheche <717840555@qq.com> Date: Wed, 13 Mar 2024 18:55:12 +0800 Subject: [PATCH] =?UTF-8?q?feat=20=E8=8F=9C=E5=8D=95=E8=AE=A2=E5=8D=95?= =?UTF-8?q?=E6=8E=A7=E5=88=B6=E5=99=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Order/Controllers/MenuDishesController.cs | 70 ++++++++++++ .../MiniProgramOrderDetailController.cs | 47 ++++++++ .../Order/Request/GetDetailRequest.cs | 8 ++ .../Order/Request/GetDishesRequest.cs | 9 ++ .../Order/Request/GetMenuRequest.cs | 9 ++ .../Request/GetMiniProgramOrderRequest.cs | 8 ++ .../Order/Request/SaveDishesRequest.cs | 69 ++++++++++++ .../Order/Request/SaveMenuRequest.cs | 48 ++++++++ .../Order/Response/GetDetailResponse.cs | 66 +++++++++++ .../Order/Response/GetDishesResponse.cs | 75 +++++++++++++ .../Order/Response/GetMenuResponse.cs | 59 ++++++++++ .../Response/GetMiniProgramOrderResponse.cs | 106 ++++++++++++++++++ .../Order/Services/IMenuDishesService.cs | 18 +++ .../IMiniProgramOrderDetailService.cs | 14 +++ .../Services/Implements/MenuDishesService.cs | 93 +++++++++++++++ .../MiniProgramOrderDetailService.cs | 39 +++++++ .../Canteen/Entities/CanteenMenuEntity.cs | 8 +- .../Entities/MiniProgramOrderEntity.cs | 6 +- .../Canteen/Enums/ShiftEnumType.cs | 41 +++++++ 19 files changed, 785 insertions(+), 8 deletions(-) create mode 100644 Src/Dlhis.Canteen/Order/Controllers/MenuDishesController.cs create mode 100644 Src/Dlhis.Canteen/Order/Controllers/MiniProgramOrderDetailController.cs create mode 100644 Src/Dlhis.Canteen/Order/Request/GetDetailRequest.cs create mode 100644 Src/Dlhis.Canteen/Order/Request/GetDishesRequest.cs create mode 100644 Src/Dlhis.Canteen/Order/Request/GetMenuRequest.cs create mode 100644 Src/Dlhis.Canteen/Order/Request/GetMiniProgramOrderRequest.cs create mode 100644 Src/Dlhis.Canteen/Order/Request/SaveDishesRequest.cs create mode 100644 Src/Dlhis.Canteen/Order/Request/SaveMenuRequest.cs create mode 100644 Src/Dlhis.Canteen/Order/Response/GetDetailResponse.cs create mode 100644 Src/Dlhis.Canteen/Order/Response/GetDishesResponse.cs create mode 100644 Src/Dlhis.Canteen/Order/Response/GetMenuResponse.cs create mode 100644 Src/Dlhis.Canteen/Order/Response/GetMiniProgramOrderResponse.cs create mode 100644 Src/Dlhis.Canteen/Order/Services/IMenuDishesService.cs create mode 100644 Src/Dlhis.Canteen/Order/Services/IMiniProgramOrderDetailService.cs create mode 100644 Src/Dlhis.Canteen/Order/Services/Implements/MenuDishesService.cs create mode 100644 Src/Dlhis.Canteen/Order/Services/Implements/MiniProgramOrderDetailService.cs create mode 100644 Src/Dlhis.Entity/Canteen/Enums/ShiftEnumType.cs diff --git a/Src/Dlhis.Canteen/Order/Controllers/MenuDishesController.cs b/Src/Dlhis.Canteen/Order/Controllers/MenuDishesController.cs new file mode 100644 index 00000000..be35ced4 --- /dev/null +++ b/Src/Dlhis.Canteen/Order/Controllers/MenuDishesController.cs @@ -0,0 +1,70 @@ +using Dlhis.Canteen.Order.Request; +using Dlhis.Canteen.Order.Response; +using Dlhis.Canteen.Order.Services; +using Kurisu.Core.DataAccess.Dto; +using Microsoft.AspNetCore.Authorization; +using Microsoft.AspNetCore.Http; +using Microsoft.AspNetCore.Mvc; + +namespace Dlhis.Canteen.Order.Controllers; + +/// +/// 菜单菜品控制器 +/// +[Authorize] +[Route("api/[controller]")] +[ApiController] +public class MenuDishesController : ControllerBase +{ + private readonly IMenuDishesService _menuDishesService; + + public MenuDishesController(IMenuDishesService menuDishesService) + { + _menuDishesService = menuDishesService; + } + + /// + /// 获取菜单 + /// + /// + /// + [HttpGet("pageMenu")] + public async Task> GetMenuAsync([FromQuery]GetMenuRequest request) + { + return await _menuDishesService.GetMenuAsync(request); + } + + /// + /// 菜单保存/更改 + /// + /// + /// + [HttpPost("saveMenu")] + public async Task SaveMenuAsync(SaveMenuRequest request) + { + await _menuDishesService.SaveMenuAsync(request); + } + + /// + /// 获取菜品 + /// + /// + /// + [HttpGet("pageDishes")] + public async Task> GetDishesAsync([FromQuery] GetDishesRequest request) + { + return await _menuDishesService.GetDishesAsync(request); + } + + /// + /// 菜品保存/更改 + /// + /// + /// + [HttpPost("saveDishes")] + public async Task SaveDishesAsync(SaveDishesRequest request) + { + await _menuDishesService.SaveDishesAsync(request); + } +} + diff --git a/Src/Dlhis.Canteen/Order/Controllers/MiniProgramOrderDetailController.cs b/Src/Dlhis.Canteen/Order/Controllers/MiniProgramOrderDetailController.cs new file mode 100644 index 00000000..93d81ee9 --- /dev/null +++ b/Src/Dlhis.Canteen/Order/Controllers/MiniProgramOrderDetailController.cs @@ -0,0 +1,47 @@ +using Dlhis.Canteen.Order.Request; +using Dlhis.Canteen.Order.Response; +using Dlhis.Canteen.Order.Services; +using Kurisu.Core.DataAccess.Dto; +using Microsoft.AspNetCore.Authorization; +using Microsoft.AspNetCore.Http; +using Microsoft.AspNetCore.Mvc; + +namespace Dlhis.Canteen.Order.Controllers; + +/// +///订单/明细控制器 +/// +[Authorize] +[Route("api/[controller]")] +[ApiController] +public class MiniProgramOrderDetailController : ControllerBase +{ + private readonly IMiniProgramOrderDetailService _miniProgramOrderDetailService; + + public MiniProgramOrderDetailController(IMiniProgramOrderDetailService miniProgramOrderDetailService) + { + _miniProgramOrderDetailService = miniProgramOrderDetailService; + } + + /// + /// 订单分页 + /// + /// + /// + [HttpGet("pageOrder")] + public async Task> GetMiniProgramOrderAsync([FromQuery]GetMiniProgramOrderRequest request) + { + return await _miniProgramOrderDetailService.GetMiniProgramOrderAsync(request); + } + + /// + /// 明细分页 + /// + /// + /// + [HttpGet("pageDetail")] + public async Task> GetDetailAsync([FromQuery] GetDetailRequest request) + { + return await _miniProgramOrderDetailService.GetDetailAsync(request); + } +} diff --git a/Src/Dlhis.Canteen/Order/Request/GetDetailRequest.cs b/Src/Dlhis.Canteen/Order/Request/GetDetailRequest.cs new file mode 100644 index 00000000..797deff3 --- /dev/null +++ b/Src/Dlhis.Canteen/Order/Request/GetDetailRequest.cs @@ -0,0 +1,8 @@ +using Kurisu.Core.DataAccess.Dto; + +namespace Dlhis.Canteen.Order.Request +{ + public class GetDetailRequest : PageDto + { + } +} diff --git a/Src/Dlhis.Canteen/Order/Request/GetDishesRequest.cs b/Src/Dlhis.Canteen/Order/Request/GetDishesRequest.cs new file mode 100644 index 00000000..6f741793 --- /dev/null +++ b/Src/Dlhis.Canteen/Order/Request/GetDishesRequest.cs @@ -0,0 +1,9 @@ +using Kurisu.Core.DataAccess.Dto; + +namespace Dlhis.Canteen.Order.Request +{ + public class GetDishesRequest : PageDto + { + public Guid? MenuCode { get; set; } + } +} diff --git a/Src/Dlhis.Canteen/Order/Request/GetMenuRequest.cs b/Src/Dlhis.Canteen/Order/Request/GetMenuRequest.cs new file mode 100644 index 00000000..0d197a5e --- /dev/null +++ b/Src/Dlhis.Canteen/Order/Request/GetMenuRequest.cs @@ -0,0 +1,9 @@ +using Kurisu.Core.DataAccess.Dto; + +namespace Dlhis.Canteen.Order.Request +{ + public class GetMenuRequest : PageDto + { + public Guid? PlaceCode { get; set; } + } +} diff --git a/Src/Dlhis.Canteen/Order/Request/GetMiniProgramOrderRequest.cs b/Src/Dlhis.Canteen/Order/Request/GetMiniProgramOrderRequest.cs new file mode 100644 index 00000000..dbbbdea8 --- /dev/null +++ b/Src/Dlhis.Canteen/Order/Request/GetMiniProgramOrderRequest.cs @@ -0,0 +1,8 @@ +using Kurisu.Core.DataAccess.Dto; + +namespace Dlhis.Canteen.Order.Request +{ + public class GetMiniProgramOrderRequest : PageDto + { + } +} diff --git a/Src/Dlhis.Canteen/Order/Request/SaveDishesRequest.cs b/Src/Dlhis.Canteen/Order/Request/SaveDishesRequest.cs new file mode 100644 index 00000000..1a05a4ba --- /dev/null +++ b/Src/Dlhis.Canteen/Order/Request/SaveDishesRequest.cs @@ -0,0 +1,69 @@ +using Dlhis.Entity.Canteen.Enums; +using SqlSugar.DbConvert; +using SqlSugar; +using System.ComponentModel.DataAnnotations; + +namespace Dlhis.Canteen.Order.Request +{ + public class SaveDishesRequest + { + + public long? Id { get; set; } + + /// + /// 菜单编码 + /// + public Guid MenuCode { get; set; } + + /// + /// 大类 + /// + public string Categories { get; set; } + + /// + /// 小类 + /// + public string SubCategories { get; set; } + + /// + /// 菜品名称 + /// + public string Name { get; set; } + + /// + /// 类型 + /// + [EnumDataType(typeof(CanteenDishesEnumType))] + public CanteenDishesEnumType Type { get; set; } + + /// + /// 描述 + /// + public string Description { get; set; } + + /// + /// 单价 + /// + public decimal Amount { get; set; } + + /// + /// 单位 + /// + public string Unit { get; set; } + + /// + /// 限售份数 + /// + public int RestrictedNum { get; set; } + + /// + /// 图片 + /// + public string Image { get; set; } + + /// + /// 是否启用 + /// + public bool Enable { get; set; } + } +} diff --git a/Src/Dlhis.Canteen/Order/Request/SaveMenuRequest.cs b/Src/Dlhis.Canteen/Order/Request/SaveMenuRequest.cs new file mode 100644 index 00000000..d4420c48 --- /dev/null +++ b/Src/Dlhis.Canteen/Order/Request/SaveMenuRequest.cs @@ -0,0 +1,48 @@ +using Dlhis.Entity.Canteen.Enums; +using Dlhis.Entity.Device.Enums; +using SqlSugar; +using System.ComponentModel.DataAnnotations; + +namespace Dlhis.Canteen.Order.Request +{ + public class SaveMenuRequest + { + public long? Id { get; set; } + + /// + /// 菜单名称 + /// + public string Name { get; set; } + + /// + /// 所属营业点 + /// + [Required] + public Guid PlaceCode { get; set; } + + /// + /// 厂区 + /// + public string Factory { get; set; } + + /// + /// 开始日期 + /// + public DateOnly StartDate { get; set; } + + /// + /// 结束日期 + /// + public DateOnly EndDate { get; set; } + + /// + /// 餐次段 + /// + public List ShiftTypes { get; set; } + + /// + /// 是否启用 + /// + public bool Enable { get; set; } + } +} diff --git a/Src/Dlhis.Canteen/Order/Response/GetDetailResponse.cs b/Src/Dlhis.Canteen/Order/Response/GetDetailResponse.cs new file mode 100644 index 00000000..c20c4f00 --- /dev/null +++ b/Src/Dlhis.Canteen/Order/Response/GetDetailResponse.cs @@ -0,0 +1,66 @@ +using Dlhis.Entity.Canteen.Enums; +using SqlSugar.DbConvert; +using SqlSugar; +using Kurisu.AspNetCore.Utils.Extensions; + +namespace Dlhis.Canteen.Order.Response +{ + public class GetDetailResponse + { + /// + /// 订单号 + /// + public string ThirdNo { get; set; } + + /// + /// 营业日 + /// + public DateOnly BusinessDate { get; set; } + + /// + /// 餐别 + /// + public string ShiftType { get; set; } + + /// + /// 菜品编码 + /// + public Guid DishesCode { get; set; } + + /// + /// 菜品名称 + /// + public Guid DishesName { get; set; } + + /// + /// 单价 + /// + public decimal Price { get; set; } + + /// + /// 单位 + /// + public string Unit { get; set; } + + /// + /// 数量 + /// + public int Num { get; set; } + + /// + /// 金额 + /// + public decimal Amount { get; set; } + + /// + /// 订单明细状态 + /// + public OrderDetailsStatusEnumType OrderStatus { get; set; } + + /// + /// 订单明细状态CN + /// + public string OrderStatusCN => OrderStatus.GetDescription(); + } + +} \ No newline at end of file diff --git a/Src/Dlhis.Canteen/Order/Response/GetDishesResponse.cs b/Src/Dlhis.Canteen/Order/Response/GetDishesResponse.cs new file mode 100644 index 00000000..5b790fd0 --- /dev/null +++ b/Src/Dlhis.Canteen/Order/Response/GetDishesResponse.cs @@ -0,0 +1,75 @@ +using Dlhis.Entity.Canteen.Enums; +using SqlSugar.DbConvert; +using SqlSugar; +using Kurisu.AspNetCore.Utils.Extensions; + +namespace Dlhis.Canteen.Order.Response +{ + public class GetDishesResponse + { + /// + /// 菜单编码 + /// + public Guid MenuCode { get; set; } + + /// + /// 大类 + /// + public string Categories { get; set; } + + /// + /// 小类 + /// + public string SubCategories { get; set; } + + /// + /// 菜品编码 + /// + public Guid Code { get; set; } + + /// + /// 菜品名称 + /// + public string Name { get; set; } + + /// + /// 菜品类型 + /// + public CanteenDishesEnumType Type { get; set; } + + /// + /// 菜品类型描述 + /// + public string TypeDescription => Type.GetDescription(); + + /// + /// 描述 + /// + public string Description { get; set; } + + /// + /// 单价 + /// + public decimal Amount { get; set; } + + /// + /// 单位 + /// + public string Unit { get; set; } + + /// + /// 限售份数 + /// + public int RestrictedNum { get; set; } + + /// + /// 图片 + /// + public string Image { get; set; } + + /// + /// 是否启用 + /// + public bool Enable { get; set; } + } +} diff --git a/Src/Dlhis.Canteen/Order/Response/GetMenuResponse.cs b/Src/Dlhis.Canteen/Order/Response/GetMenuResponse.cs new file mode 100644 index 00000000..06d1d2bc --- /dev/null +++ b/Src/Dlhis.Canteen/Order/Response/GetMenuResponse.cs @@ -0,0 +1,59 @@ +using Dlhis.Entity.Canteen.Enums; +using Kurisu.AspNetCore.Utils.Extensions; + +namespace Dlhis.Canteen.Order.Response +{ + public class GetMenuResponse + { + + /// + /// 菜单编码 + /// + public Guid Code { get; set; } + + /// + /// 菜单名称 + /// + public string Name { get; set; } + + /// + /// 所属营业点 + /// + public Guid PlaceCode { get; set; } + + /// + /// 厂区 + /// + public string Factory { get; set; } + + /// + /// 开始日期 + /// + public DateOnly StartDate { get; set; } + + /// + /// 结束日期 + /// + public DateOnly EndDate { get; set; } + + /// + /// 餐次段 + /// + public List ShiftTypes + { + get + { + if (ShiftTypesSrt.IsEmpty()) ShiftTypesSrt = "[]"; + + return ShiftTypesSrt.ToObject>(); + } + } + + public string ShiftTypesSrt { get; set; } + + /// + /// 是否启用 + /// + public bool Enable { get; set; } + } +} diff --git a/Src/Dlhis.Canteen/Order/Response/GetMiniProgramOrderResponse.cs b/Src/Dlhis.Canteen/Order/Response/GetMiniProgramOrderResponse.cs new file mode 100644 index 00000000..d14f4fcb --- /dev/null +++ b/Src/Dlhis.Canteen/Order/Response/GetMiniProgramOrderResponse.cs @@ -0,0 +1,106 @@ +using Dlhis.Entity.Canteen.Enums; +using SqlSugar.DbConvert; +using SqlSugar; +using Kurisu.AspNetCore.Utils.Extensions; + +namespace Dlhis.Canteen.Order.Response +{ + public class GetMiniProgramOrderResponse + { + /// + /// 订单号 + /// + public string No { get; set; } + + /// + /// 姓名 + /// + public string Name { get; set; } + + /// + /// 工号 + /// + public string Code { get; set; } + + /// + /// 人事范围 + /// + public string Werks { get; set; } + + /// + /// 部门编码 + /// + public string DepartmentNo { get; set; } + + /// + /// 成本中心 + /// + public string CostId { get; set; } + + /// + /// 工作地 + /// + public string Workplace { get; set; } + + /// + /// 厂区 + /// + public string Factory { get; set; } + + /// + /// 营业点 + /// + public Guid PlaceCode { get; set; } + + /// + /// 餐次 + /// + public string ShiftType { get; set; } + + /// + /// 菜品 + /// + public Guid DishesCode { get; set; } + + /// + /// 手机号码 + /// + public string Phone { get; set; } + + /// + /// 用餐日期 + /// + public DateOnly SysDate { get; set; } + + /// + /// 下单时间 + /// + public DateTime CostDate { get; set; } + + /// + /// 支付方式 + /// + public CanteenPayEnumType PayType { get; set; } + + /// + /// 支付方式CN + /// + public string PayTypeCN => PayType.GetDescription(); + + /// + /// 订单状态 + /// + public MiniProgramOrderStatusEnumType OrderStatus { get; set; } + + /// + /// 订单状态CN + /// + public string OrderStatusCN => OrderStatus.GetDescription(); + + /// + /// 总金额 + /// + public decimal TotalAmount { get; set; } + +} +} diff --git a/Src/Dlhis.Canteen/Order/Services/IMenuDishesService.cs b/Src/Dlhis.Canteen/Order/Services/IMenuDishesService.cs new file mode 100644 index 00000000..63e2a697 --- /dev/null +++ b/Src/Dlhis.Canteen/Order/Services/IMenuDishesService.cs @@ -0,0 +1,18 @@ +using Dlhis.Canteen.Order.Request; +using Dlhis.Canteen.Order.Response; +using Kurisu.Core.DataAccess.Dto; +using Microsoft.AspNetCore.Mvc; + +namespace Dlhis.Canteen.Order.Services +{ + public interface IMenuDishesService :IScopeDependency + { + Task> GetMenuAsync(GetMenuRequest request); + + Task SaveMenuAsync(SaveMenuRequest request); + + Task> GetDishesAsync(GetDishesRequest request); + + Task SaveDishesAsync(SaveDishesRequest request); + } +} diff --git a/Src/Dlhis.Canteen/Order/Services/IMiniProgramOrderDetailService.cs b/Src/Dlhis.Canteen/Order/Services/IMiniProgramOrderDetailService.cs new file mode 100644 index 00000000..1fb11cd4 --- /dev/null +++ b/Src/Dlhis.Canteen/Order/Services/IMiniProgramOrderDetailService.cs @@ -0,0 +1,14 @@ +using Dlhis.Canteen.Order.Request; +using Dlhis.Canteen.Order.Response; +using Kurisu.Core.DataAccess.Dto; +using Microsoft.AspNetCore.Mvc; + +namespace Dlhis.Canteen.Order.Services +{ + public interface IMiniProgramOrderDetailService : IScopeDependency + { + Task> GetMiniProgramOrderAsync(GetMiniProgramOrderRequest request); + + Task> GetDetailAsync( GetDetailRequest request); + } +} diff --git a/Src/Dlhis.Canteen/Order/Services/Implements/MenuDishesService.cs b/Src/Dlhis.Canteen/Order/Services/Implements/MenuDishesService.cs new file mode 100644 index 00000000..ca06fee2 --- /dev/null +++ b/Src/Dlhis.Canteen/Order/Services/Implements/MenuDishesService.cs @@ -0,0 +1,93 @@ +using Dlhis.Canteen.Order.Request; +using Dlhis.Canteen.Order.Response; +using Dlhis.Entity.Basic.Entity; +using Dlhis.Entity.Canteen.Entities; +using Kurisu.AspNetCore.Utils.Extensions; +using Kurisu.Core.DataAccess.Dto; +using Kurisu.Core.User.Abstractions; +using Kurisu.SqlSugar.Extensions; +using Kurisu.SqlSugar.Services; +using Mapster; + +namespace Dlhis.Canteen.Order.Services.Implements +{ + public class MenuDishesService : IMenuDishesService + { + private readonly IDbContext _dbContext; + private readonly ICurrentUser _currentUser; + + public MenuDishesService(IDbContext dbContext, ICurrentUser currentUser) + { + _dbContext = dbContext; + _currentUser = currentUser; + } + + public async Task> GetMenuAsync(GetMenuRequest request) + { + var currentTenantId = _currentUser.GetStringTenantId(); + + var page = await _dbContext.Queryable() + .Where(x => x.Factory == currentTenantId) + .WhereIF(request.PlaceCode.HasValue, x => request.PlaceCode == x.PlaceCode) + .WhereIF(!request.Search.IsEmpty(),x => x.Name.Contains(request.Search)) + .Select(x => new GetMenuResponse + { + ShiftTypesSrt = x.ShiftTypes.ToString(), + },true) + .ToPageListAsync(request); + return page; + } + + public async Task SaveMenuAsync(SaveMenuRequest request) + { + var place = await _dbContext.Queryable() + .FirstAsync(x => x.Code == request.PlaceCode); + place.ThrowIfNull($"{request.PlaceCode}:该营业点不存在！"); + + if (!request.Id.HasValue) + { + var entity = request.Adapt(); + entity.Code = Guid.NewGuid(); + await _dbContext.InsertAsync(entity); + } + else + { + var entity = await _dbContext.Queryable() + .Where(x => x.Id == request.Id).FirstAsync(); + request.Adapt(entity); + await _dbContext.UpdateAsync(entity); + } + } + + public async Task> GetDishesAsync(GetDishesRequest request) + { + var page = await _dbContext.Queryable() + .WhereIF(request.MenuCode.HasValue, x => request.MenuCode == x.MenuCode) + .WhereIF(!request.Search.IsEmpty(),x => x.Name.Contains(request.Search)) + .Select() + .ToPageListAsync(request); + return page; + } + + public async Task SaveDishesAsync(SaveDishesRequest request) + { + var menu = await _dbContext.Queryable() + .FirstAsync(x => x.Code == request.MenuCode); + menu.ThrowIfNull($"{request.MenuCode}:该菜单不存在！"); + + if (!request.Id.HasValue) + { + var dishers = request.Adapt(); + dishers.Code = Guid.NewGuid(); + await _dbContext.InsertAsync(dishers); + } + else + { + var entity = await _dbContext.Queryable() + .Where(x => x.Id == request.Id).FirstAsync(); + request.Adapt(entity); + await _dbContext.UpdateAsync(entity); + } + } + } +} diff --git a/Src/Dlhis.Canteen/Order/Services/Implements/MiniProgramOrderDetailService.cs b/Src/Dlhis.Canteen/Order/Services/Implements/MiniProgramOrderDetailService.cs new file mode 100644 index 00000000..1235e705 --- /dev/null +++ b/Src/Dlhis.Canteen/Order/Services/Implements/MiniProgramOrderDetailService.cs @@ -0,0 +1,39 @@ +using Dlhis.Canteen.Order.Request; +using Dlhis.Canteen.Order.Response; +using Dlhis.Entity.Canteen.Entities; +using Kurisu.AspNetCore.Utils.Extensions; +using Kurisu.Core.DataAccess.Dto; +using Kurisu.SqlSugar.Extensions; +using Kurisu.SqlSugar.Services; +using Microsoft.AspNetCore.Mvc; + +namespace Dlhis.Canteen.Order.Services.Implements; + +public class MiniProgramOrderDetailService : IMiniProgramOrderDetailService +{ + private readonly IDbContext _dbContext; + + public MiniProgramOrderDetailService(IDbContext dbContext) + { + _dbContext = dbContext; + } + + public async Task> GetMiniProgramOrderAsync(GetMiniProgramOrderRequest request) + { + var page = await _dbContext.Queryable() + .WhereIF(!request.Search.IsEmpty(), x => x.Name == request.Search || x.Code == request.Search) + .Select() + .ToPageListAsync(request); + return page; + } + + public async Task> GetDetailAsync(GetDetailRequest request) + { + var page = await _dbContext.Queryable() + .WhereIF(!request.Search.IsEmpty(),x => x.ThirdNo == request.Search) + .Select() + .ToPageListAsync(request); + + return page; + } +} diff --git a/Src/Dlhis.Entity/Canteen/Entities/CanteenMenuEntity.cs b/Src/Dlhis.Entity/Canteen/Entities/CanteenMenuEntity.cs index 1973fecd..2c8501ba 100644 --- a/Src/Dlhis.Entity/Canteen/Entities/CanteenMenuEntity.cs +++ b/Src/Dlhis.Entity/Canteen/Entities/CanteenMenuEntity.cs @@ -1,4 +1,6 @@ -using Kurisu.SqlSugar; +using Dlhis.Entity.Canteen.Enums; +using Dlhis.Entity.Device.Enums; +using Kurisu.SqlSugar; using SqlSugar; using System; using System.Collections.Generic; @@ -54,8 +56,8 @@ public class CanteenMenuEntity : SugarBaseEntity /// /// 餐次段 /// - [SugarColumn(ColumnDescription = "餐次段", IsNullable = true)] - public List ShiftTypes { get; set; } + [SugarColumn(ColumnDataType = "varchar(150)", IsJson = true, ColumnDescription = "餐次段", DefaultValue = "[]")] + public List ShiftTypes { get; set; } /// /// 是否启用 diff --git a/Src/Dlhis.Entity/Canteen/Entities/MiniProgramOrderEntity.cs b/Src/Dlhis.Entity/Canteen/Entities/MiniProgramOrderEntity.cs index 4efab394..8a007704 100644 --- a/Src/Dlhis.Entity/Canteen/Entities/MiniProgramOrderEntity.cs +++ b/Src/Dlhis.Entity/Canteen/Entities/MiniProgramOrderEntity.cs @@ -2,11 +2,6 @@ using Kurisu.SqlSugar; using SqlSugar; using SqlSugar.DbConvert; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; namespace Dlhis.Entity.Canteen.Entities { @@ -49,6 +44,7 @@ namespace Dlhis.Entity.Canteen.Entities /// /// 成本中心 /// + [SugarColumn(ColumnDescription = "成本中心")] public string CostId { get; set; } /// diff --git a/Src/Dlhis.Entity/Canteen/Enums/ShiftEnumType.cs b/Src/Dlhis.Entity/Canteen/Enums/ShiftEnumType.cs new file mode 100644 index 00000000..d760412a --- /dev/null +++ b/Src/Dlhis.Entity/Canteen/Enums/ShiftEnumType.cs @@ -0,0 +1,41 @@ +using System.ComponentModel; + +namespace Dlhis.Entity.Canteen.Enums +{ + /// + /// 餐次 + /// + [Description("餐次")] + public enum ShiftEnumType + { + /// + /// 早餐 + /// + [Description("早餐")] + Breakfast = 1, + + /// + /// 午餐 + /// + [Description("午餐")] + Lunch = 2, + + /// + /// 晚餐 + /// + [Description("晚餐")] + Dinner = 3, + + /// + /// 宵夜 + /// + [Description("宵夜")] + Nightsnack = 4, + + /// + /// 凌晨餐 + /// + [Description("凌晨餐")] + Midnightsnack = 5, + } +} \ No newline at end of file