Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/mx_charg...

无关风月

2024-09-12 f7042f313660010345f199d62afb6e3aeb8b5194

 ruoyi-service/ruoyi-order/src/main/resources/mapper/order/TChargingOrderMapper.xml

@@ -124,7 +124,9 @@
        (payment_amount-refund_amount) as final_amount,
        del_flag
        FROM
        charging_pile_order.t_charging_order UNION ALL
        charging_pile_order.t_charging_order
        where  recharge_payment_status = 2
        UNION ALL
        SELECT
        id,
        `code`,
@@ -141,7 +143,9 @@
        (payment_amount-refund_amount) as final_amount,
        del_flag
        FROM
        charging_pile_order.t_shopping_order UNION ALL
        charging_pile_order.t_shopping_order
        where payment_status = 2
        UNION ALL
        SELECT
        id,
        `code`,
@@ -157,8 +161,11 @@
        refund_status,
        (payment_amount-refund_amount) as final_amount,
        del_flag

        FROM
        charging_pile_order.t_vip_order UNION ALL
        charging_pile_order.t_vip_order
        where  payment_status = 2
        UNION ALL
        SELECT
        id,
        `code`,