代客下单逻辑修改
This commit is contained in:
@@ -33,7 +33,7 @@ public class TbPlaceController {
|
||||
|
||||
|
||||
@AnonymousAccess
|
||||
@GetMapping ("/activate")
|
||||
@GetMapping("/activate")
|
||||
@ApiOperation("查询/product")
|
||||
public ResponseEntity<Object> queryActivateTbProductInfo(
|
||||
@RequestParam(defaultValue = "0") Integer page,
|
||||
@@ -41,8 +41,8 @@ public class TbPlaceController {
|
||||
@RequestParam(required = false) Integer categoryId,
|
||||
@RequestParam Integer shopId,
|
||||
@RequestParam(required = false) Integer productId
|
||||
){
|
||||
return new ResponseEntity<>(tbProductService.activateProduct(page, size, categoryId, shopId, productId),HttpStatus.OK);
|
||||
) {
|
||||
return new ResponseEntity<>(tbProductService.activateProduct(page, size, categoryId, shopId, productId), HttpStatus.OK);
|
||||
}
|
||||
|
||||
public TbPlaceController(TbShopTableService tbShopTableService, TbProductService tbProductService, Validator validator, RabbitTemplate rabbitTemplate, RabbitMsgUtils rabbitMsgUtils) {
|
||||
@@ -103,6 +103,7 @@ public class TbPlaceController {
|
||||
tbShopTableService.returnCart(removeCartDTO);
|
||||
return new ResponseEntity<>(HttpStatus.OK);
|
||||
}
|
||||
|
||||
@AnonymousAccess
|
||||
|
||||
@DeleteMapping("/clearCart")
|
||||
@@ -112,6 +113,7 @@ public class TbPlaceController {
|
||||
tbShopTableService.clearCart(clearCartDTO);
|
||||
return new ResponseEntity<>(HttpStatus.OK);
|
||||
}
|
||||
|
||||
@AnonymousAccess
|
||||
|
||||
@GetMapping("/cart")
|
||||
@@ -125,7 +127,7 @@ public class TbPlaceController {
|
||||
@RequestParam String masterId,
|
||||
@RequestParam String useType
|
||||
) {
|
||||
return ResponseEntity.ok(tbShopTableService.getCart(tableId, page, size, shopId,masterId, useType));
|
||||
return ResponseEntity.ok(tbShopTableService.getCart(tableId, page, size, shopId, masterId, useType));
|
||||
}
|
||||
|
||||
@AnonymousAccess
|
||||
@@ -157,7 +159,7 @@ public class TbPlaceController {
|
||||
@Log("代客下单 查询购物车")
|
||||
@ApiOperation("代客下单 查询购物车 /shop/table")
|
||||
public ResponseEntity<Object> createOrder(
|
||||
@RequestBody CreateOrderDTO createOrderDTO
|
||||
@RequestBody CreateOrderDTO createOrderDTO
|
||||
) {
|
||||
return ResponseEntity.ok(tbShopTableService.createOrder(createOrderDTO, !createOrderDTO.isPostPay(), true));
|
||||
}
|
||||
@@ -202,7 +204,7 @@ public class TbPlaceController {
|
||||
@Validated @RequestBody PayDTO payDTO
|
||||
) {
|
||||
|
||||
return ResponseEntity.ok(tbShopTableService.pay(payDTO));
|
||||
return ResponseEntity.ok(tbShopTableService.pay(payDTO));
|
||||
}
|
||||
|
||||
@AnonymousAccess
|
||||
@@ -216,6 +218,7 @@ public class TbPlaceController {
|
||||
|
||||
return ResponseEntity.ok(tbShopTableService.choseTable(choseTableDTO));
|
||||
}
|
||||
|
||||
@AnonymousAccess
|
||||
|
||||
@PutMapping("/choseCount")
|
||||
@@ -259,8 +262,9 @@ public class TbPlaceController {
|
||||
}
|
||||
|
||||
private final RabbitTemplate rabbitTemplate;
|
||||
|
||||
@AnonymousAccess
|
||||
@GetMapping("/test")
|
||||
@GetMapping("/test")
|
||||
public void test(
|
||||
@RequestParam Integer id
|
||||
) {
|
||||
|
||||
Reference in New Issue
Block a user