订单详情 携带 分类Id

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

@@ -6,6 +6,7 @@ import com.czg.order.dto.OrderInfoQueryDTO;
 import com.czg.order.dto.OrderInfoRefundDTO;
 import com.czg.order.entity.OrderInfo;
 import com.czg.order.service.OrderInfoService;
+import com.czg.order.vo.HistoryOrderPrintVo;
 import com.czg.order.vo.HistoryOrderVo;
 import com.czg.order.vo.OrderInfoVo;
 import com.czg.resp.CzgResult;
@@ -49,6 +50,11 @@ public class AdminOrderController {
         return orderInfoService.getOrderDetails(orderId);
     }
 
+    @GetMapping("/getOrderByIdPrint")
+    public CzgResult<HistoryOrderPrintVo> getOrderByIdPrint(Long orderId) {
+        return orderInfoService.getOrderByIdPrint(orderId);
+    }
+
     @GetMapping("/historyOrder")
     public CzgResult<HistoryOrderVo> historyOrder(
             @RequestParam(required = false) Long orderId,
@@ -65,6 +71,16 @@ public class AdminOrderController {
         return CzgResult.success(orderInfoService.createOrder(addDto));
     }
 
+//    /**
+//     * 合单
+//     * @param refundDTO
+//     * @return
+//     */
+//    @PostMapping("/mergeOrder")
+//    public CzgResult<Object> mergeOrder(@Validated @RequestBody OrderInfoRefundDTO refundDTO) {
+//
+//    }
+
     /**
      * 订单全额退款 只传订单id
      * 部分退款 传参refundDetail