20210707

xiaoyong931011

2021-07-07 a4f28b3561ca0a927f1f67137fb430d33e5b15be

20210707

 gc-user/src/main/java/com/xzx/gc/user/service/UserService.java

@@ -850,19 +850,19 @@
        List<Map<String, Object>> odlist = orderMapper.queryCuserOrderFinishList(userId, x);
        PageInfo<Map<String, Object>> pageInfo = new PageInfo<>(odlist);
        for (Map<String, Object> map : odlist) {
            map.put("money", DoubleUtil.roundTwo(map.get("money").toString()));
            map.put("weight", DoubleUtil.roundThree(map.get("weight").toString()));
            map.put("orderid", map.get("orderId").toString());
            map.put("createtime", map.get("createTime").toString());
//            map.put("orderid", map.get("orderId").toString());
//            map.put("address", map.get("address").toString());
//            map.put("status", map.get("status"));
//            map.put("type", map.get("type"));
//            map.put("money", DoubleUtil.roundTwo(map.get("money").toString()));
//            map.put("score", DoubleUtil.roundTwo(map.get("score").toString()));
//            map.put("weight", DoubleUtil.roundThree(map.get("weight").toString()));
//            map.put("name", map.get("name").toString());
//            map.put("orderid", map.get("orderId").toString());
//            map.put("createtime", map.get("createTime").toString());
            map.put("orderid", map.get("orderId").toString());
            map.put("address", map.get("address").toString());
            map.put("status", map.get("status"));
            map.put("type", map.get("type"));
            map.put("money", DoubleUtil.roundTwo(map.get("money").toString()));
            map.put("score", DoubleUtil.roundTwo(map.get("score").toString()));
            map.put("weight", DoubleUtil.roundThree(map.get("weight").toString()));
            map.put("name", map.get("name").toString());
            map.put("createtime", map.get("createTime").toString());
        }
        m.put("orderList", odlist);
        m.put("count", pageInfo.getTotal());

 gc-user/src/main/resources/mapper/user/OrderMapper.xml

@@ -110,76 +110,134 @@
        WHERE a.create_user_id = #{userId} and a.order_status in (4, 5, 7)
    </select>

    <select id="queryUserOrderList"   resultType="java.util.Map">
        select a.create_time as createTime,a.order_id as orderId,sum(b.money) as money,sum(b.weight) as weight from
            xzx_order_info a
            LEFT JOIN xzx_order_item_info b ON a.order_id = b.order_id
        where a.create_user_id=#{userId}
              and a.order_status in ('4','5','7')
              and a.del_flag=0 and a.cancel_user_id is null
        GROUP BY a.order_id order by a.create_time
    </select>
<!--    <select id="queryUserOrderList"   resultType="java.util.Map">-->
<!--        select a.create_time as createTime,a.order_id as orderId,sum(b.money) as money,sum(b.weight) as weight from-->
<!--            xzx_order_info a-->
<!--            LEFT JOIN xzx_order_item_info b ON a.order_id = b.order_id-->
<!--        where a.create_user_id=#{userId}-->
<!--              and a.order_status in ('4','5','7')-->
<!--              and a.del_flag=0 and a.cancel_user_id is null-->
<!--        GROUP BY a.order_id order by a.create_time-->
<!--    </select>-->
        <select id="queryUserOrderList" resultType="java.util.HashMap">
            SELECT
                orderId,
                address,
                status,
                type,
                money,
                score,
                weight,
                name,
                createTime
            FROM
                (
                    (
                        SELECT
                            a.order_id orderId,
                            a.order_status STATUS,
                            '1' type,
                            ifnull(sum(d.money), 0) money,
                            '0' score,
                            a.address address,
                            ifnull(sum(d.weight), 0) weight,
                            e. NAME NAME,
                            a.create_time createTime
                        FROM
                            xzx_order_info a
                                LEFT JOIN xzx_order_item_info d ON a.order_id = d.order_id
                                LEFT JOIN xzx_user_info e ON e.user_id = a.receiver
                        WHERE
                            a.create_user_id = #{userId}
                        GROUP BY
                            a.order_id
                    )
                    UNION
                    (
                        SELECT
                            a.id orderId,
                            a. STATUS STATUS,
                            '2' type,
                            '0' money,
                            ifnull(sum(d.score), 0) score,
                            a.address address,
                            ifnull(sum(d.weight), 0) weight,
                            a.username NAME,
                            a.CREATED_TIME createTime
                        FROM
                            xzx_jhy_order a
                                LEFT JOIN xzx_jhy_order_items d ON a.id = d.order_id
                        WHERE
                            a.user_id = #{userId}
                        GROUP BY
                            a.id
                    )
                ) v
            ORDER BY
                createTime DESC

    <select id="queryCuserOrderCount" resultType="java.util.HashMap">
        SELECT COUNT(*) as count FROM xzx_order_info WHERE create_user_id=#{userId}
        <if test="status != null">
            and order_status in
            <foreach collection="status" index="index" item="id" open="(" separator="," close=")">
                #{id}
            </foreach>
        </if>
        GROUP BY order_type
    </select>
        </select>

