From c9b3cea5cd03a89be000a19d57276ce1030d2a20 Mon Sep 17 00:00:00 2001 From: SongZhang <2064194730@qq.com> Date: Thu, 29 Aug 2024 15:49:28 +0800 Subject: [PATCH] =?UTF-8?q?1.=E4=BB=A3=E5=AE=A2=E4=B8=8B=E5=8D=95=20?= =?UTF-8?q?=E5=B7=B2=E5=87=BA=E9=A4=90=E5=95=86=E5=93=81=E4=B8=8D=E6=94=AF?= =?UTF-8?q?=E6=8C=81=E6=93=8D=E4=BD=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../system/cashierservice/service/OrderService.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/service/OrderService.java b/src/main/java/com/chaozhanggui/system/cashierservice/service/OrderService.java index 08dd88d..0027abe 100644 --- a/src/main/java/com/chaozhanggui/system/cashierservice/service/OrderService.java +++ b/src/main/java/com/chaozhanggui/system/cashierservice/service/OrderService.java @@ -150,7 +150,7 @@ public class OrderService { } TbCashierCart cart = cashierCartMapper.selectByPrimaryKey(cartId); - if (cart != null && cart.getNumber() < number && StrUtil.isNotBlank(cart.getOrderId()) && StrUtil.isNotBlank(cart.getTableId())) { + if (cart != null && cart.getNumber() > number && StrUtil.isNotBlank(cart.getOrderId()) && StrUtil.isNotBlank(cart.getTableId())) { return Result.fail("此商品已经出餐不支持减少操作"); } @@ -1082,9 +1082,11 @@ public class OrderService { List productSkuPos = new ArrayList<>(); List skuIds = new ArrayList<>(); ArrayList ids = new ArrayList<>(); + StringBuilder proName = new StringBuilder(); for (TbCashierCart cashierCart : list) { if (StrUtil.isNotBlank(cashierCart.getOrderId()) && StrUtil.isNotBlank(cashierCart.getTableId())) { orderId = Integer.parseInt(cashierCart.getOrderId()); + proName.append(cashierCart.getName()).append(","); continue; } @@ -1149,7 +1151,7 @@ public class OrderService { .eq(TbShopTable::getQrcode, cartVo.getTableId()) .set(TbShopTable::getStatus, TableStateEnum.IDLE.getState())); - return Result.success(CodeEnum.SUCCESS); + return Result.success(CodeEnum.SUCCESS, proName + "商品已出餐，无法删除", null); }