转台

cash-api/order-server/src/main/java/com/czg/controller/admin/AdminOrderController.java

@@ -3,10 +3,7 @@ package com.czg.controller.admin;
 import com.czg.annotation.Debounce;
 import com.czg.annotation.SaStaffCheckPermission;
 import com.czg.config.RabbitPublisher;
-import com.czg.order.dto.OrderInfoAddDTO;
-import com.czg.order.dto.OrderInfoPrintDTO;
-import com.czg.order.dto.OrderInfoQueryDTO;
-import com.czg.order.dto.OrderInfoRefundDTO;
+import com.czg.order.dto.*;
 import com.czg.order.entity.OrderInfo;
 import com.czg.order.service.OrderInfoService;
 import com.czg.order.vo.HistoryOrderPrintVo;
@@ -76,15 +73,13 @@ public class AdminOrderController {
         return CzgResult.success(orderInfoService.createOrder(addDto));
     }
 
-//    /**
-//     * 合单
-//     * @param refundDTO
-//     * @return
-//     */
-//    @PostMapping("/mergeOrder")
-//    public CzgResult<Object> mergeOrder(@Validated @RequestBody OrderInfoRefundDTO refundDTO) {
-//
-//    }
+    /**
+     * 转桌
+     */
+    @PostMapping("/mergeOrder")
+    public CzgResult<Object> mergeOrder(@Validated @RequestBody MergeOrderDTO param) {
+        return orderInfoService.mergeOrder(param);
+    }
 
     /**
      * 订单全额退款 只传订单id