Merge remote-tracking branch 'origin/master-v2' into master-v2

cloudroam

2024-10-12 d390d8f502436eaa17ee8ca7abd3c3f8a11a8514

 src/main/java/com/mzl/flower/service/report/OrderReportService.java

@@ -2,8 +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;

@@ -18,4 +22,28 @@
    void exportSalesList(HttpServletResponse response, QueryOrderDTO dto);

    public void exportOrderDetail(HttpServletResponse response, QueryOrderDTO queryOrderDTO);

    /**
     * 合伙人结算列表
     * @param page
     * @param dto
     * @return
     */
    Page<OrderPartnerReportResultVO> getPartnerSalePage(Page page, QueryPartnerOrderDTO dto);

    /**
     * 合伙人结算列表统计
     *
     * @param dto
     * @return
     */
    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);
}