10.8

luodangjia

2024-10-08 7bc94a4f6b25f32c043ee4539293404963916696

10.8

 ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/util/SignDayUtil.java

@@ -71,6 +71,6 @@
        // 更新最后的连续天数
        maxContinuousDays = Math.max(maxContinuousDays, currentContinuousDays);

        return maxContinuousDays;
        return currentContinuousDays;
    }
}

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

@@ -269,19 +269,19 @@
            payment_amount
            FROM
            t_shopping_order
        <where>

            WHERE del_flag = 0 and payment_status = 2 and ISNULL(refund_status) and status!=4
            <if test="null != sixBefore">
                and DATE_FORMAT(create_time, '%Y-%m-%d') &gt;= DATE_FORMAT(#{sixBefore}, '%Y-%m-%d')
                and create_time &gt;= #{sixBefore}
            </if>
            <if test="null != status">
                and status = #{status}
            </if>
        </where>


            ) AS subquery
        GROUP BY
            DATE_FORMAT( subquery.create_time, '%m' );
            DATE_FORMAT( subquery.create_time, '%m' )


    </select>

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

@@ -50,29 +50,29 @@
    </select>
    <select id="sixBefore" resultType="com.ruoyi.order.dto.SixVipDto">
        SELECT
            DATE_FORMAT(subquery.create_time, '%Y-%m') AS MONTH,
    subquery.vip_id,
    COUNT(1) AS orderNum,
    SUM(subquery.payment_amount) AS paymentAmount
        DATE_FORMAT(subquery.create_time, '%Y-%m') AS MONTH,
        COUNT(1) AS orderNum,
        SUM(subquery.payment_amount) AS paymentAmount,
        tp.`name`
        FROM (
            SELECT
            vip_id,
            create_time,
            payment_amount
            FROM
            t_vip_order
        SELECT
        vip_id,
        create_time,
        payment_amount
        FROM
        t_vip_order
        <where>
            del_flag = 0 AND
            payment_status = 2 AND
            refund_amount IS NULL
            <if test="sixBefore != null">
                AND create_time &gt; #{sixBefore}
            </if>
        </where>
            ) AS subquery
        ) AS subquery
        LEFT JOIN `charging_pile_other`.`t_vip` tp on  subquery.vip_id = tp.id
        GROUP BY
            DATE_FORMAT(subquery.create_time, '%Y-%m'),
            subquery.vip_id;
        DATE_FORMAT(subquery.create_time, '%Y-%m'),
        tp.`name`;


    </select>