Merge branch 'mall-amz' of http://120.27.238.55:7000/r/xc-mall into mall-amz

xiaoyong931011

2022-05-19 e64ac50998ba5fe69bac4baa667d0f5a216bc670

 src/main/resources/mapper/modules/MallMemberMapper.xml

@@ -306,27 +306,54 @@
            DATE_FORMAT(a.CREATED_TIME, '%Y-%m-%d') DESC
    </select>

    <select id="selectRankListInPage" resultType="cc.mrbird.febs.mall.entity.MallMember">
        select * from (
          select a.id, a.name, a.invite_id, a.avatar, sum(b.amount) amount,max(order_time) orderTime from mall_member a, mall_order_info b
          where  a.id=b.member_id and b.status = 4
        <!-- 日 -->
        <if test="record.query == '1'">
<!--    <select id="selectRankListInPage" resultType="cc.mrbird.febs.mall.entity.MallMember">-->
<!--        select * from (-->
<!--          select a.id, a.name, a.invite_id, a.avatar, sum(b.amount) amount,max(order_time) orderTime from mall_member a, mall_order_info b-->
<!--          where  a.id=b.member_id and b.status = 4-->
<!--        &lt;!&ndash; 日 &ndash;&gt;-->
<!--        <if test="record.query == '1'">-->

        </if>
        <!-- 月 -->
        <if test="record.query == '2'">
            and date_format(#{record.createdTime},'%Y-%m') = date_format(b.order_time,'%Y-%m')
        </if>
        <if test="record.amount != null">
            and amount = #{record.amount}
        </if>
          group by a.id
      ) a order by amount desc, a.orderTime desc
<!--        </if>-->
<!--        &lt;!&ndash; 月 &ndash;&gt;-->
<!--        <if test="record.query == '2'">-->
<!--            and date_format(#{record.createdTime},'%Y-%m') = date_format(b.order_time,'%Y-%m')-->
<!--        </if>-->
<!--        <if test="record.amount != null">-->
<!--            and amount = #{record.amount}-->
<!--        </if>-->
<!--          group by a.id-->
<!--      ) a order by amount desc, a.orderTime desc-->
<!--    </select>-->
    <select id="selectRankListInPage" resultType="cc.mrbird.febs.mall.entity.MallMember">
        select a.*, b.*
        from mall_member a
            inner join (
                select b.referrer_id refererId, sum(a.amount) amount, max(a.order_time) orderTime
                    from mall_order_info a
                    inner join mall_member b on a.member_id=b.ID
                    inner join mall_order_item c on a.id = c.order_id and c.is_normal=2
                where a.status in (2, 3, 4) and a.order_type=1
                <!-- 月 -->
                <if test="record.query == '2'">
                    and date_format(#{record.createdTime},'%Y-%m') = date_format(b.order_time,'%Y-%m')
                </if>
                group by b.referrer_id
            ) b  on a.invite_id=b.refererId
        order by b.amount desc, b.orderTime desc
    </select>

    <select id="selectMemberByName" resultType="cc.mrbird.febs.mall.entity.MallMember">
        select * from mall_member
        where name=#{name}
    </select>

    <select id="selectMemberListHasChild" resultType="cc.mrbird.febs.mall.entity.MallMember">
        select distinct a.* from mall_member a, mall_member b
        where a.invite_id=b.referrer_id
    </select>

    <select id="selectMemberDirectForHasLevel" resultType="cc.mrbird.febs.mall.entity.MallMember">
        select * from mall_member
        where referrer_id=#{inviteId} and level != 'ZERO_LEVEL'
    </select>
</mapper>