<!--    <select id="queryCuserOrderCount" resultType="java.util.HashMap">-->
<!--        SELECT-->
<!--            COUNT(*) as count-->
<!--        FROM-->
<!--            (-->
<!--                (-->
<!--                    SELECT-->
<!--                        a.order_id orderId,-->
<!--                        a.order_status STATUS,-->
<!--                        '1' type,-->
<!--                        ifnull(sum(d.money), 0) money,-->
<!--                        '0' score,-->
<!--                        a.address address,-->
<!--                        ifnull(sum(d.weight), 0) weight,-->
<!--                        e. NAME NAME,-->
<!--                        a.create_time createTime-->
<!--                    FROM-->
<!--                        xzx_order_info a-->
<!--                            LEFT JOIN xzx_order_item_info d ON a.order_id = d.order_id-->
<!--                            LEFT JOIN xzx_user_info e ON e.user_id = a.receiver-->
<!--                    WHERE-->
<!--                        a.create_user_id=#{userId}-->
<!--                    GROUP BY-->
<!--                        a.order_id-->
<!--                )-->
<!--                UNION-->
<!--                (-->
<!--                    SELECT-->
<!--                        a.id orderId,-->
<!--                        a. STATUS STATUS,-->
<!--                        '2' type,-->
<!--                        '0' money,-->
<!--                        ifnull(sum(d.score), 0) score,-->
<!--                        a.address address,-->
<!--                        ifnull(sum(d.weight), 0) weight,-->
<!--                        a.username NAME,-->
<!--                        a.CREATED_TIME createTime-->
<!--                    FROM-->
<!--                        xzx_jhy_order a-->
<!--                            LEFT JOIN xzx_jhy_order_items d ON a.id = d.order_id-->
<!--                    WHERE-->
<!--                        a.user_id = #{userId}-->
<!--                    GROUP BY-->
<!--                        a.id-->
<!--                )-->
<!--            ) v-->
<!--        ORDER BY-->
<!--            createTime DESC-->
<!--        SELECT COUNT(*) as count FROM xzx_order_info WHERE create_user_id=#{userId}-->
<!--        <if test="status != null">-->
<!--            and order_status in-->
<!--            <foreach collection="status" index="index" item="id" open="(" separator="," close=")">-->
<!--                #{id}-->
<!--            </foreach>-->
<!--        </if>-->
<!--        GROUP BY order_type-->
<!--    </select>-->

    <select id="queryCuserOrderCount" resultType="java.util.HashMap">
        SELECT
            COUNT(*) as count
        FROM
            (
                (
                    SELECT
                        a.order_id orderId,
                        a.order_status STATUS,
                        '1' type,
                        ifnull(sum(d.money), 0) money,
                        '0' score,
                        a.address address,
                        ifnull(sum(d.weight), 0) weight,
                        e. NAME NAME,
                        a.create_time createTime
                    FROM
                        xzx_order_info a
                            LEFT JOIN xzx_order_item_info d ON a.order_id = d.order_id
                            LEFT JOIN xzx_user_info e ON e.user_id = a.receiver
                    WHERE
                        a.create_user_id=#{userId}
                    GROUP BY
                        a.order_id
                )
                UNION
                (
                    SELECT
                        a.id orderId,
                        a. STATUS STATUS,
                        '2' type,
                        '0' money,
                        ifnull(sum(d.score), 0) score,
                        a.address address,
                        ifnull(sum(d.weight), 0) weight,
                        a.username NAME,
                        a.CREATED_TIME createTime
                    FROM
                        xzx_jhy_order a
                            LEFT JOIN xzx_jhy_order_items d ON a.id = d.order_id
                    WHERE
                        a.user_id = #{userId}
                    GROUP BY
                        a.id
                )
            ) v
        ORDER BY
            createTime DESC
    </select>

    <select id="queryPromoterOrderWeightMoney" resultType="com.xzx.gc.model.admin.PromoterModel">
        SELECT SUM(c.weight) as orderWeightCount, SUM(c.money) as orderMoneyCount
