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/service/report/OrderReportService.java |    8 ++++++++
 1 files changed, 8 insertions(+), 0 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 548d75a..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,10 +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;
 
@@ -38,4 +40,10 @@
     OrderPartnerReportResultVO getPartnerSaleStatis(QueryPartnerOrderDTO 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