Merge remote-tracking branch 'origin/master'

Pu Zhibing

2024-09-27 d153ca8d05991566bed18eed1ae25f0af3c1cc70

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

@@ -109,12 +109,11 @@
        </if>
    </select>
    <select id="payOrderQuery" resultType="com.ruoyi.order.dto.PayOrderDto">
        SELECT * FROM (SELECT
        SELECT o.*,i.phone FROM (SELECT
        id,
        `code`,
        1 as type,
        title,
        phone,
        `status`,
        order_amount,
        payment_amount ,
@@ -123,7 +122,8 @@
        pay_time,
        refund_status,
        (payment_amount-refund_amount) as final_amount,
        del_flag
        del_flag,
        app_user_id
        FROM
        charging_pile_order.t_charging_order
        where  recharge_payment_status = 2
@@ -133,7 +133,6 @@
        `code`,
        2 as type,
        title,
        phone,
        `status`,
        order_amount,
        payment_amount ,
@@ -142,7 +141,8 @@
        pay_time,
        refund_status,
        (payment_amount-refund_amount) as final_amount,
        del_flag
        del_flag,
        app_user_id
        FROM
        charging_pile_order.t_shopping_order
        where payment_status = 2
@@ -152,7 +152,6 @@
        `code`,
        3 as type,
        title,
        phone,
        payment_status AS `status`,
        order_amount,
        payment_amount ,
@@ -161,7 +160,8 @@
        pay_time,
        refund_status,
        (payment_amount-refund_amount) as final_amount,
        del_flag
        del_flag,
        app_user_id

        FROM
        charging_pile_order.t_vip_order
@@ -172,7 +172,6 @@
        `code`,
        4 as type,
        title,
        phone,
        `status`,
        order_amount ,
        order_amount as payment_amount,
@@ -181,9 +180,11 @@
        out_parking_time as pay_time,
        null as refund_status,
        0 as final_amount,
        0 as del_flag
        0 as del_flag,
        app_user_id
        FROM
        charging_pile_service.t_parking_record ) o
        LEFT JOIN  `charging_pile_account`.`t_app_user` i on o.app_user_id = i.id
                <where>
                    o.del_flag = 0
                    <if test="data.code != null and data.code != ''">
@@ -207,6 +208,13 @@
                            #{id}
                        </foreach>
                    </if>
                    <if test="data.isRefund == 1">
                        AND o.refund_status is not null
                    </if>
                    <if test="data.isRefund == 1">
                        AND o.refund_status is null
                    </if>

                </where>
        ORDER BY o.create_time desc

@@ -226,7 +234,9 @@
        re.refund_remark,
        co.recharge_serial_number as serail_number,
        co.payment_amount,
        co.pay_time
        co.create_time as pay_time,
        co.id as order_id,
        co.app_user_id as user_id
        FROM t_charging_order_refund re
        LEFT JOIN t_charging_order  co ON re.charging_order_id = co.id
        UNION ALL
@@ -243,7 +253,9 @@
        re.refund_remark,
        so.serial_number,
        so.payment_amount,
        so.pay_time
        so.create_time as pay_time,
        so.id as order_id,
        so.app_user_id as user_id
        FROM t_shopping_order_refund re
        LEFT JOIN t_shopping_order so on re.shopping_order_id = so.id
        UNION ALL
@@ -260,7 +272,9 @@
        vr.refund_remark,
        vo.serial_number,
        vo.payment_amount,
        vo.pay_time
        vo.create_time as pay_time,
        vo.id as order_id,
        vo.app_user_id as user_id
        FROM t_vip_order_refund vr
        LEFT JOIN t_vip_order vo on vr.vip_order_id = vo.id

@@ -274,7 +288,7 @@
                AND o.refund_code LIKE CONCAT('%',#{data.refundCode},'%')
            </if>
        </where>

        order by o.refund_time desc

    </select>
    <select id="chargingOrderGroup" resultType="com.ruoyi.common.core.dto.ChargingOrderGroup">
@@ -1285,9 +1299,10 @@
        <if test="statisticsQueryDto.type == 2">
            end_time
        </if>
        , '%Y-%m-%d %H' ) as time,
        , '%H:00' ) as time,
   SUM(service_charge) as servicecharge,
   SUM(electrovalence) as electrovalence,
    SUM(electricity) as electricity,
    count(1) as orderCount
        FROM
            t_charging_order
@@ -1323,10 +1338,10 @@
        , '%Y-%m-%d' ) as time,
        SUM(service_charge) as servicecharge,
        SUM(electrovalence) as electrovalence,
        count(1) as orderCount
        count(1) as orderCount,
        SUM(electricity) as electricity
        FROM
        t_charging_order

        WHERE     del_flag = 0 and recharge_payment_status = 2  and DATE(
        <if test="statisticsQueryDto.type == 1">
            start_time
@@ -1358,7 +1373,8 @@
        , '%Y-%m' ) as time,
        SUM(service_charge) as servicecharge,
        SUM(electrovalence) as electrovalence,
        count(1) as orderCount
        count(1) as orderCount,
        SUM(electricity) as electricity
        FROM
        t_charging_order