add: 花材销售统计商品分类

cloudroam

2024-12-20 c83b580b0f51a2cdf16f2b1537aa3cb113ef112f

 src/main/java/com/mzl/flower/web/v2/report/OrderReportController.java

@@ -6,6 +6,7 @@
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;
@@ -74,21 +75,21 @@
    @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);
    }

@@ -109,7 +110,7 @@

    @GetMapping({"/supplier/export"})
    @ApiOperation(value = "花农结算报表导出")
    public void supplierExports(HttpServletResponse response, @Validated QuerySupplierDTO dto) {
    public void supplierExports(HttpServletResponse response, QuerySupplierDTO dto) {
        orderReportService.exportSupplierList(response, dto);
    }