czg_team/cashier-admin-java
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

代客下单支持外带用餐模式

Browse Source
This commit is contained in:
SongZhang
2024-09-18 17:29:10 +08:00
parent e9fa13fdd8
commit 1b3158930f
18 changed files with 188 additions and 126 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
eladmin-system/src/main/java/cn/ysk/cashier/controller/product/TbPlaceController.java
View File

@@ -91,7 +91,7 @@ public class TbPlaceController {
@PutMapping("/returnCart")
@Log("代客下单 退单")
@ApiOperation("代客下单 清空购物车 /shop/table")
public ResponseEntity<Object> returnOrder(@Validated @RequestBody RemoveCartDTO removeCartDTO) {
public ResponseEntity<Object> returnOrder(@Validated @RequestBody ReturnOrderDTO removeCartDTO) {
tbShopTableService.returnCart(removeCartDTO);
return new ResponseEntity<>(HttpStatus.OK);
}
@@ -112,40 +112,40 @@ public class TbPlaceController {
public ResponseEntity<Object> getCart(
@RequestParam(defaultValue = "1") Integer page,
@RequestParam(defaultValue = "10") Integer size,
@RequestParam Long tableId,
@RequestParam(required = false) Long tableId,
@RequestParam Integer shopId,
@RequestParam(required = false) Integer vipUserId,
@RequestParam String masterId
@RequestParam String masterId,
@RequestParam String useType
) {
return ResponseEntity.ok(tbShopTableService.getCart(tableId, page, size, shopId, vipUserId, masterId));
return ResponseEntity.ok(tbShopTableService.getCart(tableId, page, size, shopId,masterId, useType));
}
@AnonymousAccess
@AnonymousAccess
@GetMapping("/pending/cart")
@Log("代客下单 查询购物车")
@ApiOperation("代客下单 查询购物车 /shop/table")
public ResponseEntity<Object> getPendingCart(
@RequestParam Integer shopId,
@RequestParam String tableId
@RequestParam(required = false) String tableId,
@RequestParam String useType
) {
return ResponseEntity.ok(tbShopTableService.getCar(shopId, tableId));
return ResponseEntity.ok(tbShopTableService.getCar(shopId, tableId, useType));
}
@AnonymousAccess
@GetMapping("/masterId")
@Log("代客下单 查询购物车")
@ApiOperation("代客下单 ")
public ResponseEntity<Object> getMasterId(
@RequestParam Integer shopId,
@RequestParam Long tableId,
@RequestParam(defaultValue = "") String useType,
@RequestParam(required = false) Integer vipUserId
) {
return ResponseEntity.ok(tbShopTableService.getMasterId(shopId, tableId, vipUserId));
return ResponseEntity.ok(tbShopTableService.getMasterId(shopId, tableId, vipUserId, useType));
}
@AnonymousAccess
@PostMapping("/order")
@Log("代客下单 查询购物车")
@ApiOperation("代客下单 查询购物车 /shop/table")
@@ -156,7 +156,6 @@ public class TbPlaceController {
}
@AnonymousAccess
@PostMapping("/pending")
@Log("代客下单 查询购物车")
@ApiOperation("代客下单 查询购物车 /shop/table")
@@ -167,7 +166,6 @@ public class TbPlaceController {
}
@AnonymousAccess
@GetMapping("/payType")
@Log("代客下单 查询购物车")
@ApiOperation("代客下单 查询购物车 /shop/table")
@@ -223,8 +221,6 @@ public class TbPlaceController {
return ResponseEntity.ok(tbShopTableService.choseCount(choseCountDTO));
}
@AnonymousAccess
@PutMapping("/updateVip")
@Log("代客下单 查询购物车")