From f38160a365599318dae24eb2b9f07de8b78f7e1e Mon Sep 17 00:00:00 2001
From: cloudroam <cloudroam>
Date: 星期五, 11 十月 2024 08:41:04 +0800
Subject: [PATCH] Merge branch 'master-v2' of http://47.96.225.205:8888/r/flowerbackend-v2 into master-v2
---
src/main/java/com/mzl/flower/web/v2/report/OrderReportController.java | 13 +++++++------
1 files changed, 7 insertions(+), 6 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 7c8cfd9..939ebe0 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
@@ -6,6 +6,7 @@
import com.mzl.flower.base.R;
import com.mzl.flower.base.ReturnDataDTO;
import com.mzl.flower.dto.request.report.QueryOrderDTO;
+import com.mzl.flower.dto.request.report.QueryPartnerOrderDTO;
import com.mzl.flower.dto.request.report.QuerySupplierDTO;
import com.mzl.flower.dto.response.report.OrderDetailReportResultVO;
import com.mzl.flower.dto.response.report.OrderReportResultVO;
@@ -74,21 +75,21 @@
@GetMapping("/partner/sale/page")
@ApiOperation(value = "合伙人-查询-分页", notes = "合伙人-查询-分页")
public ResponseEntity<ReturnDataDTO<Page<OrderReportResultVO>>> getPartnerPage(
- Page page,@Validated QueryOrderDTO dto
+ Page page,@Validated QueryPartnerOrderDTO dto
) {
- return returnData(R.SUCCESS.getCode(), ConverterUtil.transPage(orderReportService.getPartnerSalePage(page,dto), OrderReportResultVO.class));
+ return returnData(R.SUCCESS.getCode(), orderReportService.getPartnerSalePage(page,dto));
}
@GetMapping("/partner/sale/statis")
- @ApiOperation(value = "合伙人-查询-分页", notes = "合伙人-查询-分页")
- public ResponseEntity<ReturnDataDTO<Page<OrderReportResultVO>>> getPartnerPageStatis(@Validated QueryOrderDTO dto
+ @ApiOperation(value = "合伙人-查询-统计", notes = "合伙人-查询-统计")
+ public ResponseEntity<ReturnDataDTO<Page<OrderReportResultVO>>> getPartnerPageStatis(@Validated QueryPartnerOrderDTO dto
) {
- return returnData(R.SUCCESS.getCode(), ConverterUtil.transObject(orderReportService.getPartnerSaleStatis(dto), OrderReportResultVO.class));
+ return returnData(R.SUCCESS.getCode(), orderReportService.getPartnerSaleStatis(dto));
}
@GetMapping({"/partner/sale/export"})
@ApiOperation(value = "合伙人报告列表导出")
- public void partnerExportSales(HttpServletResponse response,@Validated QueryOrderDTO dto){
+ public void partnerExportSales(HttpServletResponse response,@Validated QueryPartnerOrderDTO dto){
orderReportService.exportPartnerSalesList(response, dto);
}
--
Gitblit v1.9.3