20221020

xiaoyong931011

2022-10-20 babb182e69f9c7e470bbad9378fb418af22dbb9d

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

@@ -64,7 +64,9 @@
    private final DataDictionaryCustomMapper dataDictionaryCustomMapper;
    private final PlatformBannerMapper platformBannerMapper;
    private final DappAccountMoneyChangeDao dappAccountMoneyChangeDao;
    private final DappBankDao dappBankDao;
    private final DappMemberService dappMemberService;
    private final DappMemberAddressDao dappMemberAddressDao;

    private final RedisTemplate<String, Object> redisTemplate;

@@ -598,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;
@@ -681,7 +697,7 @@
    }

    @Override
    public List<ApiAmountChangeListVo> findAmountInPage(ApiAmountChangeDto apiAmountChangeDto) {
    public IPage<ApiAmountChangeListVo> findAmountInPage(ApiAmountChangeDto apiAmountChangeDto) {
        Page<ApiAmountChangeListVo> page = new Page<>(apiAmountChangeDto.getPageNum(), apiAmountChangeDto.getPageSize());

        DappMemberEntity member = LoginUserUtil.getAppUser();
@@ -697,7 +713,7 @@
        }
        dappAccountMoneyChangeEntity.setMemberId(member.getId());
        IPage<ApiAmountChangeListVo> records = dappAccountMoneyChangeDao.selectChangeListInPage(page, dappAccountMoneyChangeEntity);
        return records.getRecords();
        return records;
    }

    @Override
@@ -770,7 +786,7 @@
    }

    @Override
    public FebsResponse myTeammateInfo(ApiMyTeammateInfoDto apiMyTeammateInfoDto) {
    public IPage<ApiMyTeammateInfoListVo> myTeammateInfo(ApiMyTeammateInfoDto apiMyTeammateInfoDto) {
        DappMemberEntity member = LoginUserUtil.getAppUser();
        Page<ApiMyTeammateInfoListVo> page = new Page<>(apiMyTeammateInfoDto.getPageNum(), apiMyTeammateInfoDto.getPageSize());
        if(ObjectUtil.isEmpty(apiMyTeammateInfoDto.getInviteId())){
@@ -789,7 +805,7 @@
                }
            }
        }
        return new FebsResponse().success().data(apiMyTeammateInfoListVos);
        return apiMyTeammateInfoListVos;
    }

    @Override
@@ -807,12 +823,78 @@
    }

    @Override
    public FebsResponse findTeammateChangeListInPage(ApiAmountChangeDto apiAmountChangeDto) {
    public IPage<ApiMyTeammateAmountChangeListVo> findTeammateChangeListInPage(ApiAmountChangeDto apiAmountChangeDto) {
        DappMemberEntity member = LoginUserUtil.getAppUser();
        Page<ApiMyTeammateAmountChangeListVo> page = new Page<>(apiAmountChangeDto.getPageNum(), apiAmountChangeDto.getPageSize());
        apiAmountChangeDto.setInviteId(member.getInviteId());
        IPage<ApiMyTeammateAmountChangeListVo> amountChangeList = dappAccountMoneyChangeDao.selectTeammateChangeListInPage(apiAmountChangeDto,page);
        return new FebsResponse().success().data(amountChangeList);
        return amountChangeList;
    }

    @Override
    public IPage<ApiBankListVo> 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;
    }

    @Override
    public FebsResponse addBank(ApiAddBankDto addBankDto) {
        DappMemberEntity member = LoginUserUtil.getAppUser();
        if(ObjectUtil.isEmpty(addBankDto.getTransferCode())){
            return new FebsResponse().fail().message(MessageSourceUtils.getString("member_err_006"));
        }
        //验证资金密码
        Boolean aBoolean = dappMemberService.validateTransferCode(addBankDto.getTransferCode(), member.getId());
        if(!aBoolean){
            return new FebsResponse().fail().message(MessageSourceUtils.getString("member_err_006"));
        }
        DappBank dappBank = new DappBank();
        dappBank.setMemberId(member.getId());
        dappBank.setType(addBankDto.getType());
        dappBank.setMemberName(addBankDto.getMemberName());
        dappBank.setCardCode(addBankDto.getCardCode());
        dappBank.setBankName(addBankDto.getBankName());
        dappBank.setBankOtherName(addBankDto.getBankOtherName());
        dappBank.setCountry(addBankDto.getCountry());
        dappBank.setProvince(addBankDto.getProvince());
        dappBank.setAddress(addBankDto.getAddress());
        dappBank.setIdentifyCode(addBankDto.getIdentifyCode());
        dappBank.setSwiftBicCode(addBankDto.getSwiftBicCode());
        dappBank.setIbanCode(addBankDto.getIbanCode());
        dappBankDao.insert(dappBank);
        return new FebsResponse().success().message(MessageSourceUtils.getString("Operation_001"));
    }

    @Override
    public FebsResponse getBankListInPage() {
        DappMemberEntity member = LoginUserUtil.getAppUser();
        ApiAddressInfoVo apiAddressInfoVo = dappMemberAddressDao.selectByMemberId(member.getId());
        return new FebsResponse().success().data(apiAddressInfoVo);
    }

    @Override
    public FebsResponse addAddress(ApiAddAddressDto apiAddAddressDto) {
        DappMemberEntity member = LoginUserUtil.getAppUser();
        if(ObjectUtil.isEmpty(apiAddAddressDto.getTransferCode())){
            return new FebsResponse().fail().message(MessageSourceUtils.getString("member_err_006"));
        }
        //验证资金密码
        Boolean aBoolean = dappMemberService.validateTransferCode(apiAddAddressDto.getTransferCode(), member.getId());
        if(!aBoolean){
            return new FebsResponse().fail().message(MessageSourceUtils.getString("member_err_006"));
        }
        ApiAddressInfoVo apiAddressInfoVo = dappMemberAddressDao.selectByMemberId(member.getId());
        if(ObjectUtil.isNotEmpty(apiAddressInfoVo)){
            return new FebsResponse().success().message(MessageSourceUtils.getString("Operation_002"));
        }
        DappMemberAddress dappMemberAddress = new DappMemberAddress();
        dappMemberAddress.setType(apiAddAddressDto.getType());
        dappMemberAddress.setAddress(apiAddAddressDto.getAddress());
        dappMemberAddressDao.insert(dappMemberAddress);
        return new FebsResponse().success().message(MessageSourceUtils.getString("Operation_001"));
    }

    public String generateAsaToken(String token) {