From 7c00d0d9a01901f18679d6a005f9729d74f904bf Mon Sep 17 00:00:00 2001 From: SongZhang <2064194730@qq.com> Date: Thu, 12 Sep 2024 14:54:53 +0800 Subject: [PATCH] =?UTF-8?q?1.=E4=BB=A3=E5=AE=A2=E4=B8=8B=E5=8D=95=20?= =?UTF-8?q?=E5=88=9B=E5=BB=BA=E8=AE=A2=E5=8D=95=E7=9B=B4=E6=8E=A5=E4=BB=98?= =?UTF-8?q?=E6=AC=BE=E4=B8=8D=E5=A2=9E=E5=8A=A0placeNum?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/shopimpl/TbShopTableServiceImpl.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) 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 42be90ec..fc6d0f8b 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 @@ -1037,7 +1037,8 @@ public class TbShopTableServiceImpl implements TbShopTableService { Integer mealNum = null; - if (addMaterId && cashierCarts.stream().noneMatch(item -> item.getPlaceNum() == null)) { + boolean unAdd = cashierCarts.stream().noneMatch(item -> item.getPlaceNum() == null); + if (addMaterId && unAdd) { throw new BadRequestException("此次未添加新商品，清先添加商品"); } for (TbCashierCart cashierCart : cashierCarts) { @@ -1101,7 +1102,7 @@ public class TbShopTableServiceImpl implements TbShopTableService { orderInfo.setUseType(createOrderDTO.isPostPay() ? "postPay" : "afterPay"); orderInfo.setUserId(createOrderDTO.getVipUserId() == null ? null : String.valueOf(createOrderDTO.getVipUserId())); orderInfo.setCreatedAt(DateUtil.current()); - if (addMaterId) { + if (!unAdd) { orderInfo.setPlaceNum(placeNum); } orderInfoMapper.updateById(orderInfo);