BUG联调

jiangqs

2023-06-27 1ffb6c7910cfb4d55b4c169142b67ea872fcf614

 ruoyi-modules/ruoyi-order/src/main/resources/mapper/order/OrderMapper.xml

@@ -675,9 +675,9 @@
            AND shop_id = #{param.shopId}
        </if>
        GROUP BY
            order_date
        DATE_FORMAT(create_time, '%Y-%m-%d')
        ORDER BY
            order_date ASC
        DATE_FORMAT(create_time, '%Y-%m-%d') ASC
    </select>

    <select id="listTotalOrderTotalGoodsType" resultType="com.ruoyi.order.domain.vo.MgtMapTotalPlusVo">
@@ -695,10 +695,10 @@
        GROUP BY tog.goods_type
    </select>

    <select id="listTotalOrderTotalGoodsRank" resultType="com.ruoyi.order.domain.vo.MgtMapTotalPlusVo">
    <select id="listTotalOrderTotalGoodsRank" resultType="com.ruoyi.system.api.domain.vo.MgtMapBigTotalVo">
        SELECT
        tog.goods_name mapKey,
        IFNULL(SUM(tog.goods_total_money),0) mapValueSecond
        IFNULL(SUM(tog.goods_total_money),0) mapValue
        FROM t_order toc
        INNER JOIN t_order_goods tog ON tog.order_id = toc.order_id
        WHERE toc.del_flag = 0
@@ -715,14 +715,14 @@
        ORDER BY SUM(tog.goods_total_money) DESC LIMIT 10
    </select>

    <select id="listTotalOrderTotalOrderFrom" resultType="com.ruoyi.order.domain.vo.MgtMapTotalPlusVo">
    <select id="listTotalOrderTotalOrderFrom" resultType="com.ruoyi.system.api.domain.vo.MgtMapBigTotalVo">
        SELECT
        CASE toc.order_from
        WHEN 1 THEN "商城订单"
        WHEN 2 THEN "秒杀活动订单"
        WHEN 3 THEN "线下创建订单"
        END mapKey,
        IFNULL(SUM(toc.order_money),0) mapValueSecond
        IFNULL(SUM(toc.order_money),0) mapValue
        FROM t_order toc
        WHERE toc.del_flag = 0
        <if test="param.shopId != null and param.shopId != ''">
@@ -785,9 +785,9 @@
            AND shop_id = #{param.shopId}
        </if>
        GROUP BY
        order_date
        DATE_FORMAT(create_time, '%Y-%m-%d')
        ORDER BY
        order_date ASC
        DATE_FORMAT(create_time, '%Y-%m-%d') ASC
    </select>

    <select id="getUserIdAgeRank" resultType="java.lang.Long">
@@ -806,7 +806,7 @@
    <select id="getTotalActivityAgeRank" resultType="com.ruoyi.order.domain.vo.MgtMapTotalPlusVo">
        SELECT
        DATE_FORMAT(create_time, '%Y-%m-%d') AS mapKey,
        COUNT(DISTINCT toc.user_id) AS mapValueFirst
        COUNT(DISTINCT user_id) AS mapValueFirst
        FROM
        t_order
        WHERE
@@ -822,9 +822,9 @@
            </foreach>
        </if>
        GROUP BY
        order_date
        DATE_FORMAT(create_time, '%Y-%m-%d')
        ORDER BY
        order_date ASC
        DATE_FORMAT(create_time, '%Y-%m-%d') ASC
    </select>

    <select id="getTotalDataTotal" resultType="com.ruoyi.order.domain.vo.MgtTotalDataTotalVo">
@@ -857,6 +857,21 @@
                </if>
                 GROUP BY o.user_id
             ) AS user_goods_type_counts
    </select>

    <select id="shopSalesTotal" resultType="java.math.BigDecimal">
        SELECT IFNULL(SUM(pay_money),0)
        FROM t_order
        WHERE o.del_flag = 0
        <if test="param.shopId != null and param.shopId != ''">
            AND shop_id = #{param.shopId}
        </if>
        <if test="param.startDate!=null and param.startDate!=''">
            AND create_time &gt;= #{param.startDate}
        </if>
        <if test="param.endDate!=null and param.endDate!=''">
            AND create_time &lt;= #{param.endDate}
        </if>
    </select>

    <select id="getReorderPerson" resultType="java.lang.Integer">
@@ -900,7 +915,7 @@
        FROM t_order toc
        INNER JOIN t_order_goods tog ON tog.order_id = toc.order_id
        WHERE toc.del_flag = 0
        <if test="shopIdList != null and shopIdList != ''">
        <if test="param.shopIdList != null and param.shopIdList != ''">
            AND toc.shop_id IN
            <foreach collection="param.shopIdList" item="item" open="(" separator="," close=")">
                #{item}
