From f03fd9baf8163a4429133a41a183d28abc9e66fd Mon Sep 17 00:00:00 2001
From: cloudroam <cloudroam>
Date: 星期日, 29 十二月 2024 11:39:12 +0800
Subject: [PATCH] add:阿里云短信模板获取签名和模板信息5

---
 src/main/java/com/mzl/flower/web/v2/statisticsAnalysis/StatisticAnalysisController.java |   29 ++++++++++++++++++++++-------
 1 files changed, 22 insertions(+), 7 deletions(-)

diff --git a/src/main/java/com/mzl/flower/web/v2/statisticsAnalysis/StatisticAnalysisController.java b/src/main/java/com/mzl/flower/web/v2/statisticsAnalysis/StatisticAnalysisController.java
index 42f410d..da1e45e 100644
--- a/src/main/java/com/mzl/flower/web/v2/statisticsAnalysis/StatisticAnalysisController.java
+++ b/src/main/java/com/mzl/flower/web/v2/statisticsAnalysis/StatisticAnalysisController.java
@@ -5,16 +5,12 @@
 import com.mzl.flower.base.BaseController;
 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.request.statisticAnalysis.FlowerMaterialDTO;
-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.dto.request.statisticAnalysis.FlowerSaleDTO;
 import com.mzl.flower.dto.response.statisticAnalysis.FlowerMaterialStaticVO;
+import com.mzl.flower.dto.response.statisticAnalysis.FlowerSaleStatisticVO;
 import com.mzl.flower.dto.response.statisticAnalysis.FlowerMaterialVO;
-import com.mzl.flower.service.report.OrderReportService;
+import com.mzl.flower.dto.response.statisticAnalysis.FlowerSaleVO;
 import com.mzl.flower.service.statisticsAnalysis.StatisticAnalysisService;
 import com.mzl.flower.utils.ConverterUtil;
 import io.swagger.annotations.Api;
@@ -66,4 +62,23 @@
     }
 
 
+    @GetMapping("/flower-sale/page")
+    @ApiOperation(value = "花材销售统计-分页", notes = "花材销售统计-分页")
+    public ResponseEntity<ReturnDataDTO<Page<FlowerSaleVO>>> getFlowerSalePage(Page page, @Validated FlowerSaleDTO dto) {
+        return returnData(R.SUCCESS.getCode(), ConverterUtil.transPage(statisticAnalysisService.getFlowerSalePage(page, dto), FlowerSaleVO.class));
+    }
+
+    @GetMapping("/flower-sale/statistics")
+    @ApiOperation(value = "花材销售统计-统计", notes = "花材销售统计")
+    public ResponseEntity<ReturnDataDTO<FlowerSaleStatisticVO>> getFlowerSaleStatistics(@Validated FlowerSaleDTO dto) {
+        return returnData(R.SUCCESS.getCode(), ConverterUtil.transObject(statisticAnalysisService.getFlowerSaleStatistics(dto), FlowerSaleStatisticVO.class));
+    }
+
+
+    @GetMapping({"/flower-sale/export"})
+    @ApiOperation(value = "花材销售统计-导出")
+    public void exportFlowerSales(HttpServletResponse response, @Validated FlowerSaleDTO dto) {
+        statisticAnalysisService.exportFlowerSales(response, dto);
+    }
+
 }
\ No newline at end of file

--
Gitblit v1.9.3