From 0a54c5df5c1a1f77570a07ff008ed90ff9d17da4 Mon Sep 17 00:00:00 2001 From: Helius <wangdoubleone@gmail.com> Date: Mon, 27 Sep 2021 15:51:29 +0800 Subject: [PATCH] Merge branch 'master' of http://120.27.238.55:7000/r/xc-mall --- src/main/java/cc/mrbird/febs/mall/service/impl/AdminMallMemberServiceImpl.java | 30 ++++++++++++++++++++++++++++++ 1 files changed, 30 insertions(+), 0 deletions(-) diff --git a/src/main/java/cc/mrbird/febs/mall/service/impl/AdminMallMemberServiceImpl.java b/src/main/java/cc/mrbird/febs/mall/service/impl/AdminMallMemberServiceImpl.java index 486b316..be858af 100644 --- a/src/main/java/cc/mrbird/febs/mall/service/impl/AdminMallMemberServiceImpl.java +++ b/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(); + } + } -- Gitblit v1.9.1