From 5fe4104ff6af460f6cd1f1321580dab57457875b Mon Sep 17 00:00:00 2001 From: liguoyang Date: Mon, 18 Mar 2024 11:03:43 +0800 Subject: [PATCH] =?UTF-8?q?fix=20=E6=8F=90=E4=BA=A4=E5=8F=AF=E7=BC=96?= =?UTF-8?q?=E8=AF=91=E7=89=88=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Order/Controllers/BalancesController.cs | 5 +- .../Order/Controllers/MenuDishesController.cs | 81 -------- .../MiniProgramOrderDetailController.cs | 69 ------- .../Order/Controllers/OrdersController.cs | 40 +++- .../CheckUserDeviceConsumeAttribute.cs | 14 -- .../Request/BalanceRecordAnalysisRequest.cs | 1 - .../Request/BalanceRecordObsoluteRequest.cs | 2 +- .../BalanceRecordPageByCostIdRequest.cs | 2 +- ...alanceRecordPageByDeviceUniqueNoRequest.cs | 2 +- .../BalanceRecordPageDetailsRequest.cs | 2 +- .../Order/Request/BalanceRecordPageRequest.cs | 6 +- .../Request/BalanceRecordSummaryRequest.cs | 2 +- .../Request/BalanceRecordUserPageRequest.cs | 2 +- .../Order/Request/BookingMealRequest.cs | 46 +++++ .../Order/Request/ConsumeRequest.cs | 2 +- .../Order/Request/ConsumptionTrendRequest.cs | 2 +- .../Order/Request/DispositionDeviceRequest.cs | 9 - .../Order/Request/DispositionDishesDto.cs | 10 - .../Order/Request/DispositionDishesRequest.cs | 10 - .../Order/Request/GetConsumeDeviceRequest.cs | 9 +- .../Order/Request/GetDetailRequest.cs | 8 - .../Order/Request/GetDishesRequest.cs | 9 - .../Order/Request/GetMenuRequest.cs | 11 -- .../Request/GetMiniProgramOrderRequest.cs | 8 - .../Request/OaEMealVoucherDetailRequest.cs | 2 +- .../Order/Request/OaEMealVoucherRequest.cs | 2 +- .../Order/Request/OrderPageRequest.cs | 2 +- .../Order/Request/OrderRequest.cs | 50 ----- .../Order/Request/RechargeRequest.cs | 2 +- .../Order/Request/SaveDishesRequest.cs | 51 ----- .../Order/Request/SaveMenuRequest.cs | 39 ---- .../Order/Request/SpendingDetailRequest.cs | 2 +- .../Order/Response/AverageDailyResponse.cs | 39 ++-- .../Response/BalanceRecordAnalysisRespones.cs | 4 +- .../Order/Response/GetDetailResponse.cs | 106 +++++----- .../Order/Response/GetDishesResponse.cs | 68 ------- .../Order/Response/GetMenuResponse.cs | 60 ------ .../Response/GetMiniProgramOrderResponse.cs | 187 +++++++++--------- .../Order/Response/OaEMealVoucherResponse.cs | 153 +++++++------- .../Order/Response/SpendingDetailResponse.cs | 55 +++--- .../Order/Services/IBalanceService.cs | 3 +- .../Order/Services/IMenuDishesService.cs | 17 -- .../IMiniProgramOrderDetailService.cs | 18 -- .../Order/Services/IOrderService.cs | 16 +- .../Services/Implements/BalanceService.cs | 169 ++++++---------- .../Services/Implements/MenuDishesService.cs | 74 ------- .../MiniProgramOrderDetailService.cs | 177 ----------------- .../Order/Services/Implements/OrderService.cs | 144 ++++++++++++-- .../Order/TimePeriodExtensions.cs | 2 +- Src/Dlhis.Canteen/Program.cs | 10 + .../Implements/CanteenSettingService.cs | 67 ++++--- Src/Dlhis.Canteen/SqlSugarPack.cs | 104 +--------- .../Entities/MiniProgramOrderEntity.cs | 114 ----------- ...rDetailsEntity.cs => OrderDetailEntity.cs} | 7 +- .../Enums/OrderDetailsStatusEnumType.cs | 9 +- 55 files changed, 629 insertions(+), 1476 deletions(-) delete mode 100644 Src/Dlhis.Canteen/Order/Controllers/MenuDishesController.cs delete mode 100644 Src/Dlhis.Canteen/Order/Controllers/MiniProgramOrderDetailController.cs delete mode 100644 Src/Dlhis.Canteen/Order/Filters/CheckUserDeviceConsumeAttribute.cs create mode 100644 Src/Dlhis.Canteen/Order/Request/BookingMealRequest.cs delete mode 100644 Src/Dlhis.Canteen/Order/Request/DispositionDeviceRequest.cs delete mode 100644 Src/Dlhis.Canteen/Order/Request/DispositionDishesDto.cs delete mode 100644 Src/Dlhis.Canteen/Order/Request/DispositionDishesRequest.cs delete mode 100644 Src/Dlhis.Canteen/Order/Request/GetDetailRequest.cs delete mode 100644 Src/Dlhis.Canteen/Order/Request/GetDishesRequest.cs delete mode 100644 Src/Dlhis.Canteen/Order/Request/GetMenuRequest.cs delete mode 100644 Src/Dlhis.Canteen/Order/Request/GetMiniProgramOrderRequest.cs delete mode 100644 Src/Dlhis.Canteen/Order/Request/OrderRequest.cs delete mode 100644 Src/Dlhis.Canteen/Order/Request/SaveDishesRequest.cs delete mode 100644 Src/Dlhis.Canteen/Order/Request/SaveMenuRequest.cs delete mode 100644 Src/Dlhis.Canteen/Order/Response/GetDishesResponse.cs delete mode 100644 Src/Dlhis.Canteen/Order/Response/GetMenuResponse.cs delete mode 100644 Src/Dlhis.Canteen/Order/Services/IMenuDishesService.cs delete mode 100644 Src/Dlhis.Canteen/Order/Services/IMiniProgramOrderDetailService.cs delete mode 100644 Src/Dlhis.Canteen/Order/Services/Implements/MenuDishesService.cs delete mode 100644 Src/Dlhis.Canteen/Order/Services/Implements/MiniProgramOrderDetailService.cs delete mode 100644 Src/Dlhis.Entity/Canteen/Entities/MiniProgramOrderEntity.cs rename Src/Dlhis.Entity/Canteen/Entities/{OrderDetailsEntity.cs => OrderDetailEntity.cs} (84%) diff --git a/Src/Dlhis.Canteen/Order/Controllers/BalancesController.cs b/Src/Dlhis.Canteen/Order/Controllers/BalancesController.cs index 796f8e44..317fbe83 100644 --- a/Src/Dlhis.Canteen/Order/Controllers/BalancesController.cs +++ b/Src/Dlhis.Canteen/Order/Controllers/BalancesController.cs @@ -1,4 +1,5 @@ -using Dlhis.Canteen.Order.Request; +using Dlhis.Canteen.Dishes.Request; +using Dlhis.Canteen.Order.Request; using Dlhis.Canteen.Order.Response; using Dlhis.Canteen.Order.Services; using Kurisu.AspNetCore.DataAccess.SqlSugar.Aop; @@ -6,7 +7,7 @@ using Kurisu.Core.DataAccess.Dto; using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Mvc; -namespace Dlhis.Canteen.Order.Controllers; +namespace Dlhis.Canteen.Dishes.Controllers; /// /// 充值/消费 diff --git a/Src/Dlhis.Canteen/Order/Controllers/MenuDishesController.cs b/Src/Dlhis.Canteen/Order/Controllers/MenuDishesController.cs deleted file mode 100644 index b6ecc0d5..00000000 --- a/Src/Dlhis.Canteen/Order/Controllers/MenuDishesController.cs +++ /dev/null @@ -1,81 +0,0 @@ -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); - } - - /// - /// 配置每日菜单菜品及限售 - /// - /// - /// - [HttpPost("disposition")] - public async Task DispositionDishesAsync(DispositionDishesRequest request) - { - await _menuDishesService.DispositionDishesAsync(request); - } -} - diff --git a/Src/Dlhis.Canteen/Order/Controllers/MiniProgramOrderDetailController.cs b/Src/Dlhis.Canteen/Order/Controllers/MiniProgramOrderDetailController.cs deleted file mode 100644 index e26efc4b..00000000 --- a/Src/Dlhis.Canteen/Order/Controllers/MiniProgramOrderDetailController.cs +++ /dev/null @@ -1,69 +0,0 @@ -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); - } - - - /// - /// 明细保存 - /// - /// - /// - [HttpPost("saveDetail")] - public async Task SaveDetailAsync(SaveDetailRequest request) - { - await _miniProgramOrderDetailService.SaveDetailAsync(request); - } - - /// - /// 明细分页 - /// - /// - /// - [HttpGet("pageDetail")] - public async Task> GetDetailAsync([FromQuery] GetDetailRequest request) - { - return await _miniProgramOrderDetailService.GetDetailAsync(request); - } - - /// - /// 下单 - /// - /// - [HttpPost("order")] - public async Task OrderAsync(OrderRequest request) - { - await _miniProgramOrderDetailService.OrderAsync(request); - } -} diff --git a/Src/Dlhis.Canteen/Order/Controllers/OrdersController.cs b/Src/Dlhis.Canteen/Order/Controllers/OrdersController.cs index da3d8d38..9d0f7b96 100644 --- a/Src/Dlhis.Canteen/Order/Controllers/OrdersController.cs +++ b/Src/Dlhis.Canteen/Order/Controllers/OrdersController.cs @@ -1,11 +1,13 @@ -using Dlhis.Canteen.Order.Request; +using Dlhis.Canteen.Dishes.Request; +using Dlhis.Canteen.Order.Request; using Dlhis.Canteen.Order.Response; using Dlhis.Canteen.Order.Services; +using Kurisu.AspNetCore.DataAccess.SqlSugar.Aop; using Kurisu.Core.DataAccess.Dto; using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Mvc; -namespace Dlhis.Canteen.Order.Controllers; +namespace Dlhis.Canteen.Dishes.Controllers; /// /// 订单 @@ -44,4 +46,38 @@ public class OrdersController : ControllerBase { return await _orderService.AddAsync(request); } + + /// + /// 设备发起订单 + /// + /// + /// + [HttpPost("device")] + [IgnoreTenant] + public async Task DeviceConsume(OrderAddRequest request) + { + return await _orderService.AddAsync(request); + } + + + /// + /// 订餐 + /// + /// + [IgnoreTenant] + [HttpPost("booking")] + public async Task Booking(BookingMealRequest request) + { + await _orderService.Booking(request); + } + + /// + /// 充值 + /// + /// + [HttpPost("recharge")] + public async Task ReCharge() + { + + } } diff --git a/Src/Dlhis.Canteen/Order/Filters/CheckUserDeviceConsumeAttribute.cs b/Src/Dlhis.Canteen/Order/Filters/CheckUserDeviceConsumeAttribute.cs deleted file mode 100644 index 8f8cd8a8..00000000 --- a/Src/Dlhis.Canteen/Order/Filters/CheckUserDeviceConsumeAttribute.cs +++ /dev/null @@ -1,14 +0,0 @@ -//using Microsoft.AspNetCore.Mvc.Filters; - -//namespace Dlhis.Canteen.Order.Filters; - -///// -///// 检查用户设备消费 -///// -//public class CheckUserDeviceConsumeAttribute : IAsyncActionFilter -//{ -// public Task OnActionExecutionAsync(ActionExecutingContext context, ActionExecutionDelegate next) -// { - -// } -//} diff --git a/Src/Dlhis.Canteen/Order/Request/BalanceRecordAnalysisRequest.cs b/Src/Dlhis.Canteen/Order/Request/BalanceRecordAnalysisRequest.cs index ca02c0a9..9fe8e693 100644 --- a/Src/Dlhis.Canteen/Order/Request/BalanceRecordAnalysisRequest.cs +++ b/Src/Dlhis.Canteen/Order/Request/BalanceRecordAnalysisRequest.cs @@ -1,5 +1,4 @@ using Kurisu.Core.DataAccess.Dto; -using SqlSugar; namespace Dlhis.Canteen.Order.Request { diff --git a/Src/Dlhis.Canteen/Order/Request/BalanceRecordObsoluteRequest.cs b/Src/Dlhis.Canteen/Order/Request/BalanceRecordObsoluteRequest.cs index aa9dba9b..955b7aaa 100644 --- a/Src/Dlhis.Canteen/Order/Request/BalanceRecordObsoluteRequest.cs +++ b/Src/Dlhis.Canteen/Order/Request/BalanceRecordObsoluteRequest.cs @@ -1,6 +1,6 @@ using System.ComponentModel.DataAnnotations; -namespace Dlhis.Canteen.Order.Request; +namespace Dlhis.Canteen.Dishes.Request; public class BalanceRecordObsoluteRequest { diff --git a/Src/Dlhis.Canteen/Order/Request/BalanceRecordPageByCostIdRequest.cs b/Src/Dlhis.Canteen/Order/Request/BalanceRecordPageByCostIdRequest.cs index c3660023..5ff829c8 100644 --- a/Src/Dlhis.Canteen/Order/Request/BalanceRecordPageByCostIdRequest.cs +++ b/Src/Dlhis.Canteen/Order/Request/BalanceRecordPageByCostIdRequest.cs @@ -1,7 +1,7 @@ using Kurisu.Core.DataAccess.Dto; using System.ComponentModel.DataAnnotations; -namespace Dlhis.Canteen.Order.Request +namespace Dlhis.Canteen.Dishes.Request { public class BalanceRecordPageByCostIdRequest :PageDto { diff --git a/Src/Dlhis.Canteen/Order/Request/BalanceRecordPageByDeviceUniqueNoRequest.cs b/Src/Dlhis.Canteen/Order/Request/BalanceRecordPageByDeviceUniqueNoRequest.cs index ef9f89d1..ff402cb9 100644 --- a/Src/Dlhis.Canteen/Order/Request/BalanceRecordPageByDeviceUniqueNoRequest.cs +++ b/Src/Dlhis.Canteen/Order/Request/BalanceRecordPageByDeviceUniqueNoRequest.cs @@ -1,7 +1,7 @@ using System.ComponentModel.DataAnnotations; using Kurisu.Core.DataAccess.Dto; -namespace Dlhis.Canteen.Order.Request; +namespace Dlhis.Canteen.Dishes.Request; public class BalanceRecordPageByDeviceUniqueNoRequest : PageDto { diff --git a/Src/Dlhis.Canteen/Order/Request/BalanceRecordPageDetailsRequest.cs b/Src/Dlhis.Canteen/Order/Request/BalanceRecordPageDetailsRequest.cs index 781776a5..597babea 100644 --- a/Src/Dlhis.Canteen/Order/Request/BalanceRecordPageDetailsRequest.cs +++ b/Src/Dlhis.Canteen/Order/Request/BalanceRecordPageDetailsRequest.cs @@ -4,7 +4,7 @@ using SqlSugar; using SqlSugar.DbConvert; using System.ComponentModel.DataAnnotations; -namespace Dlhis.Canteen.Order.Request +namespace Dlhis.Canteen.Dishes.Request { public class BalanceRecordPageDetailsRequest : PageDto { diff --git a/Src/Dlhis.Canteen/Order/Request/BalanceRecordPageRequest.cs b/Src/Dlhis.Canteen/Order/Request/BalanceRecordPageRequest.cs index a456f22a..aa6b048c 100644 --- a/Src/Dlhis.Canteen/Order/Request/BalanceRecordPageRequest.cs +++ b/Src/Dlhis.Canteen/Order/Request/BalanceRecordPageRequest.cs @@ -2,10 +2,8 @@ using System.ComponentModel.DataAnnotations; using Kurisu.Core.DataAccess.Dto; using Kurisu.Core.CustomClass; -using SqlSugar.DbConvert; -using SqlSugar; -namespace Dlhis.Canteen.Order.Request; +namespace Dlhis.Canteen.Dishes.Request; public class BalanceRecordPageRequest : PageDto, IValidatableObject { @@ -17,7 +15,7 @@ public class BalanceRecordPageRequest : PageDto, IValidatableObject /// /// 餐次 /// - public List ShiftTypes { get; set; } + public List ShiftTypes { get; set; } /// /// 充值/消费 diff --git a/Src/Dlhis.Canteen/Order/Request/BalanceRecordSummaryRequest.cs b/Src/Dlhis.Canteen/Order/Request/BalanceRecordSummaryRequest.cs index e0c54589..1bd4c913 100644 --- a/Src/Dlhis.Canteen/Order/Request/BalanceRecordSummaryRequest.cs +++ b/Src/Dlhis.Canteen/Order/Request/BalanceRecordSummaryRequest.cs @@ -1,7 +1,7 @@ using Kurisu.Core.DataAccess.Dto; using System.ComponentModel.DataAnnotations; -namespace Dlhis.Canteen.Order.Request +namespace Dlhis.Canteen.Dishes.Request { public class BalanceRecordSummaryRequest : PageDto { diff --git a/Src/Dlhis.Canteen/Order/Request/BalanceRecordUserPageRequest.cs b/Src/Dlhis.Canteen/Order/Request/BalanceRecordUserPageRequest.cs index aed5e86e..719f7e3f 100644 --- a/Src/Dlhis.Canteen/Order/Request/BalanceRecordUserPageRequest.cs +++ b/Src/Dlhis.Canteen/Order/Request/BalanceRecordUserPageRequest.cs @@ -3,7 +3,7 @@ using Kurisu.Core.CustomClass; using System.ComponentModel.DataAnnotations; using Kurisu.Core.DataAccess.Dto; -namespace Dlhis.Canteen.Order.Request +namespace Dlhis.Canteen.Dishes.Request { public class BalanceRecordUserPageRequest : PageDto, IValidatableObject { diff --git a/Src/Dlhis.Canteen/Order/Request/BookingMealRequest.cs b/Src/Dlhis.Canteen/Order/Request/BookingMealRequest.cs new file mode 100644 index 00000000..d9649ab1 --- /dev/null +++ b/Src/Dlhis.Canteen/Order/Request/BookingMealRequest.cs @@ -0,0 +1,46 @@ +using System.ComponentModel.DataAnnotations; +using Dlhis.Entity.Canteen.Enums; + +namespace Dlhis.Canteen.Dishes.Request; + +/// +/// 订餐请求 +/// +public class BookingMealRequest : IValidatableObject +{ + /// + /// 订餐的日期 + /// + public DateTime BookingDate { get; set; } + + /// + /// 营业点/消费地点 + /// + public Guid BusinessPlaceCode { get; set; } + + /// + /// 餐次 + /// + [EnumDataType(typeof(ShiftEnumType))] + public ShiftEnumType ShiftType { get; set; } + + /// + /// 菜品编码 + /// + [Required(ErrorMessage = "选菜不能为空")] + public string DishesCode { get; set; } + + /// + /// 消费来源 + /// + [EnumDataType(typeof(BalanceRecordSourceEnumType))] + public BalanceRecordSourceEnumType Source { get; set; } + + + public IEnumerable Validate(ValidationContext validationContext) + { + BookingDate = BookingDate.Date; + + yield break; + } +} diff --git a/Src/Dlhis.Canteen/Order/Request/ConsumeRequest.cs b/Src/Dlhis.Canteen/Order/Request/ConsumeRequest.cs index 87159bb6..827f4ef7 100644 --- a/Src/Dlhis.Canteen/Order/Request/ConsumeRequest.cs +++ b/Src/Dlhis.Canteen/Order/Request/ConsumeRequest.cs @@ -1,6 +1,6 @@ using Dlhis.Entity.Canteen.Enums; -namespace Dlhis.Canteen.Order.Request; +namespace Dlhis.Canteen.Dishes.Request; public class ConsumeRequest { diff --git a/Src/Dlhis.Canteen/Order/Request/ConsumptionTrendRequest.cs b/Src/Dlhis.Canteen/Order/Request/ConsumptionTrendRequest.cs index 7f223506..d87a3ff3 100644 --- a/Src/Dlhis.Canteen/Order/Request/ConsumptionTrendRequest.cs +++ b/Src/Dlhis.Canteen/Order/Request/ConsumptionTrendRequest.cs @@ -1,7 +1,7 @@ using Dlhis.Entity.Canteen.Enums; using System.ComponentModel.DataAnnotations; -namespace Dlhis.Canteen.Order.Request +namespace Dlhis.Canteen.Dishes.Request { public class ConsumptionTrendRequest { diff --git a/Src/Dlhis.Canteen/Order/Request/DispositionDeviceRequest.cs b/Src/Dlhis.Canteen/Order/Request/DispositionDeviceRequest.cs deleted file mode 100644 index aa76e8c5..00000000 --- a/Src/Dlhis.Canteen/Order/Request/DispositionDeviceRequest.cs +++ /dev/null @@ -1,9 +0,0 @@ -namespace Dlhis.Canteen.Order.Request -{ - public class DispositionDeviceRequest - { - public string PlaceCode { get; set; } - - public List UniqueNos { get; set; } - } -} diff --git a/Src/Dlhis.Canteen/Order/Request/DispositionDishesDto.cs b/Src/Dlhis.Canteen/Order/Request/DispositionDishesDto.cs deleted file mode 100644 index c2abba2b..00000000 --- a/Src/Dlhis.Canteen/Order/Request/DispositionDishesDto.cs +++ /dev/null @@ -1,10 +0,0 @@ -namespace Dlhis.Canteen.Order.Request -{ - public class DispositionDishesDto - { - public string DisherCode { get; set; } - - public int RestrictedNum { get; set; } - - } -} diff --git a/Src/Dlhis.Canteen/Order/Request/DispositionDishesRequest.cs b/Src/Dlhis.Canteen/Order/Request/DispositionDishesRequest.cs deleted file mode 100644 index 070e8c42..00000000 --- a/Src/Dlhis.Canteen/Order/Request/DispositionDishesRequest.cs +++ /dev/null @@ -1,10 +0,0 @@ -namespace Dlhis.Canteen.Order.Request -{ - public class DispositionDishesRequest - { - public Guid MenudCode { get; set; } - - public List DishersDtos { get; set; } - - } -} diff --git a/Src/Dlhis.Canteen/Order/Request/GetConsumeDeviceRequest.cs b/Src/Dlhis.Canteen/Order/Request/GetConsumeDeviceRequest.cs index ee74d2fb..03407004 100644 --- a/Src/Dlhis.Canteen/Order/Request/GetConsumeDeviceRequest.cs +++ b/Src/Dlhis.Canteen/Order/Request/GetConsumeDeviceRequest.cs @@ -1,9 +1,8 @@ using Kurisu.Core.DataAccess.Dto; -namespace Dlhis.Canteen.Order.Request +namespace Dlhis.Canteen.Dishes.Request; + +public class GetConsumeDeviceRequest : PageDto { - public class GetConsumeDeviceRequest : PageDto - { - public bool IsOff { get; set; } - } + public bool IsOff { get; set; } } diff --git a/Src/Dlhis.Canteen/Order/Request/GetDetailRequest.cs b/Src/Dlhis.Canteen/Order/Request/GetDetailRequest.cs deleted file mode 100644 index 797deff3..00000000 --- a/Src/Dlhis.Canteen/Order/Request/GetDetailRequest.cs +++ /dev/null @@ -1,8 +0,0 @@ -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 deleted file mode 100644 index 6f741793..00000000 --- a/Src/Dlhis.Canteen/Order/Request/GetDishesRequest.cs +++ /dev/null @@ -1,9 +0,0 @@ -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 deleted file mode 100644 index 8f9c6b55..00000000 --- a/Src/Dlhis.Canteen/Order/Request/GetMenuRequest.cs +++ /dev/null @@ -1,11 +0,0 @@ -using Kurisu.Core.DataAccess.Dto; - -namespace Dlhis.Canteen.Order.Request -{ - public class GetMenuRequest : PageDto - { - public Guid? PlaceCode { get; set; } - - public string Factory { get; set; } - } -} diff --git a/Src/Dlhis.Canteen/Order/Request/GetMiniProgramOrderRequest.cs b/Src/Dlhis.Canteen/Order/Request/GetMiniProgramOrderRequest.cs deleted file mode 100644 index dbbbdea8..00000000 --- a/Src/Dlhis.Canteen/Order/Request/GetMiniProgramOrderRequest.cs +++ /dev/null @@ -1,8 +0,0 @@ -using Kurisu.Core.DataAccess.Dto; - -namespace Dlhis.Canteen.Order.Request -{ - public class GetMiniProgramOrderRequest : PageDto - { - } -} diff --git a/Src/Dlhis.Canteen/Order/Request/OaEMealVoucherDetailRequest.cs b/Src/Dlhis.Canteen/Order/Request/OaEMealVoucherDetailRequest.cs index 1a4d504b..75ce0571 100644 --- a/Src/Dlhis.Canteen/Order/Request/OaEMealVoucherDetailRequest.cs +++ b/Src/Dlhis.Canteen/Order/Request/OaEMealVoucherDetailRequest.cs @@ -1,6 +1,6 @@ using Kurisu.Core.DataAccess.Dto; -namespace Dlhis.Canteen.Order.Request +namespace Dlhis.Canteen.Dishes.Request { public class OaEMealVoucherDetailRequest : PageDto { diff --git a/Src/Dlhis.Canteen/Order/Request/OaEMealVoucherRequest.cs b/Src/Dlhis.Canteen/Order/Request/OaEMealVoucherRequest.cs index a77865a7..ae1ffa86 100644 --- a/Src/Dlhis.Canteen/Order/Request/OaEMealVoucherRequest.cs +++ b/Src/Dlhis.Canteen/Order/Request/OaEMealVoucherRequest.cs @@ -2,7 +2,7 @@ using Kurisu.Core.DataAccess.Dto; using System.ComponentModel.DataAnnotations; -namespace Dlhis.Canteen.Order.Request +namespace Dlhis.Canteen.Dishes.Request { public class OaEMealVoucherRequest : PageDto { diff --git a/Src/Dlhis.Canteen/Order/Request/OrderPageRequest.cs b/Src/Dlhis.Canteen/Order/Request/OrderPageRequest.cs index 95374cfa..ad268044 100644 --- a/Src/Dlhis.Canteen/Order/Request/OrderPageRequest.cs +++ b/Src/Dlhis.Canteen/Order/Request/OrderPageRequest.cs @@ -4,5 +4,5 @@ namespace Dlhis.Canteen.Order.Request; public class OrderPageRequest : PageDto { - + } diff --git a/Src/Dlhis.Canteen/Order/Request/OrderRequest.cs b/Src/Dlhis.Canteen/Order/Request/OrderRequest.cs deleted file mode 100644 index a8bfac36..00000000 --- a/Src/Dlhis.Canteen/Order/Request/OrderRequest.cs +++ /dev/null @@ -1,50 +0,0 @@ -using Dlhis.Entity.Canteen.Enums; -using SqlSugar.DbConvert; -using SqlSugar; - -namespace Dlhis.Canteen.Order.Request -{ - public class OrderRequest - { - - /// - /// 订餐人 - /// - public string UserCode { get; set; } - - /// - /// 食堂 - /// - public Guid PlaceCode { get; set; } - - /// - /// 餐次 - /// - public ShiftEnumType ShiftType { get; set; } - - /// - /// 配送地址 - /// - public string Address { get; set; } - - /// - /// 菜单 - /// - public Guid MenuCode { get; set; } - - /// - /// 菜品 - /// - public string DishesCode { get; set; } - - /// - /// 数量 - /// - public int DishesNum { get; set; } = 1; - - /// - /// 支付方式 - /// - public BalanceRecordSourceEnumType PayType { get; set; } - } -} diff --git a/Src/Dlhis.Canteen/Order/Request/RechargeRequest.cs b/Src/Dlhis.Canteen/Order/Request/RechargeRequest.cs index 0d4c8a7a..1c0c5063 100644 --- a/Src/Dlhis.Canteen/Order/Request/RechargeRequest.cs +++ b/Src/Dlhis.Canteen/Order/Request/RechargeRequest.cs @@ -1,7 +1,7 @@ using Dlhis.Entity.Canteen.Enums; using System.ComponentModel.DataAnnotations; -namespace Dlhis.Canteen.Order.Request; +namespace Dlhis.Canteen.Dishes.Request; public class RechargeRequest { diff --git a/Src/Dlhis.Canteen/Order/Request/SaveDishesRequest.cs b/Src/Dlhis.Canteen/Order/Request/SaveDishesRequest.cs deleted file mode 100644 index 1e6ac4a3..00000000 --- a/Src/Dlhis.Canteen/Order/Request/SaveDishesRequest.cs +++ /dev/null @@ -1,51 +0,0 @@ -using System.ComponentModel.DataAnnotations; - -namespace Dlhis.Canteen.Order.Request; - -public class SaveDishesRequest -{ - public long? Id { get; set; } - - /// - /// 大类 - /// - public string PCategory { get; set; } - - /// ` - /// 小类 - /// - [Required] - public string Category { get; set; } - - /// - /// 菜品名称 - /// - [Required] - public string Name { get; set; } - - - [Required] - public string CustomCode { get; set; } - - /// - /// 描述 - /// - public string Description { get; set; } - - /// - /// 单价 - /// - [Range(0, 10000)] - public decimal Price { get; set; } - - - /// - /// 图片 - /// - public string ImageUrl { 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 deleted file mode 100644 index 079707c4..00000000 --- a/Src/Dlhis.Canteen/Order/Request/SaveMenuRequest.cs +++ /dev/null @@ -1,39 +0,0 @@ -using Dlhis.Entity.Canteen.Enums; -using System.ComponentModel.DataAnnotations; - -namespace Dlhis.Canteen.Order.Request; - -public class SaveMenuRequest : IValidatableObject -{ - /// - /// 所属营业点 - /// - public Guid PlaceCode { get; set; } - - /// - /// 菜单名称 - /// - public string Name { get; set; } - - - - - /// - /// 营业日期,不能小于等于当天 - /// - public DateTime Date { get; set; } - - - /// - /// 餐次段 - /// - public ShiftEnumType ShiftType { get; set; } - - - - - public IEnumerable Validate(ValidationContext validationContext) - { - throw new NotImplementedException(); - } -} diff --git a/Src/Dlhis.Canteen/Order/Request/SpendingDetailRequest.cs b/Src/Dlhis.Canteen/Order/Request/SpendingDetailRequest.cs index fcdcff5f..497fe859 100644 --- a/Src/Dlhis.Canteen/Order/Request/SpendingDetailRequest.cs +++ b/Src/Dlhis.Canteen/Order/Request/SpendingDetailRequest.cs @@ -2,7 +2,7 @@ namespace Dlhis.Canteen.Order.Request { - public class SpendingDetailRequest:PageDto + public class SpendingDetailRequest : PageDto { } } diff --git a/Src/Dlhis.Canteen/Order/Response/AverageDailyResponse.cs b/Src/Dlhis.Canteen/Order/Response/AverageDailyResponse.cs index 92541825..e16606a0 100644 --- a/Src/Dlhis.Canteen/Order/Response/AverageDailyResponse.cs +++ b/Src/Dlhis.Canteen/Order/Response/AverageDailyResponse.cs @@ -1,25 +1,24 @@ -namespace Dlhis.Canteen.Order.Response +namespace Dlhis.Canteen.Order.Response; + +public class AverageDailyResponse { - public class AverageDailyResponse - { - /// - /// 档案号/QRCode - /// - public string UserNo { get; set; } + /// + /// 档案号/QRCode + /// + public string UserNo { get; set; } - /// - /// 姓名 - /// - public string Name { get; set; } + /// + /// 姓名 + /// + public string Name { get; set; } - /// - /// 学工号 - /// - public string UserCode { get; set; } + /// + /// 学工号 + /// + public string UserCode { get; set; } - /// - /// 日消费均额 - /// - public int AverageAmount { get; set; } - } + /// + /// 日消费均额 + /// + public int AverageAmount { get; set; } } diff --git a/Src/Dlhis.Canteen/Order/Response/BalanceRecordAnalysisRespones.cs b/Src/Dlhis.Canteen/Order/Response/BalanceRecordAnalysisRespones.cs index 885c9684..e9e6ccb6 100644 --- a/Src/Dlhis.Canteen/Order/Response/BalanceRecordAnalysisRespones.cs +++ b/Src/Dlhis.Canteen/Order/Response/BalanceRecordAnalysisRespones.cs @@ -1,6 +1,4 @@ -using SqlSugar; - -namespace Dlhis.Canteen.Order.Response +namespace Dlhis.Canteen.Order.Response { public class BalanceRecordAnalysisRespones { diff --git a/Src/Dlhis.Canteen/Order/Response/GetDetailResponse.cs b/Src/Dlhis.Canteen/Order/Response/GetDetailResponse.cs index 0017a076..956a1ac6 100644 --- a/Src/Dlhis.Canteen/Order/Response/GetDetailResponse.cs +++ b/Src/Dlhis.Canteen/Order/Response/GetDetailResponse.cs @@ -1,71 +1,67 @@ using Dlhis.Entity.Canteen.Enums; -using SqlSugar.DbConvert; -using SqlSugar; using Kurisu.AspNetCore.Utils.Extensions; -namespace Dlhis.Canteen.Order.Response +namespace Dlhis.Canteen.Order.Response; + +public class GetDetailResponse { - public class GetDetailResponse - { - /// - /// 订单号 - /// - public string ThirdNo { get; set; } + /// + /// 订单号 + /// + public string ThirdNo { get; set; } - /// - /// 营业日 - /// - public DateOnly SysDate { get; set; } + /// + /// 营业日 + /// + public DateOnly SysDate { get; set; } - /// - /// 餐次 - /// - public ShiftEnumType ShiftType { get; set; } + /// + /// 餐次 + /// + public ShiftEnumType ShiftType { get; set; } - /// - /// 餐次CN - /// - public string ShiftTypeCN => ShiftType.GetDescription(); + /// + /// 餐次CN + /// + public string ShiftTypeCN => ShiftType.GetDescription(); - /// - /// 菜品编码 - /// - public Guid DishesCode { get; set; } + /// + /// 菜品编码 + /// + public Guid DishesCode { get; set; } - /// - /// 菜品名称 - /// - public string DishesName { get; set; } + /// + /// 菜品名称 + /// + public string DishesName { get; set; } - /// - /// 单价 - /// - public decimal Price { get; set; } + /// + /// 单价 + /// + public decimal Price { get; set; } - /// - /// 单位 - /// - public string Unit { get; set; } + /// + /// 单位 + /// + public string Unit { get; set; } - /// - /// 数量 - /// - public int Num { get; set; } + /// + /// 数量 + /// + public int Num { get; set; } - /// - /// 金额 - /// - public decimal Amount { get; set; } + /// + /// 金额 + /// + public decimal Amount { get; set; } - /// - /// 订单明细状态 - /// - public OrderDetailsStatusEnumType OrderStatus { get; set; } - - /// - /// 订单明细状态CN - /// - public string OrderStatusCN => OrderStatus.GetDescription(); - } + /// + /// 订单明细状态 + /// + 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 deleted file mode 100644 index 4705e15f..00000000 --- a/Src/Dlhis.Canteen/Order/Response/GetDishesResponse.cs +++ /dev/null @@ -1,68 +0,0 @@ -using Dlhis.Entity.Canteen.Enums; -using Kurisu.AspNetCore.Utils.Extensions; - -namespace Dlhis.Canteen.Order.Response -{ - public class GetDishesResponse - { - /// - /// 大类 - /// - public string Categories { get; set; } - - /// - /// 小类 - /// - public string SubCategories { get; set; } - - /// - /// 菜品编码 - /// - public string Code { get; set; } - - /// - /// 菜品名称 - /// - public string Name { get; set; } - - /// - /// 菜品类型 - /// - public CanteenMenuEnumType Type { get; set; } - - /// - /// 菜品类型描述 - /// - public string TypeDescription => Type.GetDescription(); - - /// - /// 描述 - /// - public string Description { get; set; } - - /// - /// 单价 - /// - public decimal Amount { get; set; } - - /// - /// 单位 - /// - public string Unit { get; set; } - - /// - /// 图片 - /// - public string Image { get; set; } - - /// - /// 是否启用 - /// - public bool Enable { get; set; } - - /// - /// 限售份数 - /// - public int? RestrictedNum { get; set; } = null; - } -} diff --git a/Src/Dlhis.Canteen/Order/Response/GetMenuResponse.cs b/Src/Dlhis.Canteen/Order/Response/GetMenuResponse.cs deleted file mode 100644 index 111e0ecb..00000000 --- a/Src/Dlhis.Canteen/Order/Response/GetMenuResponse.cs +++ /dev/null @@ -1,60 +0,0 @@ -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 PlaceName { get; set; } - - /// - /// 厂区 - /// - public string Factory { get; set; } - - /// - /// 营业日期 - /// - public DateOnly StartDate { 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 index bb4f4fbc..37998819 100644 --- a/Src/Dlhis.Canteen/Order/Response/GetMiniProgramOrderResponse.cs +++ b/Src/Dlhis.Canteen/Order/Response/GetMiniProgramOrderResponse.cs @@ -1,101 +1,99 @@ using Dlhis.Entity.Canteen.Enums; -using SqlSugar.DbConvert; -using SqlSugar; using Kurisu.AspNetCore.Utils.Extensions; -namespace Dlhis.Canteen.Order.Response +namespace Dlhis.Canteen.Order.Response; + +public class GetMiniProgramOrderResponse { - public class GetMiniProgramOrderResponse - { - /// - /// 订单号 - /// - public string No { get; set; } + /// + /// 订单号 + /// + public string No { get; set; } - /// - /// 姓名 - /// - public string Name { get; set; } + /// + /// 姓名 + /// + public string Name { get; set; } - /// - /// 工号 - /// - public string Code { get; set; } + /// + /// 工号 + /// + public string Code { get; set; } - /// - /// 人事范围 - /// - public string Werks { get; set; } + /// + /// 人事范围 + /// + public string Werks { get; set; } - /// - /// 部门编码 - /// - public string DepartmentNo { get; set; } + /// + /// 部门编码 + /// + public string DepartmentNo { get; set; } - /// - /// 部门名称 - /// - public string DepartmentName { get; set; } + /// + /// 部门名称 + /// + public string DepartmentName { get; set; } - /// - /// 成本中心 - /// - public string CostId { get; set; } + /// + /// 成本中心 + /// + public string CostId { get; set; } - /// - /// 工作地 - /// - public string Workplace { get; set; } + /// + /// 工作地 + /// + public string Workplace { get; set; } - /// - /// 厂区 - /// - public string Factory { get; set; } + /// + /// 厂区 + /// + public string Factory { get; set; } - /// - /// 营业点 - /// - public Guid PlaceCode { get; set; } + /// + /// 营业点 + /// + public Guid PlaceCode { get; set; } - /// - /// 营业名称 - /// - public string PlaceName { get; set; } + /// + /// 营业名称 + /// + public string PlaceName { get; set; } - /// - /// 餐次 - /// - public ShiftEnumType ShiftType { get; set; } + /// + /// 餐次 + /// + public ShiftEnumType ShiftType { get; set; } - /// - /// 餐次CN - /// - public string ShiftTypeCN => ShiftType.GetDescription(); + /// + /// 餐次CN + /// + public string ShiftTypeCN => ShiftType.GetDescription(); - /// - /// 菜品 - /// - public Guid DishesCode { get; set; } + /// + /// 菜品 + /// + public Guid DishesCode { get; set; } - /// - /// 菜品名称 - /// - public string DishesName { get; set; } + /// + /// 菜品名称 + /// + public string DishesName { get; set; } - /// - /// 手机号码 - /// - public string Phone { get; set; } + /// + /// 手机号码 + /// + public string Phone { get; set; } - /// - /// 用餐日期 - /// - public DateOnly SysDate { get; set; } + /// + /// 用餐日期 + /// + public DateOnly SysDate { get; set; } - /// - /// 下单时间 - /// - public DateTime CostDate { get; set; } + /// + /// 下单时间 + /// + public DateTime CostDate { get; set; } /// /// 支付方式 @@ -112,25 +110,24 @@ namespace Dlhis.Canteen.Order.Response /// public MiniProgramOrderStatusEnumType OrderStatus { get; set; } - /// - /// 订单状态CN - /// - public string OrderStatusCN => OrderStatus.GetDescription(); + /// + /// 订单状态CN + /// + public string OrderStatusCN => OrderStatus.GetDescription(); - /// - /// 订单类型 - /// - public CanteenMenuEnumType OrderType { get; set; } + /// + /// 订单类型 + /// + public CanteenMenuEnumType OrderType { get; set; } - /// - /// 订单类型CN - /// - public string OrderTypeCN => OrderType.GetDescription(); + /// + /// 订单类型CN + /// + public string OrderTypeCN => OrderType.GetDescription(); + + /// + /// 总金额 + /// + public decimal TotalAmount { get; set; } - /// - /// 总金额 - /// - public decimal TotalAmount { get; set; } - -} } diff --git a/Src/Dlhis.Canteen/Order/Response/OaEMealVoucherResponse.cs b/Src/Dlhis.Canteen/Order/Response/OaEMealVoucherResponse.cs index 32ceaeb3..d21260fd 100644 --- a/Src/Dlhis.Canteen/Order/Response/OaEMealVoucherResponse.cs +++ b/Src/Dlhis.Canteen/Order/Response/OaEMealVoucherResponse.cs @@ -1,100 +1,97 @@ -using SqlSugar; +namespace Dlhis.Canteen.Order.Response; -namespace Dlhis.Canteen.Order.Response +public class OaEMealVoucherResponse { - public class OaEMealVoucherResponse - { - public long Id { get; set; } + public long Id { get; set; } - /// - /// 标题 - /// - public string Title { get; set; } + /// + /// 标题 + /// + public string Title { get; set; } - /// - /// 申请人工号 - /// - public string UserCode { get; set; } + /// + /// 申请人工号 + /// + public string UserCode { get; set; } - /// - /// 申请人名称 - /// - public string Name { get; set; } + /// + /// 申请人名称 + /// + public string Name { get; set; } - /// - /// 基地代码 - /// - public string TenantId { get; set; } + /// + /// 基地代码 + /// + public string TenantId { get; set; } - /// - /// 基地名称 - /// - public string TenantName { get; set; } + /// + /// 基地名称 + /// + public string TenantName { get; set; } - /// - /// 成本中心 - /// - public string CostId { get; set; } + /// + /// 成本中心 + /// + public string CostId { get; set; } - /// - /// 成本中心名称 - /// - public string CostName { get; set; } + /// + /// 成本中心名称 + /// + public string CostName { get; set; } - /// - /// 来宾公司 - /// - public string Company { get; set; } + /// + /// 来宾公司 + /// + public string Company { get; set; } - /// - /// 联系人 - /// - public string Phone { get; set; } + /// + /// 联系人 + /// + public string Phone { get; set; } - /// - /// 来宾人数 - /// - public int Num { get; set; } + /// + /// 来宾人数 + /// + public int Num { get; set; } - /// - /// 就餐食堂 - /// - public string Canteen { get; set; } + /// + /// 就餐食堂 + /// + public string Canteen { get; set; } - /// - /// 就餐事由 - /// - public string Reason { get; set; } + /// + /// 就餐事由 + /// + public string Reason { get; set; } - /// - /// 就餐次 - /// - public string CanteenShift { get; set; } + /// + /// 就餐次 + /// + public string CanteenShift { get; set; } - /// - /// oa流程id - /// - public string OaId { get; set; } + /// + /// oa流程id + /// + public string OaId { get; set; } - /// - /// 部门号 - /// - public string DepartmentNo { get; set; } + /// + /// 部门号 + /// + public string DepartmentNo { get; set; } - /// - /// 部门名称 - /// - public string DepartmentName { get; set; } + /// + /// 部门名称 + /// + public string DepartmentName { get; set; } - /// - /// 申请日期 - /// - public DateTime LogDate { get; set; } + /// + /// 申请日期 + /// + public DateTime LogDate { get; set; } - /// - /// 数据创建时间 - /// - public DateTime CreateTime { get; set; } - } + /// + /// 数据创建时间 + /// + public DateTime CreateTime { get; set; } } diff --git a/Src/Dlhis.Canteen/Order/Response/SpendingDetailResponse.cs b/Src/Dlhis.Canteen/Order/Response/SpendingDetailResponse.cs index 8ad95ac5..c81f720a 100644 --- a/Src/Dlhis.Canteen/Order/Response/SpendingDetailResponse.cs +++ b/Src/Dlhis.Canteen/Order/Response/SpendingDetailResponse.cs @@ -1,38 +1,35 @@ -using SqlSugar; +namespace Dlhis.Canteen.Order.Response; -namespace Dlhis.Canteen.Order.Response +public class SpendingDetailResponse { - public class SpendingDetailResponse - { - /// - /// 档案号/QRCode - /// - public string UserNo { get; set; } + /// + /// 档案号/QRCode + /// + public string UserNo { get; set; } - /// - /// 姓名 - /// - public string Name { get; set; } + /// + /// 姓名 + /// + public string Name { get; set; } - /// - /// 学工号 - /// - public string UserCode { get; set; } + /// + /// 学工号 + /// + public string UserCode { get; set; } - /// - /// 部门号 - /// - public string DepartmentNo { get; set; } + /// + /// 部门号 + /// + public string DepartmentNo { get; set; } - /// - /// 成本中心 - /// - public string CostId { get; set; } + /// + /// 成本中心 + /// + public string CostId { get; set; } - /// - /// 消费者所在基地 - /// - public string OriginTenantId { get; set; } + /// + /// 消费者所在基地 + /// + public string OriginTenantId { get; set; } - } } diff --git a/Src/Dlhis.Canteen/Order/Services/IBalanceService.cs b/Src/Dlhis.Canteen/Order/Services/IBalanceService.cs index d7d55ca4..dfe66e07 100644 --- a/Src/Dlhis.Canteen/Order/Services/IBalanceService.cs +++ b/Src/Dlhis.Canteen/Order/Services/IBalanceService.cs @@ -1,4 +1,5 @@ -using Dlhis.Canteen.Order.Request; +using Dlhis.Canteen.Dishes.Request; +using Dlhis.Canteen.Order.Request; using Dlhis.Canteen.Order.Response; using Kurisu.Core.DataAccess.Dto; using Microsoft.AspNetCore.Mvc; diff --git a/Src/Dlhis.Canteen/Order/Services/IMenuDishesService.cs b/Src/Dlhis.Canteen/Order/Services/IMenuDishesService.cs deleted file mode 100644 index 025f0325..00000000 --- a/Src/Dlhis.Canteen/Order/Services/IMenuDishesService.cs +++ /dev/null @@ -1,17 +0,0 @@ -using Dlhis.Canteen.Order.Request; -using Dlhis.Canteen.Order.Response; -using Kurisu.Core.DataAccess.Dto; - -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 deleted file mode 100644 index 7bb8394d..00000000 --- a/Src/Dlhis.Canteen/Order/Services/IMiniProgramOrderDetailService.cs +++ /dev/null @@ -1,18 +0,0 @@ -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 SaveDetailAsync(SaveDetailRequest request); - - Task> GetDetailAsync( GetDetailRequest request); - - Task OrderAsync(OrderRequest request); - } -} diff --git a/Src/Dlhis.Canteen/Order/Services/IOrderService.cs b/Src/Dlhis.Canteen/Order/Services/IOrderService.cs index d3bfb5d2..f78863cb 100644 --- a/Src/Dlhis.Canteen/Order/Services/IOrderService.cs +++ b/Src/Dlhis.Canteen/Order/Services/IOrderService.cs @@ -1,4 +1,5 @@ -using Dlhis.Canteen.Order.Request; +using Dlhis.Canteen.Dishes.Request; +using Dlhis.Canteen.Order.Request; using Dlhis.Canteen.Order.Response; using Kurisu.Core.DataAccess.Dto; @@ -10,4 +11,17 @@ public interface IOrderService : IScopeDependency Task AddAsync(OrderAddRequest request); + /// + /// 设备消费 + /// + /// + /// + Task DeviceConsume(OrderAddRequest request); + + /// + /// 订餐 + /// + /// + /// + Task Booking(BookingMealRequest request); } diff --git a/Src/Dlhis.Canteen/Order/Services/Implements/BalanceService.cs b/Src/Dlhis.Canteen/Order/Services/Implements/BalanceService.cs index e5748cef..f216236b 100644 --- a/Src/Dlhis.Canteen/Order/Services/Implements/BalanceService.cs +++ b/Src/Dlhis.Canteen/Order/Services/Implements/BalanceService.cs @@ -1,4 +1,5 @@ -using Dlhis.Canteen.Order.Request; +using Dlhis.Canteen.Dishes.Request; +using Dlhis.Canteen.Order.Request; using Dlhis.Canteen.Order.Response; using Dlhis.Entity.Basic.Entity; using Dlhis.Entity.Canteen.Entities; @@ -9,12 +10,10 @@ using Dlhis.Sys.Api; using Kurisu.AspNetCore.UnifyResultAndValidation; using Kurisu.AspNetCore.Utils.Extensions; using Kurisu.Core.DataAccess.Dto; -using Kurisu.Core.DataAccess.Entity; using Kurisu.Core.User.Abstractions; using Kurisu.SqlSugar.Extensions; using Kurisu.SqlSugar.Services; using Mapster; -using Microsoft.AspNetCore.Mvc; using SqlSugar; namespace Dlhis.Canteen.Order.Services.Implements; @@ -26,7 +25,7 @@ public class BalanceService : IBalanceService private readonly ILogger _logger; private readonly ITenantApi _tenantApi; - public BalanceService(IDbContext dbContext, ICurrentUser currentUser, ILogger logger ,ITenantApi tenantApi) + public BalanceService(IDbContext dbContext, ICurrentUser currentUser, ILogger logger, ITenantApi tenantApi) { _dbContext = dbContext; _currentUser = currentUser; @@ -41,18 +40,17 @@ public class BalanceService : IBalanceService .LeftJoin((record, ga, department) => ga.DepartmentNo == department.No) .LeftJoin((record, ga, department, bplace) => record.BusinessPlaceCode == bplace.Code) .LeftJoin((record, ga, department, bplace, bshift) => record.BusinessShiftCode == bshift.Code) - .LeftJoin((record, ga, department, bplace, bshift, type) => record.ShiftType == type.Code && type.Type == "mealshift") .WhereIF(request.SearchDateTimePeriod?.Start.HasValue == true, record => record.CostDate >= request.SearchDateTimePeriod.Start) .WhereIF(request.SearchDateTimePeriod?.End.HasValue == true, record => record.CostDate <= request.SearchDateTimePeriod.End) .WhereIF(request.BusinessplaceCodes.IsPresent(), record => request.BusinessplaceCodes.Contains(record.BusinessPlaceCode)) .WhereIF(request.ShiftTypes.IsPresent(), record => request.ShiftTypes.Contains(record.ShiftType)) - .WhereIF(request.Type.HasValue,record => record.Type == request.Type) + .WhereIF(request.Type.HasValue, record => record.Type == request.Type) .WhereIF(request.Search.IsPresent(), (record, ga) => ga.Name.Contains(request.Search) || ga.Code.Contains(request.Search) ) .OrderBy(record => record.CreateTime, OrderByType.Desc) - .Select((record, ga, department, bplace, bshift, type) => new BalanceRecordResponse + .Select((record, ga, department, bplace, bshift) => new BalanceRecordResponse { Id = record.Id, Amount = record.Amount, @@ -61,7 +59,7 @@ public class BalanceService : IBalanceService CostDate = record.CostDate, CostId = record.CostId, DepartmentNo = record.DepartmentNo, - DeviceInfo = record.DeviceInfo, + DeviceInfo = record.DeviceUniqueNo, IP = record.IP, UserNo = record.UserNo, UserCode = record.UserCode, @@ -75,7 +73,7 @@ public class BalanceService : IBalanceService Name = record.Name, DepartmentName = department.Name, BusinessPlaceName = bplace.Name, - BusinessShiftName = type.Display, + BusinessShiftName = bshift.Name, CostDateTime = record.CostDateTime, TenantId = record.TenantId, }) @@ -109,8 +107,6 @@ public class BalanceService : IBalanceService /// public async Task> RecordByCostIdAsync(BalanceRecordPageByCostIdRequest request) { - var shiftCodeDict = await GetShiftCode(); - var paeginfos = await _dbContext.Queryable() .WhereIF(!request.UserCode.IsEmpty(), record => record.UserCode == request.UserCode) .WhereIF(!request.DepartmentNo.IsEmpty(), record => record.DepartmentNo == request.DepartmentNo) @@ -132,24 +128,24 @@ public class BalanceService : IBalanceService }; // 所有人次 - var BreakfastNumberOfPeople = costIdGroup.Count(x => x.ShiftType == shiftCodeDict["Breakfast"]); + var BreakfastNumberOfPeople = costIdGroup.Count(x => x.ShiftType == ShiftEnumType.Breakfast); - var LunchNumberOfPeople = costIdGroup.Count(x => x.ShiftType == shiftCodeDict["Lunch"]); + var LunchNumberOfPeople = costIdGroup.Count(x => x.ShiftType == ShiftEnumType.Lunch); - var DinnerNumberOfPeople = costIdGroup.Count(x => x.ShiftType == shiftCodeDict["Dinner"]); + var DinnerNumberOfPeople = costIdGroup.Count(x => x.ShiftType == ShiftEnumType.Dinner); - var LateNightNumberOfPeople = costIdGroup.Count(x => x.ShiftType == shiftCodeDict["LateNight"]); + var LateNightNumberOfPeople = costIdGroup.Count(x => x.ShiftType == ShiftEnumType.Nightsnack); // 每个餐次人数 - obj.BreakfastNumberOfPeople = costIdGroup.Where(x => x.ShiftType == shiftCodeDict["Breakfast"]).Select(x => x.UserNo).Distinct().Count(); - obj.LunchNumberOfPeople = costIdGroup.Where(x => x.ShiftType == shiftCodeDict["Lunch"]).Select(x => x.UserNo).Distinct().Count(); - obj.DinnerNumberOfPeople = costIdGroup.Where(x => x.ShiftType == shiftCodeDict["Dinner"]).Select(x => x.UserNo).Distinct().Count(); - obj.LateNightNumberOfPeople = costIdGroup.Where(x => x.ShiftType == shiftCodeDict["LateNight"]).Select(x => x.UserNo).Distinct().Count(); + obj.BreakfastNumberOfPeople = costIdGroup.Where(x => x.ShiftType == ShiftEnumType.Breakfast).Select(x => x.UserNo).Distinct().Count(); + obj.LunchNumberOfPeople = costIdGroup.Where(x => x.ShiftType == ShiftEnumType.Lunch).Select(x => x.UserNo).Distinct().Count(); + obj.DinnerNumberOfPeople = costIdGroup.Where(x => x.ShiftType == ShiftEnumType.Dinner).Select(x => x.UserNo).Distinct().Count(); + obj.LateNightNumberOfPeople = costIdGroup.Where(x => x.ShiftType == ShiftEnumType.Nightsnack).Select(x => x.UserNo).Distinct().Count(); //餐次金额 - obj.BreakfastAmount = Math.Abs(costIdGroup.Where(x => x.ShiftType == shiftCodeDict["Breakfast"]).Sum(x => x.Amount)); - obj.LunchAmount = Math.Abs(costIdGroup.Where(x => x.ShiftType == shiftCodeDict["Lunch"]).Sum(x => x.Amount)); - obj.DinnerAmount = Math.Abs(costIdGroup.Where(x => x.ShiftType == shiftCodeDict["Dinner"]).Sum(x => x.Amount)); - obj.LateNightAmount = Math.Abs(costIdGroup.Where(x => x.ShiftType == shiftCodeDict["LateNight"]).Sum(x => x.Amount)); + obj.BreakfastAmount = Math.Abs(costIdGroup.Where(x => x.ShiftType == ShiftEnumType.Breakfast).Sum(x => x.Amount)); + obj.LunchAmount = Math.Abs(costIdGroup.Where(x => x.ShiftType == ShiftEnumType.Lunch).Sum(x => x.Amount)); + obj.DinnerAmount = Math.Abs(costIdGroup.Where(x => x.ShiftType == ShiftEnumType.Dinner).Sum(x => x.Amount)); + obj.LateNightAmount = Math.Abs(costIdGroup.Where(x => x.ShiftType == ShiftEnumType.Nightsnack).Sum(x => x.Amount)); // 每个餐次单价 @@ -210,7 +206,7 @@ public class BalanceService : IBalanceService CostDate = record.CostDate, CostId = record.CostId, DepartmentNo = record.DepartmentNo, - DeviceInfo = record.DeviceInfo, + DeviceInfo = record.DeviceUniqueNo, IP = record.IP, UserNo = record.UserNo, UserCode = record.UserCode, @@ -242,8 +238,6 @@ public class BalanceService : IBalanceService /// public async Task> BalanceRecordSummaryByNoAsync(BalanceRecordSummaryRequest request) { - var shiftCodeDict = await GetShiftCode(); - var paeginfos = await _dbContext.Queryable() .WhereIF(!request.DepartmentNo.IsEmpty(), record => record.DepartmentNo == request.DepartmentNo) .WhereIF(!request.UserCode.IsEmpty(), record => record.UserCode == request.UserCode) @@ -267,24 +261,24 @@ public class BalanceService : IBalanceService OriginTenantId = "" }; // 所有人次 - var BreakfastNumberOfPeople = departmentGroup.Count(x => x.ShiftType == shiftCodeDict["Breakfast"]); + var BreakfastNumberOfPeople = departmentGroup.Count(x => x.ShiftType == ShiftEnumType.Breakfast); - var LunchNumberOfPeople = departmentGroup.Count(x => x.ShiftType == shiftCodeDict["Lunch"]); + var LunchNumberOfPeople = departmentGroup.Count(x => x.ShiftType == ShiftEnumType.Lunch); - var DinnerNumberOfPeople = departmentGroup.Count(x => x.ShiftType == shiftCodeDict["Dinner"]); + var DinnerNumberOfPeople = departmentGroup.Count(x => x.ShiftType == ShiftEnumType.Dinner); - var LateNightNumberOfPeople = departmentGroup.Count(x => x.ShiftType == shiftCodeDict["LateNight"]); + var LateNightNumberOfPeople = departmentGroup.Count(x => x.ShiftType == ShiftEnumType.Nightsnack); //每个餐次人数 - obj.BreakfastNumberOfPeople = departmentGroup.Where(x => x.ShiftType == shiftCodeDict["Breakfast"]).Select(x => x.UserNo).Distinct().Count(); - obj.LunchNumberOfPeople = departmentGroup.Where(x => x.ShiftType == shiftCodeDict["Lunch"]).Select(x => x.UserNo).Distinct().Count(); - obj.DinnerNumberOfPeople = departmentGroup.Where(x => x.ShiftType == shiftCodeDict["Dinner"]).Select(x => x.UserNo).Distinct().Count(); - obj.LateNightNumberOfPeople = departmentGroup.Where(x => x.ShiftType == shiftCodeDict["LateNight"]).Select(x => x.UserNo).Distinct().Count(); + obj.BreakfastNumberOfPeople = departmentGroup.Where(x => x.ShiftType == ShiftEnumType.Breakfast).Select(x => x.UserNo).Distinct().Count(); + obj.LunchNumberOfPeople = departmentGroup.Where(x => x.ShiftType == ShiftEnumType.Lunch).Select(x => x.UserNo).Distinct().Count(); + obj.DinnerNumberOfPeople = departmentGroup.Where(x => x.ShiftType == ShiftEnumType.Dinner).Select(x => x.UserNo).Distinct().Count(); + obj.LateNightNumberOfPeople = departmentGroup.Where(x => x.ShiftType == ShiftEnumType.Nightsnack).Select(x => x.UserNo).Distinct().Count(); //餐次金额 - obj.BreakfastAmount = Math.Abs(departmentGroup.Where(x => x.ShiftType == shiftCodeDict["Breakfast"]).Sum(x => x.Amount)); - obj.LunchAmount = Math.Abs(departmentGroup.Where(x => x.ShiftType == shiftCodeDict["Lunch"]).Sum(x => x.Amount)); - obj.DinnerAmount = Math.Abs(departmentGroup.Where(x => x.ShiftType == shiftCodeDict["Dinner"]).Sum(x => x.Amount)); - obj.LateNightAmount = Math.Abs(departmentGroup.Where(x => x.ShiftType == shiftCodeDict["LateNight"]).Sum(x => x.Amount)); + obj.BreakfastAmount = Math.Abs(departmentGroup.Where(x => x.ShiftType == ShiftEnumType.Breakfast).Sum(x => x.Amount)); + obj.LunchAmount = Math.Abs(departmentGroup.Where(x => x.ShiftType == ShiftEnumType.Lunch).Sum(x => x.Amount)); + obj.DinnerAmount = Math.Abs(departmentGroup.Where(x => x.ShiftType == ShiftEnumType.Dinner).Sum(x => x.Amount)); + obj.LateNightAmount = Math.Abs(departmentGroup.Where(x => x.ShiftType == ShiftEnumType.Nightsnack).Sum(x => x.Amount)); // 每个餐次单价 obj.BreakfastPrice = BreakfastNumberOfPeople == 0 ? 0 : Math.Round(obj.BreakfastAmount / BreakfastNumberOfPeople, 2); @@ -326,8 +320,6 @@ public class BalanceService : IBalanceService /// public async Task> BalanceRecordSummaryByTidAsync(BalanceRecordSummaryRequest request) { - var shiftCodeDict = await GetShiftCode(); - var paeginfos = await _dbContext.Queryable() .WhereIF(!request.DepartmentNo.IsEmpty(), record => record.DepartmentNo == request.DepartmentNo) .WhereIF(!request.UserCode.IsEmpty(), record => record.UserCode == request.UserCode) @@ -352,24 +344,21 @@ public class BalanceService : IBalanceService }; // 所有人次 - var BreakfastNumberOfPeople = originTenantIdGroup.Count(x => x.ShiftType == shiftCodeDict["Breakfast"]); - - var LunchNumberOfPeople = originTenantIdGroup.Count(x => x.ShiftType == shiftCodeDict["Lunch"]); - - var DinnerNumberOfPeople = originTenantIdGroup.Count(x => x.ShiftType == shiftCodeDict["Dinner"]); - - var LateNightNumberOfPeople = originTenantIdGroup.Count(x => x.ShiftType == shiftCodeDict["LateNight"]); + var BreakfastNumberOfPeople = originTenantIdGroup.Count(x => x.ShiftType == ShiftEnumType.Breakfast); + var LunchNumberOfPeople = originTenantIdGroup.Count(x => x.ShiftType == ShiftEnumType.Lunch); + var DinnerNumberOfPeople = originTenantIdGroup.Count(x => x.ShiftType == ShiftEnumType.Dinner); + var LateNightNumberOfPeople = originTenantIdGroup.Count(x => x.ShiftType == ShiftEnumType.Nightsnack); //每个餐次人数 - obj.BreakfastNumberOfPeople = originTenantIdGroup.Where(x => x.ShiftType == shiftCodeDict["Breakfast"]).Select(x => x.UserNo).Distinct().Count(); - obj.LunchNumberOfPeople = originTenantIdGroup.Where(x => x.ShiftType == shiftCodeDict["Lunch"]).Select(x => x.UserNo).Distinct().Count(); - obj.DinnerNumberOfPeople = originTenantIdGroup.Where(x => x.ShiftType == shiftCodeDict["Dinner"]).Select(x => x.UserNo).Distinct().Count(); - obj.LateNightNumberOfPeople = originTenantIdGroup.Where(x => x.ShiftType == shiftCodeDict["LateNight"]).Select(x => x.UserNo).Distinct().Count(); + obj.BreakfastNumberOfPeople = originTenantIdGroup.Where(x => x.ShiftType == ShiftEnumType.Breakfast).Select(x => x.UserNo).Distinct().Count(); + obj.LunchNumberOfPeople = originTenantIdGroup.Where(x => x.ShiftType == ShiftEnumType.Lunch).Select(x => x.UserNo).Distinct().Count(); + obj.DinnerNumberOfPeople = originTenantIdGroup.Where(x => x.ShiftType == ShiftEnumType.Dinner).Select(x => x.UserNo).Distinct().Count(); + obj.LateNightNumberOfPeople = originTenantIdGroup.Where(x => x.ShiftType == ShiftEnumType.Nightsnack).Select(x => x.UserNo).Distinct().Count(); //餐次金额 - obj.BreakfastAmount = Math.Abs(originTenantIdGroup.Where(x => x.ShiftType == shiftCodeDict["Breakfast"]).Sum(x => x.Amount)); - obj.LunchAmount = Math.Abs(originTenantIdGroup.Where(x => x.ShiftType == shiftCodeDict["Lunch"]).Sum(x => x.Amount)); - obj.DinnerAmount = Math.Abs(originTenantIdGroup.Where(x => x.ShiftType == shiftCodeDict["Dinner"]).Sum(x => x.Amount)); - obj.LateNightAmount = Math.Abs(originTenantIdGroup.Where(x => x.ShiftType == shiftCodeDict["LateNight"]).Sum(x => x.Amount)); + obj.BreakfastAmount = Math.Abs(originTenantIdGroup.Where(x => x.ShiftType == ShiftEnumType.Breakfast).Sum(x => x.Amount)); + obj.LunchAmount = Math.Abs(originTenantIdGroup.Where(x => x.ShiftType == ShiftEnumType.Lunch).Sum(x => x.Amount)); + obj.DinnerAmount = Math.Abs(originTenantIdGroup.Where(x => x.ShiftType == ShiftEnumType.Dinner).Sum(x => x.Amount)); + obj.LateNightAmount = Math.Abs(originTenantIdGroup.Where(x => x.ShiftType == ShiftEnumType.Nightsnack).Sum(x => x.Amount)); // 每个餐次单价 @@ -405,9 +394,6 @@ public class BalanceService : IBalanceService /// public async Task> BalanceRecordAnalysisAsync(BalanceRecordAnalysisRequest request) { - var shiftCodeDict = await GetShiftCode(); - - var pageinfo = await _dbContext.Queryable() .WhereIF(request.StartDatetime.HasValue, record => record.CostDateTime >= request.StartDatetime) .WhereIF(request.EndDatetime.HasValue, record => record.CostDateTime <= request.EndDatetime) @@ -424,13 +410,13 @@ public class BalanceService : IBalanceService }; //每个餐次人数 - obj.BreakfastNumberOfPeople = first.Where(x => x.ShiftType == shiftCodeDict["Breakfast"]).Select(x => x.UserNo).Distinct().Count(); - obj.LunchNumberOfPeople = first.Where(x => x.ShiftType == shiftCodeDict["Lunch"]).Select(x => x.UserNo).Distinct().Count(); - obj.DinnerNumberOfPeople = first.Where(x => x.ShiftType == shiftCodeDict["Dinner"]).Select(x => x.UserNo).Distinct().Count(); - obj.LateNightNumberOfPeople = first.Where(x => x.ShiftType == shiftCodeDict["LateNight"]).Select(x => x.UserNo).Distinct().Count(); + obj.BreakfastNumberOfPeople = first.Where(x => x.ShiftType == ShiftEnumType.Breakfast).Select(x => x.UserNo).Distinct().Count(); + obj.LunchNumberOfPeople = first.Where(x => x.ShiftType == ShiftEnumType.Lunch).Select(x => x.UserNo).Distinct().Count(); + obj.DinnerNumberOfPeople = first.Where(x => x.ShiftType == ShiftEnumType.Lunch).Select(x => x.UserNo).Distinct().Count(); + obj.LateNightNumberOfPeople = first.Where(x => x.ShiftType == ShiftEnumType.Nightsnack).Select(x => x.UserNo).Distinct().Count(); obj.TotalNumberOfPeople = first.Where(x => x.CostDate.ToString("yyyy-MM-dd") == first.Key).Select(x => x.UserNo).Distinct().Count(); - + lst.Add(obj); } // 分页操作 @@ -483,7 +469,7 @@ public class BalanceService : IBalanceService .LeftJoin((record, ga, department, bplace, bshift, type) => record.BusinessShiftCode.ToString() == type.Code) .WhereIF(request.SearchDate.HasValue, record => record.CostDate >= start) .WhereIF(request.SearchDate.HasValue, record => record.CostDate <= end) - .Where(record => record.TenantId == device.TenantId && (record.DeviceInfo == device.Code.ToString() || record.DeviceInfo == device.UniqueNo)) + .Where(record => record.TenantId == device.TenantId && (record.DeviceUniqueNo == device.Code.ToString() || record.DeviceUniqueNo == device.UniqueNo)) .Where(record => record.Type == BalanceRecordTypeEnumType.Out && record.Status == BalanceRecordStatusEnumType.Valid) .OrderBy(record => record.CreateTime, OrderByType.Desc) .Select((record, ga, department, bplace, bshift, type) => new BalanceRecordResponse @@ -495,7 +481,7 @@ public class BalanceService : IBalanceService CostDate = record.CostDate, CostId = record.CostId, DepartmentNo = record.DepartmentNo, - DeviceInfo = record.DeviceInfo, + DeviceInfo = record.DeviceUniqueNo, IP = record.IP, UserNo = record.UserNo, UserCode = record.UserCode, @@ -517,7 +503,7 @@ public class BalanceService : IBalanceService var sum = await _dbContext.Queryable() .WhereIF(request.SearchDate.HasValue, record => record.CostDate >= start) .WhereIF(request.SearchDate.HasValue, record => record.CostDate <= end) - .Where(record => record.TenantId == device.TenantId || (record.DeviceInfo == device.Code.ToString() || record.DeviceInfo == device.UniqueNo)) + .Where(record => record.TenantId == device.TenantId || record.DeviceUniqueNo == device.Code.ToString() || record.DeviceUniqueNo == device.UniqueNo) .Where(record => record.Type == BalanceRecordTypeEnumType.Out && record.Status == BalanceRecordStatusEnumType.Valid) .SumAsync(record => SqlFunc.Abs(SqlFunc.IsNull(record.Amount, 0))); @@ -610,7 +596,7 @@ public class BalanceService : IBalanceService //可消费人数 var consumerable = bs.Select(x => x.UserCode).Distinct().Count(); - var dailyNumber = SameDay(bs,""); + var dailyNumber = SameDay(bs, ""); //消费走势 @@ -636,14 +622,14 @@ public class BalanceService : IBalanceService /// /// /// - private int SameDay(List bs,string userCode) + private int SameDay(List bs, string userCode) { var time = DateTime.Now.ToString("yyyy-MM-dd"); var b = userCode.IsEmpty(); //当日消费数据 var monthbs = bs .Where(x => x.CostDateTime.ToString("yyyy-MM-dd") == time) - .WhereIF(!userCode.IsEmpty(),x => x.UserCode == userCode); + .WhereIF(!userCode.IsEmpty(), x => x.UserCode == userCode); //当日消费额 var monthlySpending = monthbs.Sum(x => x.Amount); //当日消费人数 @@ -694,9 +680,9 @@ public class BalanceService : IBalanceService var lst = new List(); foreach (var code in codes) { - var br = brs.Where(x => x.UserCode == code).FirstOrDefault(); + var br = brs.Where(x => x.UserCode == code).FirstOrDefault(); var res = br.Adapt(); - var dailyNumber = SameDay(brs,code); + var dailyNumber = SameDay(brs, code); res.AverageAmount = dailyNumber; lst.Add(res); } @@ -773,7 +759,7 @@ public class BalanceService : IBalanceService .Where(x => deviceUniqueNos.Contains(x.DeviceUniqueNo)) .Select((x, d) => new { - UniqueNo = d.UniqueNo, + d.UniqueNo, d.HeartbeatInterval, x.LastHeartbeatTime }) @@ -792,7 +778,7 @@ public class BalanceService : IBalanceService }) .Select(x => new { - UniqueNo = x.UniqueNo, + x.UniqueNo, }) .ToList(); var onlineUniqueNos = new List(); @@ -940,41 +926,4 @@ public class BalanceService : IBalanceService throw new UserFriendlyException("操作失败,请重试"); } - - public async Task> GetShiftCode() - { - _dbContext.Client.QueryFilter.ClearAndBackup(); - try - { - var shiftCodeDict = new Dictionary(); - - var typs = await _dbContext.Queryable() - .Where(x => x.Type == "mealshift") - .ToListAsync(); - - var codeBreakfast = typs.Where(x => x.Display == "早餐").Select(x => x.Code).First(); - var codeLunch = typs.Where(x => x.Display == "午餐").Select(x => x.Code).First(); - var codeDinner = typs.Where(x => x.Display == "晚餐").Select(x => x.Code).First(); - var codeNightsnack = typs.Where(x => x.Display == "宵夜").Select(x => x.Code).First(); - var codeMidnightsnack = typs.Where(x => x.Display == "凌晨餐").Select(x => x.Code).First(); - - shiftCodeDict.Add("Breakfast", codeBreakfast); - shiftCodeDict.Add("Lunch", codeLunch); - shiftCodeDict.Add("Dinner", codeDinner); - shiftCodeDict.Add("LateNight", codeNightsnack); - shiftCodeDict.Add("Midnightsnack", codeMidnightsnack); - - return shiftCodeDict; - } - catch (Exception ex) - { - _logger.LogError(ex, $"生成{DeviceTaskEnumType.UploadRecord.GetDescription()}任务失败:" + ex.Message); - return null; - } - finally - { - _dbContext.Client.QueryFilter.Restore(); - } - - } } diff --git a/Src/Dlhis.Canteen/Order/Services/Implements/MenuDishesService.cs b/Src/Dlhis.Canteen/Order/Services/Implements/MenuDishesService.cs deleted file mode 100644 index 2fc79323..00000000 --- a/Src/Dlhis.Canteen/Order/Services/Implements/MenuDishesService.cs +++ /dev/null @@ -1,74 +0,0 @@ -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 page = await _dbContext.Queryable() - .LeftJoin((x, place) => x.PlaceCode == place.Code) - .WhereIF(request.PlaceCode.HasValue, x => request.PlaceCode == x.PlaceCode) - .WhereIF(!request.Search.IsEmpty(), x => x.Name.Contains(request.Search)) - .Select((x, place) => new GetMenuResponse - { - PlaceName = place.Name, - - }, 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}:该营业点不存在！"); - - - } - - public async Task> GetDishesAsync(GetDishesRequest request) - { - return null; - } - - public async Task SaveDishesAsync(SaveDishesRequest request) - { - if (!request.Id.HasValue) - { - var dishers = request.Adapt(); - //todo 检验重复 - dishers.CustomCode = request.CustomCode; - 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 deleted file mode 100644 index 414e6381..00000000 --- a/Src/Dlhis.Canteen/Order/Services/Implements/MiniProgramOrderDetailService.cs +++ /dev/null @@ -1,177 +0,0 @@ -using Dlhis.Canteen.Order.Request; -using Dlhis.Canteen.Order.Response; -using Dlhis.Entity.Basic.Entity; -using Dlhis.Entity.Canteen.Entities; -using Dlhis.Entity.Canteen.Enums; -using Dlhis.Sys.Api; -using Kurisu.AspNetCore.Utils; -using Kurisu.AspNetCore.Utils.Extensions; -using Kurisu.Core.DataAccess.Dto; -using Kurisu.SqlSugar.Extensions; -using Kurisu.SqlSugar.Services; -using Mapster; -using SqlSugar; - -namespace Dlhis.Canteen.Order.Services.Implements; - -public class MiniProgramOrderDetailService : IMiniProgramOrderDetailService -{ - private readonly IDbContext _dbContext; - private readonly ITenantApi _tenantApi; - public MiniProgramOrderDetailService(IDbContext dbContext, ITenantApi tenantApi) - { - _dbContext = dbContext; - _tenantApi = tenantApi; - } - - public async Task> GetMiniProgramOrderAsync(GetMiniProgramOrderRequest request) - { - var page = await _dbContext.Queryable() - .LeftJoin((order, place) => order.PlaceCode == place.Code) - .LeftJoin((order, place, dishers) => order.DishesCode == dishers.CustomCode) - .LeftJoin((order, place, dishers, depart) => order.DepartmentNo == depart.No) - .WhereIF(!request.Search.IsEmpty(), order => order.Name == request.Search || order.Code == request.Search) - .WhereIF(request.SysDate.HasValue, order => order.SysDate == request.SysDate) - .OrderBy(order => order.CostDate, OrderByType.Desc) - .Select((order, place, dishers, depart) => new GetMiniProgramOrderResponse - { - PlaceName = place.Name, - DepartmentName = depart.Name, - DishesName = dishers.Name, - }, true) - .ToPageListAsync(request); - return page; - } - - public async Task SaveDetailAsync(SaveDetailRequest request) - { - if (!request.Id.HasValue) - { - var entity = request.Adapt(); - 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> GetDetailAsync(GetDetailRequest request) - { - var page = await _dbContext.Queryable() - .WhereIF(!request.Search.IsEmpty(), x => x.ThirdNo == request.Search) - .Select() - .ToPageListAsync(request); - - return page; - } - - public async Task OrderAsync(OrderRequest request) - { - //判断时间 - DateTime currentTime = DateTime.Now; - TimeSpan ninePM = new TimeSpan(20, 30, 0); - if (currentTime.TimeOfDay > ninePM) - { - true.ThrowIfTrue("20:30之后无法订餐!"); - } - //判断营业日 - var dishes = await _dbContext.Queryable().Where(x => x.CustomCode == request.DishesCode).FirstAsync(); - dishes.Enable.ThrowIfFalse($"{dishes.Name}没启用!"); - - var menu = await _dbContext.Queryable().Where(x => x.Code == request.MenuCode).FirstAsync(); - menu.Enable.ThrowIfFalse($"{dishes.Name}没启用!"); - - // 获取用餐日期 - DateOnly tomorrow = DateOnly.FromDateTime(DateTime.Today.AddDays(1)); - if (tomorrow != menu.StartDate) - { - true.ThrowIfTrue($"菜品:{dishes.Name}对应的菜单:{menu.Name}不在营业日!"); - } - - var restricted = await _dbContext.Queryable() - .Where(x => x.MenuCode == request.MenuCode && x.DishersCode == request.DishesCode).FirstAsync(); - restricted.ThrowIfNull($"每日菜单:{menu.Name} 还没有配置菜品:{dishes.Name} 的限售数量!"); - if (restricted.RestrictedNum < 0) - { - true.ThrowIfTrue($"菜品:{dishes.Name}已售罄!"); - } - - var gainfo = await _dbContext.Queryable() - .Where(x => x.Code == request.UserCode) - .FirstAsync(); - gainfo.ThrowIfNull($"用户{request.UserCode}无档案信息，无法订餐!"); - - //判断是否订过餐 - var flag = await _dbContext.Queryable() - .Where(x => x.SysDate == tomorrow && x.ShiftType == request.ShiftType && x.Code == request.UserCode && x.OrderStatus == MiniProgramOrderStatusEnumType.I) - .AnyAsync(); - flag.ThrowIfTrue($"工号:{request.UserCode} 姓名:{gainfo.Name} 已经定过{tomorrow}的{request.ShiftType.GetDescription()}!"); - - //支付方式 - /* var result = await _tenantApi.GetTenantTreeAsync(); - var tree = result.Data; - var shanxi = tree.Where(x => x.Name == "山西基地").FirstOrDefault(); - var codes = shanxi.Next.Select(x => x.Code).ToList(); - if (!codes.Contains(gainfo.Factory)) - { - if (request.PayType == CanteenPayEnumType.Repair) - { - true.ThrowIfTrue($"非山西，支付方式不能为{request.PayType.GetDescription()}"); - } - }*/ - - //生成订单 - var order = new MiniProgramOrderEntity - { - No = "O" + SnowFlakeHelper.Instance.NextId(), - Name = gainfo.Name, - Code = gainfo.Code, - Werks = gainfo.Werks, - DepartmentNo = gainfo.DepartmentNo, - CostId = gainfo.CostId, - Workplace = gainfo.Workplace, - Factory = gainfo.Factory, - PlaceCode = request.PlaceCode, - ShiftType = request.ShiftType, - DishesCode = request.DishesCode, - Phone = gainfo.Phone, - SysDate = tomorrow, - CostDate = DateTime.Now, - PayType = request.PayType, - OrderStatus = MiniProgramOrderStatusEnumType.I, - OrderType = dishes.Type, - }; - //生成订单明细 - var detail = new OrderDetailsEntity - { - ThirdNo = order.No, - SysDate = tomorrow, - ShiftType = request.ShiftType, - DishesCode = request.DishesCode, - DishesName = dishes.Name, - Price = dishes.Price, - Unit = dishes.Unit, - Number = request.DishesNum, - Amount = request.DishesNum * dishes.Price, - Status = OrderDetailsStatusEnumType.I, - }; - order.Amount = detail.Amount; - await _dbContext.InsertAsync(order); - await _dbContext.InsertAsync(detail); - - //扣减份数 - var effect = await _dbContext.Updateable() - .SetColumns(x => x.RestrictedNum == restricted.RestrictedNum - request.DishesNum) - .SetColumns(x => x.Version == x.Version + 1) - .Where(x => x.MenuCode == request.MenuCode && x.DishersCode == request.DishesCode && x.Version == restricted.Version) - .ExecuteCommandAsync(); - - if (effect <= 0) throw new VersionExceptions("更新版本冲突"); - } - -} diff --git a/Src/Dlhis.Canteen/Order/Services/Implements/OrderService.cs b/Src/Dlhis.Canteen/Order/Services/Implements/OrderService.cs index cb345396..2abe09aa 100644 --- a/Src/Dlhis.Canteen/Order/Services/Implements/OrderService.cs +++ b/Src/Dlhis.Canteen/Order/Services/Implements/OrderService.cs @@ -1,6 +1,5 @@ using Dlhis.Basic.Api; -using Dlhis.Canteen.Order.Request; -using Dlhis.Canteen.Order.Response; +using Dlhis.Canteen.Dishes.Request; using Dlhis.Canteen.Setting.Services; using Dlhis.Entity.Basic.Entity; using Dlhis.Entity.Canteen.Entities; @@ -11,10 +10,14 @@ using Kurisu.AspNetCore.Utils; using Kurisu.AspNetCore.Utils.Extensions; using Kurisu.Core.CustomClass; using Kurisu.Core.DataAccess.Dto; +using Kurisu.Core.User.Abstractions; using Kurisu.SqlSugar.Extensions; using Kurisu.SqlSugar.Services; using Mapster; using SqlSugar; +using Dlhis.Canteen.Order.Response; +using Dlhis.Canteen.Dishes; +using Dlhis.Canteen.Order.Request; namespace Dlhis.Canteen.Order.Services.Implements; @@ -23,16 +26,22 @@ public class OrderService : IOrderService private readonly IDbContext _dbContext; private readonly ICanteenSettingService _canteenSettingService; private readonly IDevicePermissionApi _devicePermissionApi; + private readonly ICurrentUser _currentUser; + private readonly IDisheMenuApi _disheMenuApi; private readonly ILogger _logger; public OrderService(IDbContext dbContext, ICanteenSettingService canteenSettingService, IDevicePermissionApi devicePermissionApi, + ICurrentUser currentUser, + IDisheMenuApi disheMenuApi, ILogger logger) { _dbContext = dbContext; _canteenSettingService = canteenSettingService; _devicePermissionApi = devicePermissionApi; + _currentUser = currentUser; + _disheMenuApi = disheMenuApi; _logger = logger; } @@ -53,6 +62,117 @@ public class OrderService : IOrderService uniqueNos.Contains(deviceUniqueNo).ThrowIfFalse("无消费权限"); } + public async Task Booking(BookingMealRequest request) + { + var jinkoCode = _currentUser.GetUserClaim("jinko-code"); + var gainfo = await _dbContext.Queryable().Where(x => x.Code == jinkoCode).FirstAsync(); + + var businessPlace = await _dbContext.Queryable().Where(x => x.Code == request.BusinessPlaceCode).FirstAsync(); + + //预定时间 + var now = DateTime.Now; + + var settings = await _canteenSettingService.GetUserSettingAsync(gainfo.Code); + var bookingDeadline = GetSetting(settings, CanteenSettingItemEnumType.BookingDeadline) ?? new TimeOnly(20, 30, 00); + var dealLine = DateTime.Today.Add(bookingDeadline.ToTimeSpan()); + (now >= dealLine).ThrowIfTrue("超出订餐时间"); + + //菜单存在 + var menuDetailResult = await _disheMenuApi.GetBookingDishesDetailAsync(request.BookingDate, request.BusinessPlaceCode, (int)request.ShiftType, request.DishesCode); + var menuDetail = menuDetailResult.Data; + menuDetail.ThrowIfNull("预定失败,菜品已经下架"); + + var order = new CanteenOrderEntity + { + RequestJson = request.ToJson(), + ThirdNo = string.Empty, + Type = BalanceRecordTypeEnumType.Out, + Name = gainfo.Name, + Source = request.Source, + UserNo = gainfo.No, + UserCode = gainfo.Code, + Amount = -Math.Abs(menuDetail.Price), + BusinessPlaceCode = request.BusinessPlaceCode, + BusinessShiftCode = null, + ShiftType = request.ShiftType, + CostDate = now.Date, + CostId = gainfo.CostId, + DepartmentNo = gainfo.DepartmentNo, + DeviceUniqueNo = string.Empty, + + No = SnowFlakeHelper.Instance.NextId().ToString(), + SubsidiesFromMonth = now.ToString("yyyyMM"), + IsOffline = false, + IsCostCrossTenant = GetSetting(settings, CanteenSettingItemEnumType.AllowCrossTenant), + + OriginTenantId = gainfo.Factory,//人员可能跨基地消费 + + Status = BalanceRecordStatusEnumType.Valid, + OrderStatus = CanteenOrderStatusEnumType.Successful, + + CostDateTime = now, + + //标识当前消费的基地 + TenantId = businessPlace.TenantId, + }; + + var orderId = await _dbContext.InsertReturnIdentityAsync(order); + await ContinueUpdateAsync(async () => + { + await _disheMenuApi.GetBookingDishesDetailAsync(request.BookingDate, request.BusinessPlaceCode, (int)request.ShiftType, request.DishesCode); + var menuDetail = menuDetailResult.Data; + menuDetail.ThrowIfNull("预定失败,菜品已经下架"); + menuDetail.Number -= 1; + + (menuDetail.Number < 0).ThrowIfTrue($"{menuDetail.DishesName}已售罄"); + + var canteenUser = await _dbContext.Queryable().Where(x => x.UserNo == order.UserNo).FirstAsync(); + //金额+- + canteenUser.Balance += order.Amount; + if (canteenUser.Balance < 0) + { + throw new UserFriendlyException("余额不足,无法消费"); + } + + var effect = await _dbContext.Updateable() + .SetColumns(x => x.Balance == canteenUser.Balance) + .SetColumns(x => x.Version == x.Version + 1) + .Where(x => x.UserNo == order.UserNo && x.Version == canteenUser.Version)//必须与查询时的version一致 + .ExecuteCommandAsync(); + + if (effect <= 0) throw new VersionExceptions("更新版本冲突"); + + effect = await _dbContext.Updateable() + .SetColumns(x => x.Number == menuDetail.Number) + .SetColumns(x => x.Version == x.Version + 1) + .SetColumns(x => x.ModifiedTime == now) + .Where(x => x.Date == menuDetail.Date && x.ShiftType == request.ShiftType && x.BusinessPlaceCode == request.BusinessPlaceCode && x.Version == menuDetail.Version) + .ExecuteCommandAsync(); + + if (effect <= 0) throw new VersionExceptions("更新版本冲突"); + + //写入记录 + var balanceRecord = order.Adapt(); + await _dbContext.InsertAsync(balanceRecord); + + await _dbContext.InsertAsync(new OrderDetailEntity + { + OrderNo = order.No, + DishesCode = request.DishesCode, + Price = menuDetail.Price, + Status = OrderDetailsStatusEnumType.I, + //Unit + Number = 1, + }); + + }, 10); + } + + public async Task DeviceConsume(OrderAddRequest request) + { + return await AddAsync(request); + } + public async Task AddAsync(OrderAddRequest request) { //尝试匹配userId @@ -63,7 +183,7 @@ public class OrderService : IOrderService .Where(x => x.No == request.UserUniqueNo || x.Code == request.UserUniqueNo || x.Id == userId || x.CardNo == request.UserUniqueNo) .FirstAsync(); - gainfo.ThrowIfNull($"用户{request.UserUniqueNo}不存在,无法操作"); + gainfo.ThrowIfNull($"无消费权限"); //消费权限控制 await CheckPAsync(gainfo.No, request.DeviceUniqueNo); @@ -194,14 +314,14 @@ public class OrderService : IOrderService CostDate = costDate.Date, CostId = gainfo.CostId, DepartmentNo = gainfo.DepartmentNo, - DeviceInfo = request.DeviceUniqueNo, + DeviceUniqueNo = request.DeviceUniqueNo, - No = "O" + SnowFlakeHelper.Instance.NextId(), + No = SnowFlakeHelper.Instance.NextId().ToString(), SubsidiesFromMonth = request.CostDateTime.ToString("yyyyMM"), IsOffline = request.IsOffline, IsCostCrossTenant = GetSetting(settings, CanteenSettingItemEnumType.AllowCrossTenant), - OriginTenantId = gainfo.Werks,//人员可能跨基地消费 + OriginTenantId = gainfo.Factory,//人员可能跨基地消费 //餐别异常处理 Status = shift == null ? BalanceRecordStatusEnumType.Doubtful : BalanceRecordStatusEnumType.Valid, @@ -264,13 +384,13 @@ public class OrderService : IOrderService CostDate = DateTime.Now.Date, CostId = gainfo.CostId, DepartmentNo = gainfo.DepartmentNo, - DeviceInfo = string.Empty, + DeviceUniqueNo = string.Empty, - No = "O" + SnowFlakeHelper.Instance.NextId(), + No = SnowFlakeHelper.Instance.NextId().ToString(), SubsidiesFromMonth = request.CostDateTime.ToString("yyyyMM"), IsCostCrossTenant = GetSetting(settings, CanteenSettingItemEnumType.AllowCrossTenant), - OriginTenantId = gainfo.Werks,//人员可能跨基地消费 + OriginTenantId = gainfo.Factory,//人员可能跨基地消费 Status = BalanceRecordStatusEnumType.Valid, @@ -279,7 +399,7 @@ public class OrderService : IOrderService CostDateTime = request.CostDateTime, //标识当前消费的基地 - TenantId = gainfo.Werks, + TenantId = gainfo.Factory, }; var orderId = await _dbContext.InsertReturnIdentityAsync(order); @@ -305,8 +425,6 @@ public class OrderService : IOrderService } - - //******************************************************* help methods ************************************************************/ @@ -355,7 +473,6 @@ public class OrderService : IOrderService { try { - if (int.TryParse(v, out var n)) { return n.Adapt(); @@ -526,5 +643,4 @@ public class OrderService : IOrderService }, 5); } - } diff --git a/Src/Dlhis.Canteen/Order/TimePeriodExtensions.cs b/Src/Dlhis.Canteen/Order/TimePeriodExtensions.cs index 2698f706..39b402b4 100644 --- a/Src/Dlhis.Canteen/Order/TimePeriodExtensions.cs +++ b/Src/Dlhis.Canteen/Order/TimePeriodExtensions.cs @@ -1,6 +1,6 @@ using Kurisu.Core.CustomClass; -namespace Dlhis.Canteen.Order; +namespace Dlhis.Canteen.Dishes; /// diff --git a/Src/Dlhis.Canteen/Program.cs b/Src/Dlhis.Canteen/Program.cs index ce855b85..b9710d07 100644 --- a/Src/Dlhis.Canteen/Program.cs +++ b/Src/Dlhis.Canteen/Program.cs @@ -23,6 +23,16 @@ public class Startup : DefaultStartup public override void ConfigureServices(IServiceCollection services) { base.ConfigureServices(services); + //protected static string Obfuscate(string value) + //{ + // var last4Chars = "****"; + // if (value.IsPresent() && value.Length > 4) + // { + // last4Chars = value.Substring(value.Length - 4); + // } + + // return "****" + last4Chars; + //} services.AddRedis(); } diff --git a/Src/Dlhis.Canteen/Setting/Services/Implements/CanteenSettingService.cs b/Src/Dlhis.Canteen/Setting/Services/Implements/CanteenSettingService.cs index cb707ca8..3395fc7c 100644 --- a/Src/Dlhis.Canteen/Setting/Services/Implements/CanteenSettingService.cs +++ b/Src/Dlhis.Canteen/Setting/Services/Implements/CanteenSettingService.cs @@ -70,35 +70,7 @@ public class CanteenSettingService : ICanteenSettingService } } - private void Inspection(CanteenSettingSaveRequest request) - { - var value = request.Value; - var result = request.Item switch - { - //TimeOnly - CanteenSettingItemEnumType.BusinessSwitchTime => IsValidFormat(value, request.Item), - - //int - CanteenSettingItemEnumType.DayEVoucherUseCountMax => IsValidFormat(value), - - //decimal - CanteenSettingItemEnumType.OnceCostMax => IsValidFormat(value), - CanteenSettingItemEnumType.DayCostMax => IsValidFormat(value), - CanteenSettingItemEnumType.DayMarketCostMax => IsValidFormat(value), - CanteenSettingItemEnumType.Subsidies => IsValidFormat(value), - CanteenSettingItemEnumType.InitBalance => IsValidFormat(value), - - //bool - CanteenSettingItemEnumType.AllowNoBalance => IsValidFormat(value, request.Item), - CanteenSettingItemEnumType.AllowSendAtMeal => IsValidFormat(value, request.Item), - CanteenSettingItemEnumType.AllowRepeatInOneShift => IsValidFormat(value, request.Item), - CanteenSettingItemEnumType.AllowCrossTenant => IsValidFormat(value, request.Item), - _ => throw new NotImplementedException(), - }; - - result.ThrowIfFalse($"{request.Item.GetDescription()},参数值为[{value}],格式错误"); - } public async Task SetEnableAsync(CanteenSettingSetEnableRequest request) { @@ -112,15 +84,15 @@ public class CanteenSettingService : ICanteenSettingService public async Task> GetUserSettingAsync(string userNo) { - var setting = await _context.Queryable() - .Where(x => x.UniqueType == CanteenSettingUnqiueEnumType.Person && (x.UniqueValue == userNo) || x.UniqueType == CanteenSettingUnqiueEnumType.Tenant) + var settings = await _context.Queryable() + .Where(x => (x.UniqueType == CanteenSettingUnqiueEnumType.Person && x.UniqueValue == userNo) || x.UniqueType == CanteenSettingUnqiueEnumType.Tenant) .ToListAsync(); //从基地 -> 个人,确保下面循环做到覆盖,并且以个人配置为主 - setting = setting.OrderBy(x => x.UniqueType).ToList(); + settings = settings.OrderBy(x => x.UniqueType).ToList(); var result = new Dictionary(); - setting.ForEach(x => + settings.ForEach(x => { if (result.ContainsKey(x.Item)) { @@ -197,4 +169,35 @@ public class CanteenSettingService : ICanteenSettingService return true; } + + private static void Inspection(CanteenSettingSaveRequest request) + { + var value = request.Value; + + var result = request.Item switch + { + //TimeOnly + CanteenSettingItemEnumType.BusinessSwitchTime => IsValidFormat(value, request.Item), + CanteenSettingItemEnumType.BookingDeadline => IsValidFormat(value, request.Item), + + //int + CanteenSettingItemEnumType.DayEVoucherUseCountMax => IsValidFormat(value), + + //decimal + CanteenSettingItemEnumType.OnceCostMax => IsValidFormat(value), + CanteenSettingItemEnumType.DayCostMax => IsValidFormat(value), + CanteenSettingItemEnumType.DayMarketCostMax => IsValidFormat(value), + CanteenSettingItemEnumType.Subsidies => IsValidFormat(value), + CanteenSettingItemEnumType.InitBalance => IsValidFormat(value), + + //bool + CanteenSettingItemEnumType.AllowNoBalance => IsValidFormat(value, request.Item), + CanteenSettingItemEnumType.AllowSendAtMeal => IsValidFormat(value, request.Item), + CanteenSettingItemEnumType.AllowRepeatInOneShift => IsValidFormat(value, request.Item), + CanteenSettingItemEnumType.AllowCrossTenant => IsValidFormat(value, request.Item), + _ => throw new NotImplementedException(), + }; + + result.ThrowIfFalse($"{request.Item.GetDescription()},参数值为[{value}],格式错误"); + } } diff --git a/Src/Dlhis.Canteen/SqlSugarPack.cs b/Src/Dlhis.Canteen/SqlSugarPack.cs index f8d3a155..a05817df 100644 --- a/Src/Dlhis.Canteen/SqlSugarPack.cs +++ b/Src/Dlhis.Canteen/SqlSugarPack.cs @@ -1,9 +1,5 @@ using Kurisu.AspNetCore.Startup; -using Kurisu.Core.DataAccess.Entity; using Kurisu.SqlSugar.Extensions; -using Kurisu.SqlSugar.Services; -using Microsoft.AspNetCore.Mvc.Filters; -using SqlSugar; namespace Dlhis.Canteen; @@ -15,102 +11,4 @@ public class SqlSugarPack : BaseAppPack { services.AddSqlSugar(); } -} - - - - - -/// -/// 日志 -/// -[AttributeUsage(AttributeTargets.Method)] -public class LogAttribute : Attribute, IAsyncActionFilter -{ - public LogAttribute(string title) - { - Title = title; - } - - /// - /// - /// - public string Title { get; set; } - - /// - /// 是否处理差异 - /// - public bool Diff { get; set; } - - - public async Task OnActionExecutionAsync(ActionExecutingContext context, ActionExecutionDelegate next) - { - PreSetting(context.HttpContext); - await next(); - } - - private void PreSetting(HttpContext httpContext) - { - var options = httpContext.RequestServices.GetService(); - - options.Title = Title; - options.Diff = Diff; - options.BatchNo = Guid.NewGuid(); - options.RoutePath = httpContext.Request.Path.Value; - options.RaiseTime = DateTime.Now; - } -} - -/// -/// 事务 -/// -[AttributeUsage(AttributeTargets.Method)] -public class TransactionalAttribute : Attribute, IAsyncActionFilter -{ - public async Task OnActionExecutionAsync(ActionExecutingContext context, ActionExecutionDelegate next) - { - var dbContext = context.HttpContext.RequestServices.GetRequiredService(); - await dbContext.Ado.BeginTranAsync(); - try - { - var result = await next(); - if (result.Exception != null) - { - throw result.Exception; - } - else - { - await dbContext.Ado.CommitTranAsync(); - } - } - catch (Exception) - { - await dbContext.Ado.RollbackTranAsync(); - throw; - } - } -} - -/// -/// 忽略租户 -/// -[AttributeUsage(AttributeTargets.Method)] -public class IgnoreTenantAttribute : Attribute, IAsyncActionFilter -{ - public async Task OnActionExecutionAsync(ActionExecutingContext context, ActionExecutionDelegate next) - { - var dbContext = context.HttpContext.RequestServices.GetRequiredService(); - var options = context.HttpContext!.RequestServices.GetService(); - try - { - dbContext.QueryFilter.ClearAndBackup(); - options.IgnoreTenant = true; - await next(); - } - finally - { - options.IgnoreTenant = false; - dbContext.QueryFilter.Restore(); - } - } -} +} \ No newline at end of file diff --git a/Src/Dlhis.Entity/Canteen/Entities/MiniProgramOrderEntity.cs b/Src/Dlhis.Entity/Canteen/Entities/MiniProgramOrderEntity.cs deleted file mode 100644 index 39975b22..00000000 --- a/Src/Dlhis.Entity/Canteen/Entities/MiniProgramOrderEntity.cs +++ /dev/null @@ -1,114 +0,0 @@ -using Dlhis.Entity.Canteen.Enums; -using Kurisu.Core.DataAccess.Entity; -using Kurisu.SqlSugar; -using SqlSugar; -using SqlSugar.DbConvert; - -namespace Dlhis.Entity.Canteen.Entities -{ - /// - /// 小程序订单表 - /// - [SugarTable(TableName = "MiniProgramOrder", TableDescription = "小程序订单表")] - public class MiniProgramOrderEntity : SugarBaseEntity, ITenantId - { - /// - /// 订单号 - /// - [SugarColumn(ColumnDescription = "订单号")] - public string No { get; set; } - - /// - /// 姓名 - /// - [SugarColumn(ColumnDescription = "姓名")] - public string Name { get; set; } - - /// - /// 工号 - /// - [SugarColumn(ColumnDescription = "工号")] - public string Code { get; set; } - - /// - /// 人事范围 - /// - [SugarColumn(ColumnDescription = "人事范围")] - public string Werks { get; set; } - - /// - /// 部门编码 - /// - [SugarColumn(ColumnDescription = "部门编码")] - public string DepartmentNo { get; set; } - - /// - /// 成本中心 - /// - [SugarColumn(ColumnDescription = "成本中心")] - public string CostId { get; set; } - - /// - /// 工作地 - /// - [SugarColumn(ColumnDescription = "工作地")] - public string Workplace { get; set; } - - /// - /// 厂区 - /// - [SugarColumn(ColumnDescription = "厂区")] - public string Factory { get; set; } - - /// - /// 营业点 - /// - [SugarColumn(ColumnDescription = "营业点")] - public Guid PlaceCode { get; set; } - - /// - /// 餐次 - /// - [SugarColumn(ColumnDataType = "varchar(50)", SqlParameterDbType = typeof(EnumToStringConvert), ColumnDescription = "餐次")] - public ShiftEnumType ShiftType { get; set; } - - /// - /// 手机号码 - /// - [SugarColumn(ColumnDescription = "手机号码")] - public string Phone { get; set; } - - /// - /// 用餐日期 - /// - [SugarColumn(ColumnDescription = "用餐日期", IsNullable = true)] - public DateTime UseDate { get; set; } - - /// - /// 支付方式 - /// - [SugarColumn(ColumnDescription = "支付方式", ColumnDataType = "varchar(50)", SqlParameterDbType = typeof(EnumToStringConvert))] - public BalanceRecordSourceEnumType PayType { get; set; } - - /// - /// 订单状态 - /// - [SugarColumn(ColumnDataType = "varchar(50)", SqlParameterDbType = typeof(EnumToStringConvert), ColumnDescription = "订单状态")] - public MiniProgramOrderStatusEnumType OrderStatus { get; set; } - - /// - /// 订单类型 - /// - [SugarColumn(ColumnDataType = "varchar(50)", SqlParameterDbType = typeof(EnumToStringConvert), ColumnDescription = "订单类型")] - public CanteenMenuEnumType OrderType { get; set; } - - /// - /// 总金额 - /// - [SugarColumn(ColumnDescription = "金额")] - public decimal Amount { get; set; } - - - public string TenantId { get; set; } - } -} diff --git a/Src/Dlhis.Entity/Canteen/Entities/OrderDetailsEntity.cs b/Src/Dlhis.Entity/Canteen/Entities/OrderDetailEntity.cs similarity index 84% rename from Src/Dlhis.Entity/Canteen/Entities/OrderDetailsEntity.cs rename to Src/Dlhis.Entity/Canteen/Entities/OrderDetailEntity.cs index 2f692ab9..53b59bd9 100644 --- a/Src/Dlhis.Entity/Canteen/Entities/OrderDetailsEntity.cs +++ b/Src/Dlhis.Entity/Canteen/Entities/OrderDetailEntity.cs @@ -9,8 +9,8 @@ namespace Dlhis.Entity.Canteen.Entities; /// /// 订餐明细表 /// -[SugarTable(TableName = "OrderDetails", TableDescription = "订餐明细表")] -public class OrderDetailsEntity : SugarBaseEntity, ITenantId +[SugarTable(TableName = "OrderDetail", TableDescription = "订单明细表")] +public class OrderDetailEntity : SugarBaseEntity, ITenantId { /// /// 订单号 @@ -46,8 +46,9 @@ public class OrderDetailsEntity : SugarBaseEntity, ITenantId /// /// 订单明细状态 /// - [SugarColumn(ColumnDataType = "varchar(50)", SqlParameterDbType = typeof(EnumToStringConvert), ColumnDescription = "订单明细状态")] + [SugarColumn(ColumnDataType = "varchar(50)", SqlParameterDbType = typeof(EnumToStringConvert), ColumnDescription = "状态")] public OrderDetailsStatusEnumType Status { get; set; } + public string TenantId { get; set; } } diff --git a/Src/Dlhis.Entity/Canteen/Enums/OrderDetailsStatusEnumType.cs b/Src/Dlhis.Entity/Canteen/Enums/OrderDetailsStatusEnumType.cs index 0012812e..0b4eed43 100644 --- a/Src/Dlhis.Entity/Canteen/Enums/OrderDetailsStatusEnumType.cs +++ b/Src/Dlhis.Entity/Canteen/Enums/OrderDetailsStatusEnumType.cs @@ -1,14 +1,9 @@ -using System; -using System.Collections.Generic; -using System.ComponentModel; -using System.Linq; -using System.Text; -using System.Threading.Tasks; +using System.ComponentModel; namespace Dlhis.Entity.Canteen.Enums { /// - /// 订单明细状态 + /// 订单明细状态 OrderDetailsStatusEnumType /// [Description("订单明细状态")] public enum OrderDetailsStatusEnumType