fix:补充花农报表

cloudroam

2024-10-12 4432a5b67bcb38802bb10ff015762d4f81d6f484

fix:补充花农报表

 src/main/resources/mapper/report/OrderReportMapper.xml

@@ -508,13 +508,15 @@
        sum(order_replace_fee) + sum(order_lack_fee_supplier) order_lack_fee_supplier,
        sum(order_num)-sum(order_lack_num) as real_sale_num,
        sum(sales_fee_supplier) sales_fee_supplier,
        sum(order_supplier_price_amount) -   sum(order_check_fee) - sum(order_replace_fee) -  sum(order_lack_fee_supplier) -  sum(sales_fee_supplier) profitFeeAmount
        sum(order_supplier_price_amount) -   sum(order_check_fee) - sum(order_replace_fee) -  sum(order_lack_fee_supplier) -  sum(sales_fee_supplier) profitFeeAmount,
        case when  COUNT(CASE WHEN status_backend IS NULL THEN 1 ELSE NULL END)  = 0 Then '已完成' Else '进行中' end as settleStatus
        from(
        SELECT
        oi.id,vor.*,p.name as supplierName
        FROM   t_order_item oi
        left join (<include refid="baseSupplierSql"></include>) vor
        on oi.id =vor.order_item_id
        oi.id,vor.*,p.name as supplierName,o.status_backend
        FROM
        (<include refid="baseSupplierSql"></include>) vor
        left join t_order_item oi
        on vor.order_item_id = oi.id
        left join t_supplier_info p
        on vor.supplier_id=p.id
        left join t_order o
@@ -533,13 +535,15 @@
        sum(order_replace_fee) + sum(order_lack_fee_supplier) order_lack_fee_supplier,
        sum(order_num)-sum(order_lack_num) as real_sale_num,
        sum(sales_fee_supplier) sales_fee_supplier,
        sum(order_supplier_price_amount) -   sum(order_check_fee) - sum(order_replace_fee) -  sum(order_lack_fee_supplier) -  sum(sales_fee_supplier) profitFeeAmount
        sum(order_supplier_price_amount) -   sum(order_check_fee) - sum(order_replace_fee) -  sum(order_lack_fee_supplier) -  sum(sales_fee_supplier) profitFeeAmount,
        case when  COUNT(CASE WHEN status_backend IS NULL THEN 1 ELSE NULL END)  = 0 Then '已完成' Else '进行中' end as settleStatus
        from(
        SELECT
        oi.id,vor.*,p.name as supplierName
        FROM   t_order_item oi
        left join (<include refid="baseSupplierSql"></include>) vor
        on oi.id =vor.order_item_id
        oi.id,vor.*,p.name as supplierName,o.status_backend
        FROM
        (<include refid="baseSupplierSql"></include>) vor
        left join t_order_item oi
        on vor.order_item_id = oi.id
        left join t_supplier_info p
        on vor.supplier_id=p.id
        left join t_order o
@@ -570,9 +574,10 @@
        from(
        SELECT
        oi.id,vor.*,p.name as supplierName
        FROM   t_order_item oi
        left join (<include refid="baseSupplierSql"></include>) vor
        on oi.id =vor.order_item_id
        FROM
        (<include refid="baseSupplierSql"></include>) vor
        left join t_order_item oi
        on vor.order_item_id = oi.id
        left join t_supplier_info p
        on vor.supplier_id=p.id
        left join t_order o