diff --git a/Src/Dlhis.Basic/Dishes/Controller/DishesCategoriesController.cs b/Src/Dlhis.Basic/Dishes/Controller/DishesCategoriesController.cs index f633a0de..fd642e4c 100644 --- a/Src/Dlhis.Basic/Dishes/Controller/DishesCategoriesController.cs +++ b/Src/Dlhis.Basic/Dishes/Controller/DishesCategoriesController.cs @@ -34,19 +34,6 @@ public class DishesCategoriesController : ControllerBase } - /// - /// 获取分类树(无权限) - /// - /// - /// - [HttpGet("tree-all")] - [IgnoreTenant] - public async Task> TreeAllAsync(Guid businessPlaceCode) - { - return await _dishesCategoryService.TreeAllAsync(businessPlaceCode); - } - - /// /// 获取分类树(无权限) /// diff --git a/Src/Dlhis.Basic/Dishes/Controller/DishesMenusController.cs b/Src/Dlhis.Basic/Dishes/Controller/DishesMenusController.cs index 9416df59..f79d493e 100644 --- a/Src/Dlhis.Basic/Dishes/Controller/DishesMenusController.cs +++ b/Src/Dlhis.Basic/Dishes/Controller/DishesMenusController.cs @@ -52,23 +52,7 @@ public class DishesMenusController : ControllerBase return await _dishesMenuService.GetDishesMenuDetailAsync(businessPlaceCode, customCode, startDate, endDate); } - /// - /// 根据参数获取菜品 - /// - /// - /// - /// - /// - /// - [HttpGet("dishes-selections")] - [IgnoreTenant] - public async Task> GetDishesUnderCurrentMenuAsync(Guid businessPlaceCode, - DateTime date, - ShiftEnumType? shiftType, - Guid categoryCode) - { - return await _dishesMenuService.GetDishesUnderCurrentMenuAsync(businessPlaceCode, date, shiftType, categoryCode); - } + /// /// 根据参数获取菜品 diff --git a/Src/Dlhis.Basic/Dishes/Services/Implements/DishesCategoryService.cs b/Src/Dlhis.Basic/Dishes/Services/Implements/DishesCategoryService.cs index 982d540f..049e9837 100644 --- a/Src/Dlhis.Basic/Dishes/Services/Implements/DishesCategoryService.cs +++ b/Src/Dlhis.Basic/Dishes/Services/Implements/DishesCategoryService.cs @@ -127,30 +127,6 @@ public class DishesCategoryService : IDishesCategoryService private async Task> GetMyBusinessPlaceCodesAsync() { var mybCodes = (await _businessPlacePermissionsService.GetMyAsync()).Select(x => x.Code).ToList(); - - return mybCodes; - } - - /// - /// 检查营业点权限 - /// - /// - /// - private async Task CheckBusinessPlacePermissionAsync(Guid businessPlaceCode) - { - var codes = await GetMyBusinessPlaceCodesAsync(); - codes.Contains(businessPlaceCode).ThrowIfFalse("无权操作当前营业点"); - } - - - /// - /// 获取我管理的营业点 - /// - /// - private async Task> GetMyBusinessPlaceCodesAsync() - { - var mybCodes = (await _businessPlacePermissionsService.GetMyAsync()).Select(x => x.Code).ToList(); - return mybCodes; } } diff --git a/Src/Dlhis.Canteen/Order/Controllers/OrdersController.cs b/Src/Dlhis.Canteen/Order/Controllers/OrdersController.cs index e74cdf83..8451b885 100644 --- a/Src/Dlhis.Canteen/Order/Controllers/OrdersController.cs +++ b/Src/Dlhis.Canteen/Order/Controllers/OrdersController.cs @@ -90,31 +90,6 @@ public class OrdersController : ControllerBase } //************************************************************** 订餐功能 ********************************************************************************** - /// - /// 订单聚合数据 - /// - /// - [HttpGet("aggregation")] - [IgnoreTenant] - public async Task> GetOrdersAggregationAsync([FromQuery] PageDto page) - { - return await _orderService.GetOrdersAggregationAsync(page); - } - - /// - /// 取消订单 - /// - /// - /// - [HttpPut("user-cancel")] - [Transactional] - [IgnoreTenant] - public async Task CancelOrderAsync(OrderCancelRequest request) - { - await _bookingOrderService.UserCancelOrderAsync(request); - } - - /// /// 取消订单 @@ -129,8 +104,6 @@ public class OrdersController : ControllerBase return await _bookingOrderService.BookingAsync(request); } - //************************************************************** 订餐功能 ********************************************************************************** - /// /// 订单分页 /// diff --git a/Src/Dlhis.Canteen/Order/Response/BalanceRecordByUserResponse.cs b/Src/Dlhis.Canteen/Order/Response/BalanceRecordByUserResponse.cs index d9047a8b..26ab163f 100644 --- a/Src/Dlhis.Canteen/Order/Response/BalanceRecordByUserResponse.cs +++ b/Src/Dlhis.Canteen/Order/Response/BalanceRecordByUserResponse.cs @@ -1,4 +1,5 @@ -namespace Dlhis.Canteen.Order.Response; +using Dlhis.Entity.Canteen.Enums; +using Kurisu.AspNetCore.Utils.Extensions; namespace Dlhis.Canteen.Order.Response; @@ -12,41 +13,41 @@ public class BalanceRecordByUserResponse /// /// 金额 /// - 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 BalanceRecordSourceEnumType Source { get; set; } + /// + /// 来源 + /// + public BalanceRecordSourceEnumType Source { get; set; } - /// - /// 来源CN - /// - public string SourceCN => Source.GetDescription(); + /// + /// 来源CN + /// + public string SourceCN => Source.GetDescription(); - /// - /// 收入/支出 - /// - public BalanceRecordTypeEnumType Type { get; set; } + /// + /// 收入/支出 + /// + public BalanceRecordTypeEnumType Type { get; set; } - /// - /// 收入/支出 - /// - public string TypeCN => Type.GetDescription(); + /// + /// 收入/支出 + /// + public string TypeCN => Type.GetDescription(); - /// - /// 金额 + - 表示 - /// + /// + /// 金额 + - 表示 + /// public decimal Amount { get; set; } /// diff --git a/Src/Dlhis.Canteen/Order/Services/Implements/BookingOrderService.cs b/Src/Dlhis.Canteen/Order/Services/Implements/BookingOrderService.cs index 8b6781a8..f177f75f 100644 --- a/Src/Dlhis.Canteen/Order/Services/Implements/BookingOrderService.cs +++ b/Src/Dlhis.Canteen/Order/Services/Implements/BookingOrderService.cs @@ -297,37 +297,6 @@ public class BookingOrderService : BaseOrderService, IBookingOrderService }, 5); } - var balance = await DbContext.Queryable().Where(x => x.No == request.No).SingleAsync(); - await DbContext.Updateable() - .SetColumns(x => x.Status == BalanceRecordStatusEnumType.Obsolute) - .SetColumns(x => x.Remark == request.Reason) - .SetColumns(x => x.ModifiedTime == now) - .SetColumns(x => x.ModifiedBy == userId) - .Where(x => x.No == request.No) - .ExecuteCommandAsync(); - - var amount = Math.Abs(order.Amount); - - //尝试5次 - await ContinueUpdateAsync(async () => - { - var mealInfo = await DbContext.Queryable().Where(x => x.UserNo == order.UserNo).FirstAsync(); - - var effect = await DbContext.Updateable() - .SetColumns(x => x.Balance == x.Balance + amount) - .SetColumns(x => x.ModifiedTime == now) - .SetColumns(x => x.ModifiedBy == userId) - .Where(x => x.Id == mealInfo.Id && x.Version == mealInfo.Version) - .ExecuteCommandAsync(); - - if (effect <= 0) - { - throw new VersionExceptions("取消订单失败!"); - } - - }, 5); - } - /// /// 检查我的订餐是否存在,存在抛出异常