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

无关风月

2024-10-21 82e5f5968a77bde806f45a0ae1fe16f40852d6d6

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

@@ -400,12 +400,12 @@
            t_charging_order
        <where>
            del_flag = 0 and recharge_payment_status = 2  and DATE(create_time) = CURDATE()
            <if test="chargingOrderIds != null and chargingOrderIds.size() > 0">

                AND id IN
                <foreach collection="chargingOrderIds" item="chargingOrderId" open="(" separator="," close=")">
                    #{chargingOrderId}
                </foreach>
            </if>

        </where>
        GROUP BY
            time
@@ -424,12 +424,12 @@
        t_charging_order
        <where>
            del_flag = 0 and recharge_payment_status = 2  and YEARWEEK(DATE_FORMAT(create_time, '%Y-%m-%d'), 1) = YEARWEEK(NOW(), 1)
            <if test="chargingOrderIds != null and chargingOrderIds.size() > 0">

                AND id IN
                <foreach collection="chargingOrderIds" item="chargingOrderId" open="(" separator="," close=")">
                    #{chargingOrderId}
                </foreach>
            </if>

        </where>
        GROUP BY
        time
@@ -448,12 +448,12 @@
        t_charging_order
        <where>
            del_flag = 0 and recharge_payment_status = 2  and MONTH(create_time) = MONTH(NOW())  AND YEAR(create_time) = YEAR(NOW())
            <if test="chargingOrderIds != null and chargingOrderIds.size() > 0">

                AND id IN
                <foreach collection="chargingOrderIds" item="chargingOrderId" open="(" separator="," close=")">
                    #{chargingOrderId}
                </foreach>
            </if>

        </where>
        GROUP BY
        time
@@ -473,12 +473,12 @@
        t_charging_order
        <where>
            del_flag = 0 and recharge_payment_status = 2  and YEAR(create_time) = YEAR(NOW())
            <if test="chargingOrderIds != null and chargingOrderIds.size() > 0">

                AND id IN
                <foreach collection="chargingOrderIds" item="chargingOrderId" open="(" separator="," close=")">
                    #{chargingOrderId}
                </foreach>
            </if>

        </where>
        GROUP BY
        time
@@ -497,12 +497,12 @@
        t_charging_order
        <where>
            del_flag = 0 and recharge_payment_status = 2
            <if test="chargingOrderIds != null and chargingOrderIds.size() > 0">

                AND id IN
                <foreach collection="chargingOrderIds" item="chargingOrderId" open="(" separator="," close=")">
                    #{chargingOrderId}
                </foreach>
            </if>

        </where>
        GROUP BY
        time
@@ -628,6 +628,45 @@
        GROUP BY
            time
    </select>

    <select id="usersByQuery1" resultType="java.util.Map">

        SELECT
        'today' AS data_type,
        '1' as type,
        DATE_FORMAT( create_time, '%Y-%m-%d' ) AS time,
        count(DISTINCT  app_user_id) AS counts
        FROM
        t_charging_order
        WHERE
        del_flag = 0
        <if test="statisticsQueryDto.dayType ==1 ">
            AND DATE(create_time) = CURDATE()
        </if>
        <if test="statisticsQueryDto.dayType ==2 ">
            AND WEEKOFYEAR(create_time) = WEEKOFYEAR(CURDATE())
        </if>
        <if test="statisticsQueryDto.dayType ==3 ">
            AND MONTH(create_time) = MONTH(CURDATE())
        </if>
        <if test="statisticsQueryDto.dayType ==4">
            AND YEAR(create_time) = YEAR(CURDATE())
        </if>
        <if test="statisticsQueryDto.dayType ==5">
            <if test="statisticsQueryDto.startTime != null">
                AND create_time >= #{statisticsQueryDto.startTime}
            </if>
            <if test="statisticsQueryDto.endTime != null">
                AND create_time &lt;= #{statisticsQueryDto.endTime}
            </if>
        </if>
        GROUP BY
        time


    </select>


    <select id="usersByQuery" resultType="java.util.Map">

        SELECT