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/mapper/report/OrderReportMapper.java | 7 ++++++-
1 files changed, 6 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/mzl/flower/mapper/report/OrderReportMapper.java b/src/main/java/com/mzl/flower/mapper/report/OrderReportMapper.java
index 10868a8..561639b 100644
--- a/src/main/java/com/mzl/flower/mapper/report/OrderReportMapper.java
+++ b/src/main/java/com/mzl/flower/mapper/report/OrderReportMapper.java
@@ -2,6 +2,7 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.mzl.flower.dto.response.report.*;
+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.OrderReportCalendarBO;
@@ -15,7 +16,11 @@
List<OrderDetailReportResultVO> getOrderDetailReport(@Param("dto") OrderReportCalendarBO calendarBO, Page page);
- OrderPartnerReportResultVO getPartnerOrderDateReport(@Param("dto") OrderReportCalendarBO calendarBO);
+ OrderPartnerReportResultVO getPartnerOrderDateReportStatis(@Param("dto") QueryPartnerOrderDTO bo);
+
+ Page<OrderPartnerReportResultVO> getPartnerOrderDateReportPage(Page page, @Param("dto") QueryPartnerOrderDTO dto);
+
+ List<OrderPartnerReportResultVO> getPartnerOrderDateReportList(@Param("dto") QueryPartnerOrderDTO dto);
OrderPartnerReportResultVO getPartnerOrderDateReportStatis(@Param("dto") OrderReportCalendarBO bo);
--
Gitblit v1.9.3