收入订单台账修改

ship-module-trade/ship-module-trade-biz/src/main/resources/mapper/report/IncomeOrderLedgerMapper.xml

@@ -34,7 +34,7 @@
         INNER JOIN resource_route r ON v.route_id = r.id AND r.deleted = 0
         LEFT JOIN trade_visitor tv ON o.id = tv.order_id AND tv.deleted = 0
         LEFT JOIN trade_order_total tot ON o.id = tot.old_order_id AND tot.deleted = 0
-        LEFT JOIN trade_order_pay p ON o.pay_status = 1 AND p.order_id = o.id AND p.deleted = 0 AND p.pay_status = 1
+        /*LEFT JOIN trade_order_pay p ON o.pay_status = 1 AND p.order_id = o.id AND p.deleted = 0 AND p.pay_status = 1*/
         LEFT JOIN (
             SELECT rm.order_id,
                    GROUP_CONCAT(DISTINCT rm.room_model_name SEPARATOR ',') AS room_model_name
@@ -49,7 +49,7 @@
             GROUP BY order_id
         ) refund_fee_sum ON o.id = refund_fee_sum.order_id
         WHERE o.deleted = 0
-        AND (o.pay_status != 1 OR p.id IS NOT NULL)
+        /*AND (o.pay_status != 1 OR p.id IS NOT NULL)*/
         /*AND NOT EXISTS (
             SELECT 1 FROM ota_bill_order bo
             INNER JOIN ota_bill b ON bo.bill_id = b.id AND b.deleted = 0