diff --git a/Src/Dlhis.Basic/Dishes/Controller/DishesMenusController.cs b/Src/Dlhis.Basic/Dishes/Controller/DishesMenusController.cs index 479d8a19..696249dc 100644 --- a/Src/Dlhis.Basic/Dishes/Controller/DishesMenusController.cs +++ b/Src/Dlhis.Basic/Dishes/Controller/DishesMenusController.cs @@ -79,7 +79,10 @@ public class DishesMenusController : ControllerBase /// /// [HttpGet("dishes-selections")] - public async Task> GetDishesUnderCurrentMenuAsync(Guid businessPlaceCode, DateTime date, ShiftEnumType? shiftType, [FromQuery] List categoryCodes) + public async Task> GetDishesUnderCurrentMenuAsync(Guid businessPlaceCode, + DateTime date, + ShiftEnumType? shiftType, + [FromQuery] List categoryCodes) { return await _dishesMenuService.GetDishesUnderCurrentMenuAsync(businessPlaceCode, date, shiftType, categoryCodes); } diff --git a/Src/Dlhis.Basic/Dishes/Response/DishesDetailResponse.cs b/Src/Dlhis.Basic/Dishes/Response/DishesDetailResponse.cs index 4605c66d..37d0b36e 100644 --- a/Src/Dlhis.Basic/Dishes/Response/DishesDetailResponse.cs +++ b/Src/Dlhis.Basic/Dishes/Response/DishesDetailResponse.cs @@ -42,6 +42,11 @@ public class DishesDetailResponse /// public int Number { get; set; } + /// + /// 剩余数量 + /// + public int Number { get; set; } + /// /// 单位 /// diff --git a/Src/Dlhis.Canteen/Order/Services/Implements/BookingOrderService.cs b/Src/Dlhis.Canteen/Order/Services/Implements/BookingOrderService.cs index ab965634..232e6e6e 100644 --- a/Src/Dlhis.Canteen/Order/Services/Implements/BookingOrderService.cs +++ b/Src/Dlhis.Canteen/Order/Services/Implements/BookingOrderService.cs @@ -115,11 +115,11 @@ public class BookingOrderService : BaseOrderService, IBookingOrderService Version = 0, }); - (mealInfo == null).ThrowIfTrue("余额不足,无法消费"); - } - //金额+- - mealInfo.Balance += order.Amount; - (mealInfo.Balance < 0).ThrowIfTrue("余额不足,无法消费"); + (mealInfo == null).ThrowIfTrue("余额不足,无法消费"); + } + //金额+- + mealInfo.Balance += order.Amount; + (mealInfo.Balance < 0).ThrowIfTrue("余额不足,无法消费"); var effectMeal = await DbContext.Updateable() .SetColumns(x => x.Balance == mealInfo.Balance)