From 7af4a48dfa44d99bf5ba1c67844ee96b64a4e6cb Mon Sep 17 00:00:00 2001 From: SongZhang <2064194730@qq.com> Date: Wed, 11 Sep 2024 18:04:06 +0800 Subject: [PATCH] =?UTF-8?q?1.=E4=BB=A3=E5=AE=A2=E4=B8=8B=E5=8D=95=20?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=8F=B0=E6=A1=8C=E5=B0=B1=E9=A4=90=E4=BA=BA?= =?UTF-8?q?=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/ysk/cashier/pojo/shop/TbShopTable.java | 2 ++ .../service/impl/shopimpl/TbShopTableServiceImpl.java | 7 ++++--- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/pojo/shop/TbShopTable.java b/eladmin-system/src/main/java/cn/ysk/cashier/pojo/shop/TbShopTable.java index 936640ce..d34d454d 100644 --- a/eladmin-system/src/main/java/cn/ysk/cashier/pojo/shop/TbShopTable.java +++ b/eladmin-system/src/main/java/cn/ysk/cashier/pojo/shop/TbShopTable.java @@ -121,6 +121,8 @@ public class TbShopTable implements Serializable { private Integer totalAmount; @Column(name = "`real_amount`") private Integer realAmount; + @Column(name = "`use_num`") + private Integer useNum; public void copy(TbShopTable source){ diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/shopimpl/TbShopTableServiceImpl.java b/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/shopimpl/TbShopTableServiceImpl.java index 062be576..75c963c3 100644 --- a/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/shopimpl/TbShopTableServiceImpl.java +++ b/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/shopimpl/TbShopTableServiceImpl.java @@ -1022,10 +1022,10 @@ public class TbShopTableServiceImpl implements TbShopTableService { int placeNum = getCurrentPlaceNum(createOrderDTO.getTableId(), createOrderDTO.getShopId().toString()); List orderDetails = new ArrayList<>(); - boolean mealCost = false; + Integer mealNum = null; for (TbCashierCart cashierCart : cashierCarts) { if ("-999".equals(cashierCart.getProductId())) { - mealCost = true; + mealNum = cashierCart.getNumber(); } if (!"return".equals(cashierCart.getStatus())) { totalAmount = totalAmount.add(cashierCart.getTotalAmount()); @@ -1060,7 +1060,7 @@ public class TbShopTableServiceImpl implements TbShopTableService { orderDetail.setPlaceNum(placeNum); } - if (!mealCost) { + if (mealNum == null) { throw new BadRequestException("请选择用餐人数"); } @@ -1184,6 +1184,7 @@ public class TbShopTableServiceImpl implements TbShopTableService { .set(TbShopTable::getProductNum, cashierCarts.size()) .set(TbShopTable::getTotalAmount, orderInfo.getOrderAmount()) .set(TbShopTable::getRealAmount, orderInfo.getOrderAmount()) + .set(TbShopTable::getUseNum, mealNum) .set(TbShopTable::getStatus, TableStateEnum.USING.getState()); if (isFirst) { wrapper.set(TbShopTable::getUseTime, DateUtil.date());