20221020

xiaoyong931011

2022-10-20 618685a538d45212ccc04ef12f227a9d5056a435

 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;
@@ -600,12 +600,26 @@
        DappWalletCoinEntity dappWalletCoinEntity = dappWalletCoinDao.selectByMemberId(memberId);
        if(ObjectUtil.isEmpty(dappMemberEntity)){
            memberInfoVo.setTotalAmount(AppContants.INIT_MONEY);
            memberInfoVo.setAvailableAmount(AppContants.INIT_MONEY);
            memberInfoVo.setFrozenAmount(AppContants.INIT_MONEY);
        }else{
            BigDecimal totalAmount = dappWalletCoinEntity.getTotalAmount();
            BigDecimal frozenAmount = dappWalletCoinEntity.getFrozenAmount();
            BigDecimal availableAmount = dappWalletCoinEntity.getAvailableAmount();
            if(BigDecimal.ZERO.compareTo(totalAmount) > 0){
                memberInfoVo.setTotalAmount(AppContants.INIT_MONEY);
            }else{
                memberInfoVo.setTotalAmount(totalAmount.setScale(2,BigDecimal.ROUND_DOWN));
            }
            if(BigDecimal.ZERO.compareTo(frozenAmount) > 0){
                memberInfoVo.setFrozenAmount(AppContants.INIT_MONEY);
            }else{
                memberInfoVo.setFrozenAmount(frozenAmount.setScale(2,BigDecimal.ROUND_DOWN));
            }
            if(BigDecimal.ZERO.compareTo(availableAmount) > 0){
                memberInfoVo.setAvailableAmount(AppContants.INIT_MONEY);
            }else{
                memberInfoVo.setAvailableAmount(availableAmount.setScale(2,BigDecimal.ROUND_DOWN));
            }
        }
        return memberInfoVo;
@@ -833,7 +847,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"));
        }
@@ -854,6 +868,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();
@@ -868,7 +898,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"));
        }