20221227 充值归集

xiaoyong931011

2023-01-09 615b4cba39cc01756d7c0299204cc6ecaf172be5

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

@@ -155,11 +155,11 @@
            return new FebsResponse().fail().message("当前状态不是提现中");
        }

        Long wtihdrawTypeId = mallMemberWithdraw.getWtihdrawTypeId();
        MallMemberBank mallMemberBank = mallMemberBankMapper.selectById(wtihdrawTypeId);
        if(ObjectUtil.isEmpty(mallMemberBank)){
            return new FebsResponse().fail().message("提现地址不存在");
        }
//        Long wtihdrawTypeId = mallMemberWithdraw.getWtihdrawTypeId();
//        MallMemberBank mallMemberBank = mallMemberBankMapper.selectById(wtihdrawTypeId);
//        if(ObjectUtil.isEmpty(mallMemberBank)){
//            return new FebsResponse().fail().message("提现地址不存在");
//        }
        //更新提现记录状态为成功
        mallMemberWithdrawMapper.updateStatusById(2,mallMemberWithdraw.getId());
        //更新提现流水记录为成功
@@ -224,6 +224,7 @@
        if(CollUtil.isNotEmpty(records)){
            for(AdminAgentVo adminAgentVo : records){
                String inviteId = adminAgentVo.getInviteId();

                //直接下级
                List<MallMember> mallMembers = mallMemberMapper.selectChildAgentListByInviteId(inviteId);
                adminAgentVo.setMemberNum(CollUtil.isEmpty(mallMembers) ? 0 : mallMembers.size());
@@ -231,6 +232,17 @@
                //获取总数
                List<MallMember> allMallMembers =mallMemberMapper.selectAllChildAgentListByInviteId(inviteId);
                adminAgentVo.setAllMemberNum(CollUtil.isEmpty(allMallMembers) ? 0 : allMallMembers.size());

                //团队业绩
                BigDecimal amount = BigDecimal.ZERO;
                if(CollUtil.isNotEmpty(allMallMembers)){
                    for(MallMember teamMember : allMallMembers){
                        Long memberId = teamMember.getId();
                        BigDecimal sumAmount = mallMemberMapper.getSumAmountByMemberId(memberId);
                        amount = amount.add(sumAmount);
                    }
                }
                adminAgentVo.setAmount(amount);
            }
        }
        return adminAgentVos;
@@ -277,8 +289,8 @@
        List<AdminAgentMemberVo> records = adminAgentMemberVos.getRecords();
        if(CollUtil.isNotEmpty(records)){
            for(AdminAgentMemberVo agentMemberVo : records){
                String inviteId = agentMemberVo.getInviteId();
                BigDecimal amount = mallMemberMapper.getAgentTeamAmountByInviteId(inviteId);
                Long agentMemberVoId = agentMemberVo.getId();
                BigDecimal amount = mallMemberMapper.getSumAmountByMemberId(agentMemberVoId);
                agentMemberVo.setAmount(amount);
            }
        }
@@ -398,13 +410,32 @@
        } else {
            iApiMallMemberWalletService.add(mallSystemPayDto.getAddBalance(), mallSystemPayDto.getId(), filedType);
        }
        mallMoneyFlowService.addMoneyFlow(memberId, bigDecimal, MoneyFlowTypeEnum.SYSTEM.getValue(), null, type);

        mallMoneyFlowService.addMoneyFlow(
                memberId,
                null,
                bigDecimal,
                MallMoneyFlowTypeEnum.SYSTEM_CHARGE.getCode(),
                MallMoneyFlow.STATUS_SUCCESS,
                MallMoneyFlow.IS_RETURN_Y,
                memberId,
                FlowTypeEnum.BALANCE.getValue(),
                MallMoneyFlowTypeEnum.SYSTEM_CHARGE.getName()
        );
        return new FebsResponse().success();
    }

    @Override
    public AdminAgentLevelSetInfoVo getAgentLevelSetInfoByMemberId(long id) {
        AdminAgentLevelSetInfoVo adminAgentLevelSetInfoVo = mallMemberMapper.getAgentLevelSetInfoByMemberId(id);
        AdminAgentLevelSetInfoVo adminAgentLevelSetInfoVo = new AdminAgentLevelSetInfoVo();
        AdminAgentLevelSetInfoVo adminAgentLevelSetInfo = mallMemberMapper.getAgentLevelSetInfoByMemberId(id);
        if(ObjectUtil.isEmpty(adminAgentLevelSetInfo)){
            adminAgentLevelSetInfoVo.setId(id);
            adminAgentLevelSetInfoVo.setLevelCode(MemberAgentLevelEnum.AGENT.getCodeByName(MemberAgentLevelEnum.AGENT.getName()));
        }else{
            adminAgentLevelSetInfoVo.setId(id);
            adminAgentLevelSetInfoVo.setLevelCode(MemberAgentLevelEnum.AGENT.getCodeByName(adminAgentLevelSetInfo.getLevelCode()));
        }
        return adminAgentLevelSetInfoVo;
    }

@@ -417,9 +448,8 @@
        }
        String levelCode = agentLevelSetUpdateDto.getLevelCode();
        String nameByCode = MemberAgentLevelEnum.AGENT.getNameByCode(levelCode);
        mallMember.setLevel(nameByCode);
        mallMember.setLevelStatus(1);
        mallMemberMapper.updateById(mallMember);
        mallMemberMapper.updateLevelStatusById(1,memberId);
        mallMemberMapper.updateLevelById(nameByCode,memberId);
        return new FebsResponse().success();
    }

@@ -620,6 +650,14 @@
        return adminMallMemberPaymentVo;
    }

    @Override
    public IPage<MemberCoinChargeEntity> getChargeList(MemberCoinChargeEntity memberCoinChargeEntity, QueryRequest request) {

        Page<MemberCoinChargeEntity> page = new Page<>(request.getPageNum(), request.getPageSize());
        IPage<MemberCoinChargeEntity> memberCoinChargeEntityIPage = this.baseMapper.selectMemberChargeListInPage(page, memberCoinChargeEntity);
        return memberCoinChargeEntityIPage;
    }

    private String refererIds(String parentId) {
        boolean flag = false;
        if (StrUtil.isBlank(parentId)) {