fix:补充花农报表

cloudroam

2024-10-11 56a7e539628f35d350532e8afcb51e39d9cd0cf9

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

@@ -6,8 +6,11 @@
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;
import com.mzl.flower.dto.response.report.OrderSupplierReportResultVO;
import com.mzl.flower.service.report.OrderReportService;
import com.mzl.flower.utils.ConverterUtil;
import io.swagger.annotations.Api;
@@ -72,22 +75,44 @@
    @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);
    }

    /**
     * 花农结算报表
     */
    @GetMapping("/supplier/page")
    @ApiOperation(value = "花农结算报表-分页", notes = "花农结算报表-分页")
    public ResponseEntity<ReturnDataDTO<Page<OrderSupplierReportResultVO>>> supplier(Page page, QuerySupplierDTO dto) {
        return returnData(R.SUCCESS.getCode(), orderReportService.getOrderSupplierPage(page, dto));
    }

    @GetMapping("/supplier/count")
    @ApiOperation(value = "花农结算报表-统计", notes = "花农结算报表-统计")
    public ResponseEntity<ReturnDataDTO<Page<OrderSupplierReportResultVO>>> supplierCount(QuerySupplierDTO dto) {
        return returnData(R.SUCCESS.getCode(), orderReportService.getOrderSupplierClout(dto));
    }

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


}