cloudroam
2024-12-09 96abc87da07408ef817d9086ea71ba4c287aa474
src/main/java/com/mzl/flower/service/impl/report/OrderReportServiceImpl.java
@@ -105,7 +105,7 @@
        String[] rowsName = new String[]{"序号","下单日期", "销售额", "花农底价", "平台区间加价", "平台加价", "平台区域加价"
                , "合伙人加价", "合伙人区间加价", "会员折扣","优惠券","降级扣款","缺货扣款","补货扣款","售后扣合伙人款","售后扣花农款",
                "售后扣平台款","总包干费","实际销售扎数","利润","结算状态",};
                "售后扣平台款","总包干费","总销售扎数","实际销售扎数","利润","结算状态",};
        List<Object[]> dataList = new ArrayList<>();
        int sn = 1;
        for (OrderReportResultVO o : list) {
@@ -129,6 +129,7 @@
            objs[a++] = o.getOrderFeeSupplier(); // 售后扣花农款
            objs[a++] = o.getOrderFeePlatform(); //售后扣平台款
            objs[a++] = o.getPartnerTotalFeeAmount(); // 总包干费
            objs[a++] = o.getOrderNum(); // 总销售扎数
            objs[a++] = o.getRealSaleNum(); // 实际销售扎数
            objs[a++] = o.getProfitFeeAmount(); //利润
            objs[a++] = o.getSettleStatus(); // 结算状态
@@ -347,7 +348,7 @@
    @Override
    public AppSupplierStatisticsVO getAppSupplierStatistics(QueryAppSupplierDTO dto) {
        // TODO
        // 总成交:花农售卖全部的底价合计,
        // 本月成交:本月售卖的底价合计,