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 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 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 pay( + @Validated @RequestBody PayDTO payDTO + ) { + return ResponseEntity.ok(tbShopTableService.pay(payDTO)); + } + }