票据打印简化

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

@@ -39,28 +39,24 @@ public class TbPlaceController {
     }
 
     @PostMapping("/addCart")
-    @Log("代客下单:#addCartDTO.tableId")
     @ApiOperation("代客下单/shop/table")
     public ResponseEntity<TbCashierCart> addCartForUser(@Valid @RequestBody AddCartDTO addCartDTO) {
         return ResponseEntity.ok(tbShopTableService.addCartForUser(addCartDTO));
     }
 
     @PutMapping("/choseModel")
-    @Log("代客下单:#addCartDTO.tableId")
     @ApiOperation("代客下单/shop/table")
     public ResponseEntity<?> choseModel(@Valid @RequestBody ChoseModelDTO choseModelDTO) {
         return ResponseEntity.ok(tbShopTableService.choseModel(choseModelDTO));
     }
 
     @PutMapping("/updateCart")
-    @Log("代客下单")
     @ApiOperation("代客下单/shop/table")
     public ResponseEntity<TbCashierCart> updateCart(@Valid @RequestBody UpdateCartDTO updateCartDTO) {
         return ResponseEntity.ok(tbShopTableService.updateCart(updateCartDTO));
     }
 
     @PutMapping("/pack")
-    @Log("代客下单")
     @ApiOperation("代客下单/shop/table")
     public ResponseEntity<TbCashierCart> pack(@Valid @RequestBody PackCartDTO packCartDTO) {
         tbShopTableService.pack(packCartDTO);
@@ -68,7 +64,6 @@ public class TbPlaceController {
     }
 
     @DeleteMapping("/removeCart")
-    @Log("代客下单 删除购物车商品")
     @ApiOperation("代客下单 清空购物车 /shop/table")
     public ResponseEntity<Object> removeCart(@Validated @RequestBody RemoveCartDTO removeCartDTO) {
         tbShopTableService.removeCart(removeCartDTO);
@@ -76,7 +71,6 @@ public class TbPlaceController {
     }
 
     @PutMapping("/returnCart")
-    @Log("代客下单 退单")
     @ApiOperation("代客下单 清空购物车 /shop/table")
     public ResponseEntity<Object> returnOrder(@Validated @RequestBody ReturnOrderDTO removeCartDTO) {
         tbShopTableService.returnCart(removeCartDTO);
@@ -84,7 +78,6 @@ public class TbPlaceController {
     }
 
     @DeleteMapping("/clearCart")
-    @Log("代客下单 清空购物车")
     @ApiOperation("代客下单 清空购物车 /shop/table"/**/)
     public ResponseEntity<Object> clearCart(@Validated @RequestBody ClearCartDTO clearCartDTO) {
         tbShopTableService.clearCart(clearCartDTO);
@@ -92,7 +85,6 @@ public class TbPlaceController {
     }
 
     @GetMapping("/cart")
-    @Log("代客下单 查询购物车")
     @ApiOperation("代客下单 查询购物车 /shop/table")
     public ResponseEntity<Object> getCart(@RequestParam(defaultValue = "1") Integer page,
                                           @RequestParam(defaultValue = "10") Integer size,
@@ -104,7 +96,6 @@ public class TbPlaceController {
     }
 
     @GetMapping("/pending/cart")
-    @Log("代客下单 查询购物车")
     @ApiOperation("代客下单 查询购物车 /shop/table")
     public ResponseEntity<Object> getPendingCart(@RequestParam Integer shopId,
                                                  @RequestParam(required = false) String tableId,
@@ -113,7 +104,6 @@ public class TbPlaceController {
     }
 
     @GetMapping("/masterId")
-    @Log("代客下单 查询购物车")
     @ApiOperation("代客下单 ")
     public ResponseEntity<Object> getMasterId(@RequestParam Integer shopId,
                                               @RequestParam String tableId,
@@ -122,21 +112,18 @@ public class TbPlaceController {
     }
 
     @PostMapping("/order")
-    @Log("代客下单 查询购物车")
     @ApiOperation("代客下单 查询购物车 /shop/table")
     public ResponseEntity<Object> createOrder(@RequestBody CreateOrderDTO createOrderDTO ) {
         return ResponseEntity.ok(tbShopTableService.createOrder(createOrderDTO, !createOrderDTO.isPostPay(), true));
     }
 
     @PostMapping("/pending")
-    @Log("代客下单 查询购物车")
     @ApiOperation("代客下单 查询购物车 /shop/table")
     public ResponseEntity<Object> pending(@RequestBody PendingDTO pendingDTO) {
         return ResponseEntity.ok(tbShopTableService.pending(pendingDTO));
     }
 
     @GetMapping("/payType")
-    @Log("代客下单 获取支付类型")
     @ApiOperation("代客下单 获取支付类型")
     public ResponseEntity<Object> getPayType(
             @RequestParam Integer shopId
@@ -145,7 +132,6 @@ public class TbPlaceController {
     }
 
     @DeleteMapping("/order")
-    @Log("代客下单 删除订单")
     @ApiOperation("代客下单 删除订单")
     public ResponseEntity<Object> delete(
             @Validated @RequestBody DeleteOrderDTO deleteOrderDTO
@@ -154,7 +140,6 @@ public class TbPlaceController {
     }
 
     @PutMapping("/pay")
-    @Log("代客下单 支付订单")
     @ApiOperation("代客下单 支付订单")
     public ResponseEntity<Object> pay(
             @Validated @RequestBody PayDTO payDTO
@@ -164,7 +149,6 @@ public class TbPlaceController {
     }
 
     @PutMapping("/choseTable")
-    @Log("代客下单 选择台桌")
     @ApiOperation("代客下单 选择台桌")
     public ResponseEntity<Object> choseTable(
             @Validated @RequestBody ChoseTableDTO choseTableDTO
@@ -174,7 +158,6 @@ public class TbPlaceController {
     }
 
     @PutMapping("/choseCount")
-    @Log("代客下单 选择用餐人数")
     @ApiOperation("代客下单 选择用餐人数")
     public ResponseEntity<Object> choseCount(
             @Validated @RequestBody ChoseCountDTO choseCountDTO
@@ -184,7 +167,6 @@ public class TbPlaceController {
     }
 
     @PutMapping("/updateVip")
-    @Log("代客下单 查询购物车")
     @ApiOperation("代客下单 查询购物车 /shop/table")
     public ResponseEntity<Object> updateVip(
             @Validated @RequestBody UpdateVipDTO updateVipDTO
@@ -193,7 +175,6 @@ public class TbPlaceController {
     }
 
     @PostMapping("/printOrder")
-    @Log("代客下单 打印订单")
     @ApiOperation("代客下单 打印订单")
     public ResponseEntity<Object> printOrder(
             @Validated @RequestBody BaseTableDTO baseTableDTO
@@ -201,7 +182,6 @@ public class TbPlaceController {
         return ResponseEntity.ok(tbShopTableService.printOrder(baseTableDTO));
     }
 
-    @PostMapping("/printDishes")
     @Log("代客下单 打印菜品单")
     @ApiOperation("代客下单 打印菜品单")
     public ResponseEntity<Object> printDishes(
@@ -215,7 +195,7 @@ public class TbPlaceController {
     public void test(
             @RequestParam Integer id
     ) {
-        rabbitMsgUtils.printDishesTicket(4951, false, 9783);
+//        rabbitMsgUtils.printDishesTicket(4951, false, 9783);
 
     }