From 52081904dc467b81db0b28ff7cfed5979f14d1d2 Mon Sep 17 00:00:00 2001
From: cloudroam <cloudroam>
Date: 星期五, 08 十一月 2024 19:52:04 +0800
Subject: [PATCH] add:钱包功能调整1108-2
---
src/main/java/com/mzl/flower/web/v2/report/OrderReportController.java | 37 +++++++++++++++++++++++++++++++------
1 files changed, 31 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 741d754..6e1aeea 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,8 +6,11 @@
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;
+import com.mzl.flower.dto.response.report.OrderSupplierReportResultVO;
import com.mzl.flower.service.report.OrderReportService;
import com.mzl.flower.utils.ConverterUtil;
import io.swagger.annotations.Api;
@@ -72,22 +75,44 @@
@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);
}
+ /**
+ * 花农结算报表
+ */
+ @GetMapping("/supplier/page")
+ @ApiOperation(value = "花农结算报表-分页", notes = "花农结算报表-分页")
+ public ResponseEntity<ReturnDataDTO<Page<OrderSupplierReportResultVO>>> supplier(Page page, QuerySupplierDTO dto) {
+ return returnData(R.SUCCESS.getCode(), orderReportService.getOrderSupplierPage(page, dto));
+ }
+
+ @GetMapping("/supplier/count")
+ @ApiOperation(value = "花农结算报表-统计", notes = "花农结算报表-统计")
+ public ResponseEntity<ReturnDataDTO<Page<OrderSupplierReportResultVO>>> supplierCount(QuerySupplierDTO dto) {
+ return returnData(R.SUCCESS.getCode(), orderReportService.getOrderSupplierClout(dto));
+ }
+
+ @GetMapping({"/supplier/export"})
+ @ApiOperation(value = "花农结算报表导出")
+ public void supplierExports(HttpServletResponse response, QuerySupplierDTO dto) {
+ orderReportService.exportSupplierList(response, dto);
+ }
+
+
}
\ No newline at end of file
--
Gitblit v1.9.3