From 223585f5b97eefb5c81c33d12d0c428072e2bef9 Mon Sep 17 00:00:00 2001
From: SongZhang <2064194730@qq.com>
Date: Thu, 26 Sep 2024 10:41:40 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A4=90=E4=BD=8D=E8=B4=B9=E6=94=AF=E6=8C=81?=
 =?UTF-8?q?=E5=88=A0=E9=99=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/shopimpl/TbShopTableServiceImpl.java | 36 +++++++++++++------
 1 file changed, 26 insertions(+), 10 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 929ac496..58e437bf 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
@@ -538,8 +538,6 @@ public class TbShopTableServiceImpl implements TbShopTableService {
 
     @Override
     public void returnCart(ReturnOrderDTO removeCartDTO) {
-        rabbitMsgUtils.printDishesReturnTicket(4450, 9313);
-
         // 会员点单
         TbCashierCart cashierCart = cashierCartMapper.selectOne(new LambdaQueryWrapper<TbCashierCart>()
                 .eq(TbCashierCart::getShopId, removeCartDTO.getShopId())
@@ -564,16 +562,34 @@ public class TbShopTableServiceImpl implements TbShopTableService {
             throw new BadRequestException("此商品还未下单，无需退单");
         }
 
-        cashierCartMapper.update(null, new LambdaUpdateWrapper<TbCashierCart>()
-                .eq(TbCashierCart::getId, cashierCart.getId())
-                .set(TbCashierCart::getStatus, "return"));
+        // 餐位费直接删除
+        if (cashierCart.getId() == -999) {
+            cashierCartMapper.deleteById(cashierCart.getId());
+            if (cashierCart.getOrderId() != null) {
+                orderDetailMapper.delete(new LambdaQueryWrapper<TbOrderDetail>()
+                        .eq(TbOrderDetail::getCartId, cashierCart.getId()));
 
-        orderDetailMapper.update(null, new LambdaUpdateWrapper<TbOrderDetail>()
-                .eq(TbOrderDetail::getId, tbOrderDetail.getId())
-                .set(TbOrderDetail::getUpdateTime, DateUtil.date())
-                .set(TbOrderDetail::getStatus, "return"));
+                orderInfoMapper.update(null, new LambdaUpdateWrapper<TbOrderInfo>()
+                        .eq(TbOrderInfo::getId, cashierCart.getOrderId())
+                        .eq(TbOrderInfo::getShopId, removeCartDTO.getShopId())
+                        .set(TbOrderInfo::getSeatCount, null)
+                        .set(TbOrderInfo::getSeatAmount, null));
+            }
+
+        }else {
+            cashierCartMapper.update(null, new LambdaUpdateWrapper<TbCashierCart>()
+                    .eq(TbCashierCart::getId, cashierCart.getId())
+                    .set(TbCashierCart::getStatus, "return"));
+
+            orderDetailMapper.update(null, new LambdaUpdateWrapper<TbOrderDetail>()
+                    .eq(TbOrderDetail::getId, tbOrderDetail.getId())
+                    .set(TbOrderDetail::getUpdateTime, DateUtil.date())
+                    .set(TbOrderDetail::getStatus, "return"));
+
+            rabbitMsgUtils.printDishesReturnTicket(tbOrderDetail.getOrderId(), tbOrderDetail.getOrderId());
+
+        }
 
-        rabbitMsgUtils.printDishesReturnTicket(tbOrderDetail.getOrderId(), tbOrderDetail.getOrderId());
     }
 
     @Override