From dd26e7873b396e716760b8ddd92b24a6e00bb6f4 Mon Sep 17 00:00:00 2001
From: SongZhang <2064194730@qq.com>
Date: Thu, 29 Aug 2024 16:09:02 +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=E6=94=AF=E6=8C=81?=
 =?UTF-8?q?=E6=93=8D=E4=BD=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../cashierservice/service/OrderService.java  | 34 +++++++------------
 1 file changed, 13 insertions(+), 21 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 63b0b9d..99356df 100644
--- a/src/main/java/com/chaozhanggui/system/cashierservice/service/OrderService.java
+++ b/src/main/java/com/chaozhanggui/system/cashierservice/service/OrderService.java
@@ -150,9 +150,9 @@ public class OrderService {
         }
 
         TbCashierCart cart = cashierCartMapper.selectByPrimaryKey(cartId);
-        if (cart != null && cart.getNumber() > number && StrUtil.isNotBlank(cart.getOrderId()) && StrUtil.isNotBlank(cart.getTableId())) {
-            return Result.fail("此商品已经出餐不支持减少操作");
-        }
+//        if (cart != null && cart.getNumber() > number && StrUtil.isNotBlank(cart.getOrderId()) && StrUtil.isNotBlank(cart.getTableId())) {
+//            return Result.fail("此商品已经出餐不支持减少操作");
+//        }
 
 //        List<TbProskuCon>  proskuConList=  tbProskuConMapper.selectByShopIdAndSkuIdAndProductId(skuId,shopInfo.getId(),product.getId());
 //        if(Objects.nonNull(proskuConList)&&proskuConList.size()>0){
@@ -465,9 +465,9 @@ public class OrderService {
             return Result.fail(CodeEnum.CARTEXIST);
         }
 
-        if (cashierCart.getOrderId() != null) {
-            return Result.success(CodeEnum.SUCCESS, "已打票商品不支持删除", null);
-        }
+//        if (cashierCart.getOrderId() != null) {
+//            return Result.success(CodeEnum.SUCCESS, "已打票商品不支持删除", null);
+//        }
 
         TbProductWithBLOBs product= tbProductMapper.selectByPrimaryKey(Integer.valueOf(cashierCart.getProductId()));
         if(ObjectUtil.isEmpty(product)){
@@ -1084,11 +1084,11 @@ public class OrderService {
         ArrayList<Integer> 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;
-            }
+//            if (StrUtil.isNotBlank(cashierCart.getOrderId()) && StrUtil.isNotBlank(cashierCart.getTableId())) {
+//                orderId = Integer.parseInt(cashierCart.getOrderId());
+//                proName.append(cashierCart.getName()).append(",");
+//                continue;
+//            }
 
             ids.add(cashierCart.getId());
             // 数量减少, 返还库存
@@ -1114,11 +1114,7 @@ public class OrderService {
         if (orderId > 0) {
             TbOrderInfo orderInfo = tbOrderInfoMapper.selectByPrimaryKey(orderId);
             if (ids.isEmpty() && "postPay".equals(orderInfo.getUseType())) {
-                if (StrUtil.isBlank(proName.toString())) {
-                    return Result.success(CodeEnum.SUCCESS);
-                }else {
-                    return Result.fail(proName + "已出餐，无法删除");
-                }
+                return Result.success(CodeEnum.SUCCESS);
             }
 
             // 返还耗材
@@ -1155,11 +1151,7 @@ public class OrderService {
                 .eq(TbShopTable::getQrcode, cartVo.getTableId())
                 .set(TbShopTable::getStatus, TableStateEnum.IDLE.getState()));
 
-        if (StrUtil.isBlank(proName.toString())) {
-            return Result.success(CodeEnum.SUCCESS);
-        }else {
-            return Result.fail(proName + "已出餐，无法删除");
-        }
+        return Result.success(CodeEnum.SUCCESS);
     }