@@ -929,7 +944,7 @@
        SUM(CASE WHEN order_from = 2 THEN order_money ELSE 0 END) activityMoney
        FROM t_order WHERE del_flag = 0
        <if test="param.shopIdList != null and param.shopIdList != ''">
            AND toc.shop_id IN
            AND shop_id IN
            <foreach collection="param.shopIdList" item="item" open="(" separator="," close=")">
                #{item}
            </foreach>
@@ -978,15 +993,15 @@
        del_flag = 0
        AND create_time >= DATE_SUB(CURDATE(), INTERVAL 6 DAY)
        <if test="param.shopIdList != null and param.shopIdList != ''">
            AND toc.shop_id IN
            AND shop_id IN
            <foreach collection="param.shopIdList" item="item" open="(" separator="," close=")">
                #{item}
            </foreach>
        </if>
        GROUP BY
        order_date
        DATE_FORMAT(create_time, '%Y-%m-%d')
        ORDER BY
        order_date ASC
        DATE_FORMAT(create_time, '%Y-%m-%d') ASC
    </select>

    <select id="listPlTotalOrderTotalGoodsType" resultType="com.ruoyi.order.domain.vo.MgtMapTotalPlusVo">
@@ -1007,10 +1022,10 @@
        GROUP BY tog.goods_type
    </select>

    <select id="listPlTotalOrderTotalGoodsRank" resultType="com.ruoyi.order.domain.vo.MgtMapTotalPlusVo">
    <select id="listPlTotalOrderTotalGoodsRank" resultType="com.ruoyi.system.api.domain.vo.MgtMapBigTotalVo">
        SELECT
        tog.goods_name mapKey,
        IFNULL(SUM(tog.goods_total_money),0) mapValueSecond
        IFNULL(SUM(tog.goods_total_money),0) mapValue
        FROM t_order toc
        INNER JOIN t_order_goods tog ON tog.order_id = toc.order_id
        WHERE toc.del_flag = 0
@@ -1030,14 +1045,14 @@
        ORDER BY SUM(tog.goods_total_money) DESC LIMIT 10
    </select>

    <select id="listPlTotalOrderTotalOrderFrom" resultType="com.ruoyi.order.domain.vo.MgtMapTotalPlusVo">
    <select id="listPlTotalOrderTotalOrderFrom" resultType="com.ruoyi.system.api.domain.vo.MgtMapBigTotalVo">
        SELECT
        CASE toc.order_from
        WHEN 1 THEN "商城订单"
        WHEN 2 THEN "秒杀活动订单"
        WHEN 3 THEN "线下创建订单"
        END mapKey,
        IFNULL(SUM(toc.order_money),0) mapValueSecond
        IFNULL(SUM(toc.order_money),0) mapValue
        FROM t_order toc
        WHERE toc.del_flag = 0
        <if test="param.shopIdList != null and param.shopIdList != ''">
@@ -1097,7 +1112,7 @@
    <select id="listPlTotalActivityTotal" resultType="com.ruoyi.order.domain.vo.MgtMapTotalPlusVo">
        SELECT
        DATE_FORMAT(create_time, '%Y-%m-%d') AS mapKey,
        COUNT(DISTINCT toc.order_id) AS mapValueFirst,
        COUNT(DISTINCT order_id) AS mapValueFirst,
        IFNULL(SUM(toc.order_money),0) AS mapValueSecond,
        FROM t_order
        WHERE del_flag = 0 AND order_from = 2
@@ -1109,9 +1124,9 @@
            </foreach>
        </if>
        GROUP BY
        order_date
        DATE_FORMAT(create_time, '%Y-%m-%d')
        ORDER BY
        order_date ASC
        DATE_FORMAT(create_time, '%Y-%m-%d') ASC
    </select>

    <select id="getPlUserIdAgeRank" resultType="java.lang.Long">
@@ -1131,7 +1146,7 @@
    <select id="getPlTotalActivityAgeRank" resultType="com.ruoyi.order.domain.vo.MgtMapTotalPlusVo">
        SELECT
        DATE_FORMAT(create_time, '%Y-%m-%d') AS mapKey,
        COUNT(DISTINCT toc.user_id) AS mapValueFirst
        COUNT(DISTINCT user_id) AS mapValueFirst
        FROM t_order
        WHERE del_flag = 0 AND order_from = 2
        AND create_time >= DATE_SUB(CURDATE(), INTERVAL 6 DAY)
@@ -1147,8 +1162,10 @@
                #{item}
            </foreach>
        </if>
        GROUP BY rder_date
        ORDER BY order_date ASC
        GROUP BY
        DATE_FORMAT(create_time, '%Y-%m-%d')
        ORDER BY
        DATE_FORMAT(create_time, '%Y-%m-%d') ASC
    </select>

    <select id="listPlTotalShopActivityRank" resultType="com.ruoyi.order.domain.vo.MgtMapTotalPlusVo">