fix some problem

Helius

2022-05-19 7e6bbd05a75b07cb0717812d0b51aad128361012

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

@@ -71,14 +71,18 @@
            a.invite_id,
            2 isCurrent,
            a.created_time,
            (select sum(b.amount) from mall_member e
                                           inner join mall_order_info b on e.id=b.member_id and b.status in (2, 3, 4)
             where e.invite_id=a.invite_id or e.referrer_id=a.invite_id) amount,
            p.prize_score,
            (select sum(e.amount)
             from mall_order_info e
                      inner join mall_member b on e.member_id=b.ID
                      inner join mall_order_item c on e.id = c.order_id and c.is_normal=2
             where e.status in (2, 3, 4) and e.order_type=1 and (b.invite_id=a.invite_id or b.referrer_id=a.invite_id)) amount,
            (select count(1) from mall_member e
                                      inner join mall_order_info b on e.id=b.member_id and b.status in (2, 3, 4)
                      inner join mall_order_info b on e.id=b.member_id and b.status in (2, 3, 4)
             where e.invite_id=a.invite_id or e.referrer_id=a.invite_id) orderCnt,
            (select count(1) from mall_member x where x.referrer_id=a.invite_id) cnt
        from mall_member a
        inner join mall_member_wallet p on a.id=p.member_id
        where a.referrer_id=#{inviteId}
    </select>

@@ -216,7 +220,10 @@
    </select>

    <select id="selectByIdAndNoLevel" resultType="cc.mrbird.febs.mall.entity.MallMember">
        select * from mall_member where referrer_id=#{refererId} and level != #{level}
        select * from mall_member where level != #{level}
        <if test="refererId != null and refererId != ''">
            and referrer_id=#{refererId}
        </if>
    </select>

    <select id="selectMallMemberByInviteIdAndLevel" resultType="cc.mrbird.febs.mall.entity.MallMember">
@@ -303,22 +310,68 @@
            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 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>-->
<!--        &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="selectAchieveByMemberId" resultType="java.math.BigDecimal">
        select sum(a.amount)
        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="type == 1">
            and b.invite_id=#{inviteId}
        </if>
        <!-- 月 -->
        <if test="record.query == '2'">
            and date_format(#{record.createdTime},'%Y-%m') = date_format(b.order_time,'%Y-%m')
        <if test="type == 2">
            and b.referrer_id=#{inviteId}
        </if>
        <if test="record.amount != null">
            and amount = #{record.amount}
        </if>
          group by a.id
      ) a order by amount desc, a.id
    </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>