Merge branch 'score-shop' of http://120.27.238.55:7000/r/xzx into score-shop

xiaoyong931011

2021-07-22 f4ef9fccb3347fd364ca59575bf62fe5e4362f59

 gc-order/src/main/resources/mapper/order/JhyOrderMapper.xml

@@ -48,13 +48,27 @@
        select
           status,
           count(1) cnt
        from xzx_jhy_order where status=1
        from xzx_jhy_order
        <where>
            status=1
            <if test="type == 2">
                and user_id=#{userId}
            </if>
        </where>
        group by status
        union  all
        select
           status,
           count(1) cnt
        from xzx_jhy_order
        where user_id=#{userId}
        <where>
            <if test="type == 1">
                and jhy_id=#{userId}
            </if>
            <if test="type == 2" >
                and user_id=#{userId}
            </if>
        </where>
        group by status
    </select>
</mapper>