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

xiaoyong931011

2021-09-24 2951c68cea68f6c0eab405fa5fec7b1d18665ac9

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

 src/main/java/cc/mrbird/febs/mall/controller/ApiMallMemberController.java

@@ -78,6 +78,6 @@
    })
    @PostMapping(value = "/moneyFlow")
    public FebsResponse moneyFlow(@RequestBody MoneyFlowDto moneyFlowDto) {
        return null;
        return memberService.moneyFlows(moneyFlowDto);
    }
}

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

@@ -208,6 +208,11 @@

        MallMemberVo mallMemberVo = MallMemberConversion.INSTANCE.entityToVo(mallMember);

        MallMember referMember = this.baseMapper.selectInfoByInviteId(mallMember.getReferrerId());
        if (referMember != null) {
            mallMemberVo.setReferrerName(referMember.getName());
        }

        MallMemberWallet wallet = mallMemberWalletMapper.selectWalletByMemberId(mallMemberVo.getId());
        mallMemberVo.setBalance(wallet.getBalance());
        return new FebsResponse().success().data(mallMemberVo);

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

@@ -39,6 +39,7 @@
    @ApiModelProperty(value = "代理等级")
    private String levelName;

    @ApiModelProperty(value = "推荐人昵称")
    private String referrerName;

    private String level;

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

@@ -12,7 +12,7 @@
            a.*,
            b.phone
        from mall_money_flow a
            inner join mall_member on a.rt_member_id=b.member_id
            inner join mall_member b on a.member_id=b.id
        <where>
            <if test="record.type == 2">
                and a.amount > 0
@@ -24,5 +24,6 @@
                and a.member_id=#{record.memberId}
            </if>
        </where>
        order by a.created_time desc
    </select>
</mapper>