From 737f2a5843bfafec2ee861f434c2977d1ec21d21 Mon Sep 17 00:00:00 2001 From: 陶杰 <1378534974@qq.com> Date: 星期二, 15 十月 2024 15:37:31 +0800 Subject: [PATCH] Revert "1.1" --- src/main/java/com/mzl/flower/service/report/OrderReportService.java | 15 ++++++++++++--- 1 files changed, 12 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/mzl/flower/service/report/OrderReportService.java b/src/main/java/com/mzl/flower/service/report/OrderReportService.java index 06065d5..221239d 100644 --- a/src/main/java/com/mzl/flower/service/report/OrderReportService.java +++ b/src/main/java/com/mzl/flower/service/report/OrderReportService.java @@ -2,9 +2,12 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.mzl.flower.dto.request.report.QueryOrderDTO; +import com.mzl.flower.dto.request.report.QuerySupplierDTO; +import com.mzl.flower.dto.request.report.QueryPartnerOrderDTO; import com.mzl.flower.dto.response.report.OrderDetailReportResultVO; import com.mzl.flower.dto.response.report.OrderPartnerReportResultVO; import com.mzl.flower.dto.response.report.OrderReportResultVO; +import com.mzl.flower.dto.response.report.OrderSupplierReportResultVO; import javax.servlet.http.HttpServletResponse; @@ -26,7 +29,7 @@ * @param dto * @return */ - Page<OrderPartnerReportResultVO> getPartnerSalePage(Page page, QueryOrderDTO dto); + Page<OrderPartnerReportResultVO> getPartnerSalePage(Page page, QueryPartnerOrderDTO dto); /** * 合伙人结算列表统计 @@ -34,7 +37,13 @@ * @param dto * @return */ - OrderPartnerReportResultVO getPartnerSaleStatis(QueryOrderDTO dto); + OrderPartnerReportResultVO getPartnerSaleStatis(QueryPartnerOrderDTO dto); - void exportPartnerSalesList(HttpServletResponse response, QueryOrderDTO dto); + void exportPartnerSalesList(HttpServletResponse response, QueryPartnerOrderDTO dto); + + Page<OrderSupplierReportResultVO> getOrderSupplierPage(Page page, QuerySupplierDTO dto); + + OrderSupplierReportResultVO getOrderSupplierClout(QuerySupplierDTO dto); + + void exportSupplierList(HttpServletResponse response, QuerySupplierDTO dto); } -- Gitblit v1.9.3