20221021

xiaoyong931011

2022-10-21 3d4667dc5a0d56ce1ad0283c26595f68263b061f

 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;
@@ -817,6 +817,7 @@
                ApiAmountTypeVo apiAmountTypeVo = new ApiAmountTypeVo();
                apiAmountTypeVo.setDescription(dataDictionaryCustom.getDescription());
                apiAmountTypeVo.setCodeValue(dataDictionaryCustom.getValue());
                apiAmountTypeVos.add(apiAmountTypeVo);
            }
        }
        return new FebsResponse().success().data(apiAmountTypeVos);
@@ -832,12 +833,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 +846,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 +867,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 +897,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 +907,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"));