fix

Helius

2021-09-28 31c11e345297f4f9938c7ea32d3864ed3ab26697

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

@@ -3,13 +3,11 @@
import cc.mrbird.febs.common.entity.FebsResponse;
import cc.mrbird.febs.common.entity.QueryRequest;
import cc.mrbird.febs.mall.dto.*;
import cc.mrbird.febs.mall.entity.AppVersion;
import cc.mrbird.febs.mall.entity.DataDictionaryCustom;
import cc.mrbird.febs.mall.entity.MallMember;
import cc.mrbird.febs.mall.entity.MallMoneyFlow;
import cc.mrbird.febs.mall.mapper.DataDictionaryCustomMapper;
import cc.mrbird.febs.mall.mapper.MallMemberMapper;
import cc.mrbird.febs.mall.mapper.MallMemberPaymentMapper;
import cc.mrbird.febs.mall.mapper.MallMoneyFlowMapper;
import cc.mrbird.febs.mall.mapper.*;
import cc.mrbird.febs.mall.service.IAdminMallMemberService;
import cc.mrbird.febs.mall.service.IApiMallMemberWalletService;
import cc.mrbird.febs.mall.vo.*;
@@ -25,6 +23,7 @@
import org.springframework.transaction.annotation.Transactional;

import java.math.BigDecimal;
import java.util.Date;
import java.util.List;

/**
@@ -45,6 +44,8 @@
    private final DataDictionaryCustomMapper dataDictionaryCustomMapper;

    private final IApiMallMemberWalletService iApiMallMemberWalletService;

    private final AppVersionMapper appVersionMapper;

    @Override
    public IPage<MallMember> getMallMemberList(MallMember mallMember, QueryRequest request) {
@@ -219,7 +220,77 @@
        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();
    }

    @Override
    public IPage<AppVersion> getAppVersionList(AppVersion appVersion, QueryRequest request) {
        Page<AppVersion> page = new Page<>(request.getPageNum(), request.getPageSize());
        IPage<AppVersion> appVersions = this.baseMapper.getAppVersionListInPage(page, appVersion);
        return appVersions;
    }

    @Override
    public FebsResponse delCategary(Long id) {
        AppVersion appVersion = appVersionMapper.selectById(id);
        if(ObjectUtil.isEmpty(appVersion)){
            return new FebsResponse().fail().message("系统繁忙，请刷新页面重试");
        }
        appVersionMapper.deleteById(id);
        return new FebsResponse().success();
    }

    @Override
    public FebsResponse addAppVersion(AppVersion appVersion) {
        appVersion.setCreatetime(new Date());
        appVersionMapper.insert(appVersion);
        return new FebsResponse().success();
    }

    @Override
    public AppVersion getAppVersionInfoById(long id) {
        return appVersionMapper.selectById(id);
    }

    @Override
    public FebsResponse updateAppVersion(AppVersion appVersion) {
        AppVersion appVersionBefore = appVersionMapper.selectById(appVersion.getId());
        if(ObjectUtil.isEmpty(appVersionBefore)){
            return new FebsResponse().fail().message("系统繁忙，请刷新页面重试");
        }
        appVersion.setCreatetime(new Date());
        appVersionMapper.updateById(appVersion);
        return new FebsResponse().success();
    }

}