fix teamList

Helius

2021-09-24 595493e949a1208a82c30fd9574702098a539f7c

fix teamList

 sql/xc_mall.sql

@@ -298,5 +298,8 @@
alter table mall_order_refund add phone varchar(32) null comment '联系电话';
alter table mall_order_refund add address text null comment '地址';

alter table mall_money_flow add rt_member_id bigint null comment '返利用户ID';
alter table mall_money_flow add status int null comment '提现状态 1-提现中2-成功3-拒绝';




 src/main/java/cc/mrbird/febs/mall/entity/MallMoneyFlow.java

@@ -18,7 +18,19 @@

    private BigDecimal amount;

    /**
     * 流水类型 1-分红收入 2-业绩奖励 3-订单支付 4-退款 5-转账
     */
    private Integer type;

    private String orderNo;

    private String description;

    private Long rtMemberId;

    /**
     * 提现状态 1-提现中2-成功 3-拒绝
     */
    private Integer status;
}

 src/main/java/cc/mrbird/febs/mall/mapper/MallMemberMapper.java

@@ -29,7 +29,9 @@

    List<TeamListVo> selectTeamListByInviteId(@Param("inviteId") String inviteId);

    BigDecimal selectOwnAmountByInviteId(@Param("inviteId") String inviteId);
    BigDecimal selectOwnOrderAmountByInviteId(@Param("inviteId") String inviteId);

    Integer selectOwnCntByInviteId(@Param("inviteId") String inviteId);

    Integer selectOwnOrderCntByInviteId(@Param("inviteId") String inviteId);
}

 src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallMemberServiceImpl.java

@@ -275,7 +275,7 @@
        MallMember mallMember = this.baseMapper.selectById(memberId);

        List<TeamListVo> list = this.baseMapper.selectTeamListByInviteId(mallMember.getInviteId());
        BigDecimal ownAmount = this.baseMapper.selectOwnAmountByInviteId(mallMember.getInviteId());
        BigDecimal ownAmount = this.baseMapper.selectOwnOrderAmountByInviteId(mallMember.getInviteId());

        TeamListVo own = new TeamListVo();
        own.setCreatedTime(mallMember.getCreatedTime());
@@ -285,6 +285,7 @@
        own.setInviteId(mallMember.getInviteId());
        own.setIsCurrent(1);
        own.setCnt(this.baseMapper.selectOwnCntByInviteId(mallMember.getInviteId()));
        own.setOrderCnt(this.baseMapper.selectOwnOrderCntByInviteId(mallMember.getInviteId()));
        own.setId(mallMember.getId());
        list.add(0, own);
        return new FebsResponse().success().data(list);

 src/main/java/cc/mrbird/febs/mall/vo/TeamListVo.java

@@ -31,7 +31,10 @@
    @ApiModelProperty(value = "金额")
    private BigDecimal amount;

    @ApiModelProperty(value = "数量")
    @ApiModelProperty(value = "订单数量")
    private Integer orderCnt;

    @ApiModelProperty(value = "团队数量")
    private Integer cnt;

    @ApiModelProperty(value = "注册时间")

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

@@ -67,20 +67,31 @@
            (select sum(b.amount) from mall_member e
                                           inner join mall_order_info b on e.id=b.member_id and b.status=4
             where e.invite_id=a.invite_id or e.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=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
        where a.referrer_id=#{inviteId}
    </select>

    <select id="selectOwnAmountByInviteId" resultType="java.math.BigDecimal">
    <select id="selectOwnOrderAmountByInviteId" resultType="java.math.BigDecimal">
        select
            sum(b.amount)
            IFNULL(sum(b.amount),0)
        from mall_member e
          inner join mall_order_info b on e.id=b.member_id and b.status=4
        where e.invite_id=#{inviteId} or e.referrer_id=#{inviteId}
    </select>

    <select id="selectOwnCntByInviteId" resultType="java.lang.Integer">
        select count(1) from mall_member x where x.referrer_id=#{inviteId}
        select IFNULL(count(1),0) from mall_member x where x.referrer_id=#{inviteId}
    </select>

    <select id="selectOwnOrderCntByInviteId" resultType="java.lang.Integer">
        select
            IFNULL(count(1),0)
        from mall_member e
                 inner join mall_order_info b on e.id=b.member_id and b.status=4
        where e.invite_id=#{inviteId} or e.referrer_id=#{inviteId}
    </select>
</mapper>