From 095c40f743ea14151d5f6076049281cb03a39111 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BC=A0=E6=9D=BE?=
 <8605635+zhang3064194730@user.noreply.gitee.com>
Date: Fri, 20 Dec 2024 11:38:16 +0800
Subject: [PATCH] =?UTF-8?q?=E9=80=80=E6=AC=BE=E6=8E=A5=E5=8F=A3=E8=BF=94?=
 =?UTF-8?q?=E5=9B=9E=E6=98=AF=E5=90=A6=E6=B8=85=E7=A9=BA=E8=B4=AD=E7=89=A9?=
 =?UTF-8?q?=E8=BD=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../cashier/controller/product/TbPlaceController.java  |  3 +--
 .../service/impl/shopimpl/TbShopTableServiceImpl.java  | 10 ++++++----
 .../ysk/cashier/service/shop/TbShopTableService.java   |  2 +-
 3 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/controller/product/TbPlaceController.java b/eladmin-system/src/main/java/cn/ysk/cashier/controller/product/TbPlaceController.java
index 2af78c76..1d366ebc 100644
--- a/eladmin-system/src/main/java/cn/ysk/cashier/controller/product/TbPlaceController.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/controller/product/TbPlaceController.java
@@ -117,8 +117,7 @@ public class TbPlaceController {
     @PutMapping("/returnCart")
     @ApiOperation("代客下单 清空购物车 /shop/table")
     public ResponseEntity<Object> returnOrder(@Validated @RequestBody ReturnCartDTO ReturnCartDTO) {
-        tbShopTableService.returnCart(ReturnCartDTO);
-        return new ResponseEntity<>(HttpStatus.OK);
+        return ResponseEntity.ok(tbShopTableService.returnCart(ReturnCartDTO));
     }
 
     @DeleteMapping("/clearCart")
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 beb43f55..8bd78896 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
@@ -831,7 +831,7 @@ public class TbShopTableServiceImpl implements TbShopTableService {
     }
 
     @Override
-    public void returnCart(ReturnCartDTO removeCartDTO) {
+    public boolean returnCart(ReturnCartDTO removeCartDTO) {
         boolean isSeatCart = TableConstant.CashierCart.ID.equals(removeCartDTO.getCartId().toString());
         // 会员点单
         TbCashierCart cashierCart = cashierCartMapper.selectOne(new LambdaQueryWrapper<TbCashierCart>()
@@ -927,16 +927,16 @@ public class TbShopTableServiceImpl implements TbShopTableService {
         }
 
         ShopEatTypeInfoDTO shopEatTypeInfoDTO = checkEatModel(cashierCart.getShopId(), cashierCart.getTableId());
-        checkTakeOutEmptyAndClear(cashierCart, shopEatTypeInfoDTO);
+        return checkTakeOutEmptyAndClear(cashierCart, shopEatTypeInfoDTO);
 
     }
 
     /**
      * 检查订单购物车是否为空并删除订单
      */
-    private void checkTakeOutEmptyAndClear(TbCashierCart cashierCart, ShopEatTypeInfoDTO shopEatTypeInfoDTO) {
+    private boolean checkTakeOutEmptyAndClear(TbCashierCart cashierCart, ShopEatTypeInfoDTO shopEatTypeInfoDTO) {
         if (TableConstant.OrderInfo.UseType.TAKEOUT.equalsVals(cashierCart.getUseType())) {
-            return;
+            return false;
         }
         List<TbCashierCart> cashierCarts = mpCashierCartService.selectByShopEatTypeAndOrderId(shopEatTypeInfoDTO, cashierCart.getMasterId(), cashierCart.getOrderId() == null ? null : cashierCart.getOrderId(), false);
         int activateCount = 0;
@@ -951,7 +951,9 @@ public class TbShopTableServiceImpl implements TbShopTableService {
                     .eq(TbOrderDetail::getOrderId, cashierCart.getOrderId()));
             mpOrderInfoService.removeById(cashierCart.getOrderId());
             mpCashierCartService.removeByIds(cashierCarts);
+            return true;
         }
+        return false;
     }
 
     @Override
diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/service/shop/TbShopTableService.java b/eladmin-system/src/main/java/cn/ysk/cashier/service/shop/TbShopTableService.java
index a40364e5..85845499 100644
--- a/eladmin-system/src/main/java/cn/ysk/cashier/service/shop/TbShopTableService.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/service/shop/TbShopTableService.java
@@ -107,7 +107,7 @@ public interface TbShopTableService {
 
     void removeCart(RemoveCartDTO removeCartDTO);
 
-    void returnCart(ReturnCartDTO returnCartDTO);
+    boolean returnCart(ReturnCartDTO returnCartDTO);
 
     void clearCart(ClearCartDTO clearCartDTO);