20221021

xiaoyong931011

2022-10-21 954196d1c02545a35d25020cf08fc54a64426310

 src/main/java/cc/mrbird/febs/dapp/service/impl/DappMemberServiceImpl.java

@@ -65,7 +65,7 @@
    private final PlatformBannerMapper platformBannerMapper;
    private final DappAccountMoneyChangeDao dappAccountMoneyChangeDao;
    private final DappBankDao dappBankDao;
    private final DappMemberService dappMemberService;
//    private final DappMemberService dappMemberService;
    private final DappMemberAddressDao dappMemberAddressDao;

    private final RedisTemplate<String, Object> redisTemplate;
@@ -418,6 +418,8 @@
        member.setPassword(SecureUtil.md5(registerDto.getPassword()));
        member.setIdentity(DataDictionaryEnum.LEVEL_MB.getCode());
        member.setRefererId(registerDto.getRefererId());
        member.setIsOnHook(2);
        member.setIsProfit(1);
        dappMemberDao.insert(member);

        //更新用户信息
@@ -514,6 +516,8 @@
            dappMemberEntity = new DappMemberEntity();
            dappMemberEntity.setTouristMark(touristMark);
            dappMemberEntity.setIdentity(DataDictionaryEnum.LEVEL_TM.getCode());
            dappMemberEntity.setIsOnHook(2);
            dappMemberEntity.setIsProfit(1);
            dappMemberDao.insert(dappMemberEntity);

            //初始化账户信息
@@ -594,6 +598,9 @@
        }else{
            memberInfoVo.setIsSetTransferCode(2);
        }
        if(ObjectUtil.isNotEmpty(dappMemberEntity.getRealname())){
            memberInfoVo.setRealname(dappMemberEntity.getRealname());
        }
        int isOnHook = dappMemberEntity.getIsOnHook() == null ? 2 : dappMemberEntity.getIsOnHook();
        memberInfoVo.setIsOnHook(isOnHook);

@@ -609,17 +616,17 @@
            if(BigDecimal.ZERO.compareTo(totalAmount) > 0){
                memberInfoVo.setTotalAmount(AppContants.INIT_MONEY);
            }else{
                memberInfoVo.setTotalAmount(totalAmount.setScale(2,BigDecimal.ROUND_DOWN));
                memberInfoVo.setTotalAmount(totalAmount.setScale(4,BigDecimal.ROUND_DOWN));
            }
            if(BigDecimal.ZERO.compareTo(frozenAmount) > 0){
                memberInfoVo.setFrozenAmount(AppContants.INIT_MONEY);
            }else{
                memberInfoVo.setFrozenAmount(frozenAmount.setScale(2,BigDecimal.ROUND_DOWN));
                memberInfoVo.setFrozenAmount(frozenAmount.setScale(4,BigDecimal.ROUND_DOWN));
            }
            if(BigDecimal.ZERO.compareTo(availableAmount) > 0){
                memberInfoVo.setAvailableAmount(AppContants.INIT_MONEY);
            }else{
                memberInfoVo.setAvailableAmount(availableAmount.setScale(2,BigDecimal.ROUND_DOWN));
                memberInfoVo.setAvailableAmount(availableAmount.setScale(4,BigDecimal.ROUND_DOWN));
            }
        }
        return memberInfoVo;
@@ -748,18 +755,18 @@
        if (ObjectUtil.isEmpty(refererMember)) {
            return new FebsResponse().fail().message(MessageSourceUtils.getString("register_err_005"));
        }
        member = new DappMemberEntity();
        member.setUsername(apiAddTeammateDto.getAccount());
        member.setPassword(SecureUtil.md5(apiAddTeammateDto.getPassword()));
        member.setIdentity(DataDictionaryEnum.LEVEL_MB.getCode());
        member.setRefererId(member.getInviteId());
        dappMemberDao.insert(member);
        DappMemberEntity memberadd = new DappMemberEntity();
        memberadd.setUsername(apiAddTeammateDto.getAccount());
        memberadd.setPassword(SecureUtil.md5(apiAddTeammateDto.getPassword()));
        memberadd.setIdentity(DataDictionaryEnum.LEVEL_MB.getCode());
        memberadd.setRefererId(member.getInviteId());
        dappMemberDao.insert(memberadd);

        //更新用户信息
        String inviteId = ShareCodeUtil.toSerialCode(member.getId());
        member.setInviteId(inviteId);
        String inviteId = ShareCodeUtil.toSerialCode(memberadd.getId());
        memberadd.setInviteId(inviteId);
        boolean flag = false;
        String parentId = member.getRefererId();
        String parentId = memberadd.getRefererId();
        String ids = "";
        while (!flag) {
            ids += ("," + parentId);
@@ -772,11 +779,11 @@
                flag = true;
            }
        }
        member.setRefererIds(ids);
        dappMemberDao.updateById(member);
        memberadd.setRefererIds(ids);
        dappMemberDao.updateById(memberadd);
        //初始化账户信息
        DappWalletCoinEntity dappWalletCoinEntity = new DappWalletCoinEntity();
        dappWalletCoinEntity.setMemberId(member.getId());
        dappWalletCoinEntity.setMemberId(memberadd.getId());
        dappWalletCoinEntity.setAvailableAmount(AppContants.INIT_MONEY);
        dappWalletCoinEntity.setFrozenAmount(AppContants.INIT_MONEY);
        dappWalletCoinEntity.setTotalAmount(AppContants.INIT_MONEY);