@@ -307,78 +365,78 @@
        </if>
    </select>

    <select id="queryCuserOrderFinishList" resultType="java.util.HashMap">
        SELECT a.order_id as orderId, sum(d.money) as money,sum(d.weight) as weight,a.create_time as createTime FROM
        xzx_order_info a
        LEFT JOIN xzx_order_item_info d on a.order_id = d.order_id
        WHERE a.create_user_id=#{userId}
        <if test="status != null">
            and a.order_status in
            <foreach collection="status" index="index" item="id" open="(" separator="," close=")">
                #{id}
            </foreach>
        </if>

        GROUP BY a.order_id
    </select>
<!--    <select id="queryCuserOrderFinishList" resultType="java.util.HashMap">-->
<!--        SELECT-->
<!--            orderId,-->
<!--            address,-->
<!--            status,-->
<!--            type,-->
<!--            money,-->
<!--            score,-->
<!--            weight,-->
<!--            name,-->
<!--            createTime-->
<!--        FROM-->
<!--            (-->
<!--                (-->
<!--                    SELECT-->
<!--                        a.order_id orderId,-->
<!--                        a.order_status STATUS,-->
<!--                        '1' type,-->
<!--                        ifnull(sum(d.money), 0) money,-->
<!--                        '0' score,-->
<!--                        a.address address,-->
<!--                        ifnull(sum(d.weight), 0) weight,-->
<!--                        e. NAME NAME,-->
<!--                        a.create_time createTime-->
<!--                    FROM-->
<!--                        xzx_order_info a-->
<!--                            LEFT JOIN xzx_order_item_info d ON a.order_id = d.order_id-->
<!--                            LEFT JOIN xzx_user_info e ON e.user_id = a.receiver-->
<!--                    WHERE-->
<!--                        a.create_user_id = #{userId}-->
<!--                    GROUP BY-->
<!--                        a.order_id-->
<!--                )-->
<!--                UNION-->
<!--                (-->
<!--                    SELECT-->
<!--                        a.id orderId,-->
<!--                        a. STATUS STATUS,-->
<!--                        '2' type,-->
<!--                        '0' money,-->
<!--                        ifnull(sum(d.score), 0) score,-->
<!--                        a.address address,-->
<!--                        ifnull(sum(d.weight), 0) weight,-->
<!--                        a.username NAME,-->
<!--                        a.CREATED_TIME createTime-->
<!--                    FROM-->
<!--                        xzx_jhy_order a-->
<!--                            LEFT JOIN xzx_jhy_order_items d ON a.id = d.order_id-->
<!--                    WHERE-->
<!--                        a.user_id = #{userId}-->
<!--                    GROUP BY-->
<!--                        a.id-->
<!--                )-->
<!--            ) v-->
<!--        ORDER BY-->
<!--            createTime DESC-->
<!--        SELECT a.order_id as orderId, sum(d.money) as money,sum(d.weight) as weight,a.create_time as createTime FROM-->
<!--        xzx_order_info a-->
<!--        LEFT JOIN xzx_order_item_info d on a.order_id = d.order_id-->
<!--        WHERE a.create_user_id=#{userId}-->
<!--        <if test="status != null">-->
<!--            and a.order_status in-->
<!--            <foreach collection="status" index="index" item="id" open="(" separator="," close=")">-->
<!--                #{id}-->
<!--            </foreach>-->
<!--        </if>-->

<!--        GROUP BY a.order_id-->
<!--    </select>-->
    <select id="queryCuserOrderFinishList" resultType="java.util.HashMap">
        SELECT
            orderId,
            address,
            status,
            type,
            money,
            score,
            weight,
            name,
            createTime
        FROM
            (
                (
                    SELECT
                        a.order_id orderId,
                        a.order_status STATUS,
                        '1' type,
                        ifnull(sum(d.money), 0) money,
                        '0' score,
                        a.address address,
                        ifnull(sum(d.weight), 0) weight,
                        e. NAME NAME,
                        a.create_time createTime
                    FROM
                        xzx_order_info a
                            LEFT JOIN xzx_order_item_info d ON a.order_id = d.order_id
                            LEFT JOIN xzx_user_info e ON e.user_id = a.receiver
                    WHERE
                        a.create_user_id = #{userId}
                    GROUP BY
                        a.order_id
                )
                UNION
                (
                    SELECT
                        a.id orderId,
                        a. STATUS STATUS,
                        '2' type,
                        '0' money,
                        ifnull(sum(d.score), 0) score,
                        a.address address,
                        ifnull(sum(d.weight), 0) weight,
                        a.username NAME,
                        a.CREATED_TIME createTime
                    FROM
                        xzx_jhy_order a
                            LEFT JOIN xzx_jhy_order_items d ON a.id = d.order_id
                    WHERE
                        a.user_id = #{userId}
                    GROUP BY
                        a.id
                )
            ) v
        ORDER BY
            createTime DESC

    </select>


    <select id="orderCountStat" parameterType="java.util.Map" resultType="String">