From 0790e530ea01e0629fa5d21d6e94d79e50bd52d9 Mon Sep 17 00:00:00 2001
From: cloudroam <cloudroam>
Date: 星期五, 27 九月 2024 18:11:13 +0800
Subject: [PATCH] add: 订单明细报表
---
src/main/java/com/mzl/flower/web/v2/report/OrderReportController.java | 25 +++++++++++++------------
1 files changed, 13 insertions(+), 12 deletions(-)
diff --git a/src/main/java/com/mzl/flower/web/v2/report/OrderReportController.java b/src/main/java/com/mzl/flower/web/v2/report/OrderReportController.java
index a4bd585..a53178a 100644
--- a/src/main/java/com/mzl/flower/web/v2/report/OrderReportController.java
+++ b/src/main/java/com/mzl/flower/web/v2/report/OrderReportController.java
@@ -5,24 +5,13 @@
import com.mzl.flower.base.BaseController;
import com.mzl.flower.base.R;
import com.mzl.flower.base.ReturnDataDTO;
-import com.mzl.flower.config.exception.ValidationException;
-import com.mzl.flower.dto.request.coupon.CreateCouponRecordDTO;
-import com.mzl.flower.dto.request.coupon.QueryCouponRecordDTO;
-import com.mzl.flower.dto.request.payment.OrderItemSalesQueryDTO;
import com.mzl.flower.dto.request.report.QueryOrderDTO;
-import com.mzl.flower.dto.response.coupon.CouponRecordResultVO;
-import com.mzl.flower.dto.response.coupon.CouponRecordVO;
+import com.mzl.flower.dto.response.report.OrderDetailReportResultVO;
import com.mzl.flower.dto.response.report.OrderReportResultVO;
-import com.mzl.flower.entity.coupon.CouponRecordDO;
-import com.mzl.flower.entity.coupon.CouponTemplateDO;
-import com.mzl.flower.enums.CouponStatusEnum;
-import com.mzl.flower.service.coupon.CouponRecordService;
-import com.mzl.flower.service.coupon.CouponTemplateService2;
import com.mzl.flower.service.report.OrderReportService;
import com.mzl.flower.utils.ConverterUtil;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
-import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.ResponseEntity;
import org.springframework.validation.annotation.Validated;
@@ -67,4 +56,16 @@
orderReportService.exportSalesList(response, dto);
}
+ @GetMapping("/detail/page")
+ @ApiOperation(value = "查询-分页", notes = "查询-分页")
+ public ResponseEntity<ReturnDataDTO<Page<OrderDetailReportResultVO>>> detail(Page page, QueryOrderDTO dto) {
+ return returnData(R.SUCCESS.getCode(), orderReportService.getOrderDetailPage(page, dto));
+ }
+
+ @GetMapping("/detail/export")
+ @ApiOperation(value = "订单结算明细导出")
+ public void exportOrderDetail(HttpServletResponse response, QueryOrderDTO queryOrderDTO) {
+ orderReportService.exportOrderDetail(response, queryOrderDTO);
+ }
+
}
\ No newline at end of file
--
Gitblit v1.9.3