@@ -817,6 +824,7 @@
                ApiAmountTypeVo apiAmountTypeVo = new ApiAmountTypeVo();
                apiAmountTypeVo.setDescription(dataDictionaryCustom.getDescription());
                apiAmountTypeVo.setCodeValue(dataDictionaryCustom.getValue());
                apiAmountTypeVos.add(apiAmountTypeVo);
            }
        }
        return new FebsResponse().success().data(apiAmountTypeVos);
@@ -832,12 +840,10 @@
    }

    @Override
    public IPage<ApiBankListVo> getBankListInPage(ApiBankListDto apiBankListDto) {
    public FebsResponse getBankListInPage(ApiBankListDto apiBankListDto) {
        DappMemberEntity member = LoginUserUtil.getAppUser();
        Page<ApiBankListVo> page = new Page<>(apiBankListDto.getPageNum(), apiBankListDto.getPageSize());
        apiBankListDto.setMemberId(member.getId());
        IPage<ApiBankListVo> apiBankListVoIPage = dappBankDao.selectBankListInPage(apiBankListDto,page);
        return apiBankListVoIPage;
        List<ApiBankListVo> apiBankListVos = dappBankDao.selectBankListByMemberId(member.getId());
        return new FebsResponse().success().data(apiBankListVos);
    }

    @Override
@@ -847,7 +853,7 @@
            return new FebsResponse().fail().message(MessageSourceUtils.getString("member_err_006"));
        }
        //验证资金密码
        Boolean aBoolean = dappMemberService.validateTransferCode(addBankDto.getTransferCode(), member.getId());
        Boolean aBoolean = validateTransferCodeInside(addBankDto.getTransferCode(), member.getId());
        if(!aBoolean){
            return new FebsResponse().fail().message(MessageSourceUtils.getString("member_err_006"));
        }
@@ -868,6 +874,22 @@
        return new FebsResponse().success().message(MessageSourceUtils.getString("Operation_001"));
    }

    private Boolean validateTransferCodeInside(String transferCode, Long memberId) {
        boolean flag = false;
        DappMemberEntity member = dappMemberDao.selectById(memberId);
        if (ObjectUtil.isEmpty(member)) {
            return flag;
        }
        String transferCodeMember = member.getTransferCode();
        String transferCodeMd5Pwd = SecureUtil.md5(transferCode);
        if(transferCodeMd5Pwd.equals(transferCodeMember)){
            flag = true;
        }else{
            return flag;
        }
        return flag;
    }

    @Override
    public FebsResponse getBankListInPage() {
        DappMemberEntity member = LoginUserUtil.getAppUser();
@@ -882,7 +904,7 @@
            return new FebsResponse().fail().message(MessageSourceUtils.getString("member_err_006"));
        }
        //验证资金密码
        Boolean aBoolean = dappMemberService.validateTransferCode(apiAddAddressDto.getTransferCode(), member.getId());
        Boolean aBoolean = validateTransferCodeInside(apiAddAddressDto.getTransferCode(), member.getId());
        if(!aBoolean){
            return new FebsResponse().fail().message(MessageSourceUtils.getString("member_err_006"));
        }
@@ -892,6 +914,7 @@
        }
        DappMemberAddress dappMemberAddress = new DappMemberAddress();
        dappMemberAddress.setType(apiAddAddressDto.getType());
        dappMemberAddress.setMemberId(member.getId());
        dappMemberAddress.setAddress(apiAddAddressDto.getAddress());
        dappMemberAddressDao.insert(dappMemberAddress);
        return new FebsResponse().success().message(MessageSourceUtils.getString("Operation_001"));