From b5fc56c0aa2db89b131c947e32a4498904a27748 Mon Sep 17 00:00:00 2001
From: SongZhang <2064194730@qq.com>
Date: Mon, 19 Aug 2024 15:43:11 +0800
Subject: [PATCH] =?UTF-8?q?1.=E4=BB=A3=E5=AE=A2=E4=B8=8B=E5=8D=95=20?=
 =?UTF-8?q?=E6=8C=82=E5=8D=95=E8=A7=84=E6=A0=BC=E8=BF=94=E5=9B=9E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/product/TbPlaceController.java | 32 ++++++++++++-------
 1 file changed, 21 insertions(+), 11 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 0bc3f355..4252c149 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
@@ -101,6 +101,16 @@ public class TbPlaceController {
     ) {
         return ResponseEntity.ok(tbShopTableService.getCart(tableId, page, size, shopId, vipUserId, masterId));
     }
+    @AnonymousAccess
+
+    @GetMapping("/pending/cart")
+    @Log("代客下单 查询购物车")
+    @ApiOperation("代客下单 查询购物车 /shop/table")
+    public ResponseEntity<Object> getPendingCart(
+            @RequestParam Integer shopId
+    ) {
+        return ResponseEntity.ok(tbShopTableService.getCar(shopId));
+    }
 
     @AnonymousAccess
 
@@ -148,17 +158,6 @@ public class TbPlaceController {
         return ResponseEntity.ok(tbShopTableService.getPayType(shopId));
     }
 
-
-    @AnonymousAccess
-
-    @PutMapping("/pay")
-    @Log("代客下单 查询购物车")
-    @ApiOperation("代客下单 查询购物车 /shop/table")
-    public ResponseEntity<Object> pay(
-            @Validated @RequestBody PayDTO payDTO
-    ) {
-        return ResponseEntity.ok(tbShopTableService.pay(payDTO));
-    }
     @AnonymousAccess
 
     @DeleteMapping("/order")
@@ -170,4 +169,15 @@ public class TbPlaceController {
         return ResponseEntity.ok(tbShopTableService.deleteOrder(deleteOrderDTO));
     }
 
+    @AnonymousAccess
+
+    @PutMapping("/pay")
+    @Log("代客下单 查询购物车")
+    @ApiOperation("代客下单 查询购物车 /shop/table")
+    public ResponseEntity<Object> pay(
+            @Validated @RequestBody PayDTO payDTO
+    ) {
+        return ResponseEntity.ok(tbShopTableService.pay(payDTO));
+    }
+
 }