From d390d8f502436eaa17ee8ca7abd3c3f8a11a8514 Mon Sep 17 00:00:00 2001 From: cloudroam <cloudroam> Date: 星期六, 12 十月 2024 13:43:51 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master-v2' into master-v2 --- src/main/java/com/mzl/flower/web/payment/OrderController.java | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/src/main/java/com/mzl/flower/web/payment/OrderController.java b/src/main/java/com/mzl/flower/web/payment/OrderController.java index 16ed168..0d9d2d6 100644 --- a/src/main/java/com/mzl/flower/web/payment/OrderController.java +++ b/src/main/java/com/mzl/flower/web/payment/OrderController.java @@ -22,6 +22,7 @@ import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; +import javax.servlet.http.HttpServletResponse; import java.util.List; @RestController @@ -51,7 +52,6 @@ public ResponseEntity<ReturnDataDTO<Page<OrderPlatformListDTO>>> selectOrderList(Page page, OrderQueryDTO dto){ return returnData(R.SUCCESS.getCode(), orderService.selectOrderPlatformList(page, dto)); } - @GetMapping("/list/view") @ApiOperation(value = "订单详情") @ApiImplicitParams({ @@ -188,4 +188,9 @@ return returnData(R.SUCCESS.getCode(),null); } + @GetMapping("/list/export") + @ApiOperation(value = "订单导出") + public void exportOrderDetail(HttpServletResponse response, OrderQueryDTO queryOrderDTO) { + orderService.exportOrderDetail(response, queryOrderDTO); + } } -- Gitblit v1.9.3