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

Helius

2021-09-27 0a54c5df5c1a1f77570a07ff008ed90ff9d17da4

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

@@ -219,7 +219,37 @@
        mallMember = mallMemberMapper.selectById(memberId);
        Page<AdminAgentMemberVo> page = new Page<>(request.getPageNum(), request.getPageSize());
        IPage<AdminAgentMemberVo> adminAgentMemberVos = this.baseMapper.getAgentChildInPage(page, mallMember);
        List<AdminAgentMemberVo> records = adminAgentMemberVos.getRecords();
        if(CollUtil.isNotEmpty(records)){
            for(AdminAgentMemberVo agentMemberVo : records){
                String inviteId = agentMemberVo.getInviteId();
                BigDecimal amount = mallMemberMapper.getAgentTeamAmountByInviteId(inviteId);
                agentMemberVo.setAmount(amount);
            }
        }
        return adminAgentMemberVos;
    }

    @Override
    public IPage<AdminRankAwardVo> getRankAwardList(RankAwardDto rankAwardDto, QueryRequest request) {
        Page<AdminRankAwardVo> page = new Page<>(request.getPageNum(), request.getPageSize());
        IPage<AdminRankAwardVo> adminRankAwardVos = this.baseMapper.getRankAwardListInPage(page, rankAwardDto);
        return adminRankAwardVos;
    }

    @Override
    public AdminRankAwardUpdateInfoVo getRankAwardUpdateInfoById(long id) {
        AdminRankAwardUpdateInfoVo adminRankAwardUpdateInfoVo = dataDictionaryCustomMapper.getRankAwardUpdateInfoById(id);
        return adminRankAwardUpdateInfoVo;
    }

    @Override
    public FebsResponse rankAwardUpdate(RankAwardUpdateDto rankAwardUpdateDto) {
        DataDictionaryCustom dataDictionaryCustom = dataDictionaryCustomMapper.selectById(rankAwardUpdateDto.getId());
        dataDictionaryCustom.setValue(rankAwardUpdateDto.getValue());
        dataDictionaryCustom.setDescription(rankAwardUpdateDto.getDescription());
        dataDictionaryCustomMapper.updateById(dataDictionaryCustom);
        return new FebsResponse().success();
    }

}