20221021

xiaoyong931011

2022-10-21 e7ca8ba2b3c3b446e39d4c3a3ea5e238adb2fc7c

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

@@ -494,9 +494,9 @@
        DappWalletCoinEntity dappWalletCoinEntity = dappWalletCoinDao.selectByMemberId(memberId);
        ApiMemberWalletCoinVo apiMemberWalletCoinVo = new ApiMemberWalletCoinVo();
        if(ObjectUtil.isNotEmpty(dappWalletCoinEntity)){
            apiMemberWalletCoinVo.setTotalAmount(dappWalletCoinEntity.getTotalAmount().setScale(2,BigDecimal.ROUND_DOWN));
            apiMemberWalletCoinVo.setFrozenAmount(dappWalletCoinEntity.getFrozenAmount().setScale(2,BigDecimal.ROUND_DOWN));
            apiMemberWalletCoinVo.setAvailableAmount(dappWalletCoinEntity.getAvailableAmount().setScale(2,BigDecimal.ROUND_DOWN));
            apiMemberWalletCoinVo.setTotalAmount(dappWalletCoinEntity.getTotalAmount().setScale(4,BigDecimal.ROUND_DOWN));
            apiMemberWalletCoinVo.setFrozenAmount(dappWalletCoinEntity.getFrozenAmount().setScale(4,BigDecimal.ROUND_DOWN));
            apiMemberWalletCoinVo.setAvailableAmount(dappWalletCoinEntity.getAvailableAmount().setScale(4,BigDecimal.ROUND_DOWN));
        }
        return new FebsResponse().success().data(apiMemberWalletCoinVo);
    }
@@ -505,16 +505,30 @@
    @Transactional(rollbackFor = Exception.class)
    public FebsResponse transferInside(ApiTransferInsideDto apiTransferInsideDto) {
        //判断入参
        BigDecimal balance = apiTransferInsideDto.getBalance() == null ? BigDecimal.ZERO : apiTransferInsideDto.getBalance().setScale(2,BigDecimal.ROUND_DOWN);
        BigDecimal balance = apiTransferInsideDto.getBalance() == null ? BigDecimal.ZERO : apiTransferInsideDto.getBalance().setScale(4,BigDecimal.ROUND_DOWN);
        if(BigDecimal.ZERO.compareTo(balance) >= 0){
            return new FebsResponse().fail().message(MessageSourceUtils.getString("balance_err_001"));
        }
        if(ObjectUtil.isEmpty(apiTransferInsideDto.getInviteId())){
            return new FebsResponse().fail().message(MessageSourceUtils.getString("member_err_001"));
//        if(ObjectUtil.isEmpty(apiTransferInsideDto.getInviteId())){
//            return new FebsResponse().fail().message(MessageSourceUtils.getString("member_err_001"));
//        }
        if(ObjectUtil.isEmpty(apiTransferInsideDto.getUsername())){
            return new FebsResponse().fail().message(MessageSourceUtils.getString("member_err_0011"));
        }
        if(ObjectUtil.isEmpty(apiTransferInsideDto.getTransferCode())){
            return new FebsResponse().fail().message(MessageSourceUtils.getString("member_err_006"));
        }
        //每日挂机时间段内禁止内转
        DataDictionaryCustom startTimeDic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(DataDictionaryEnum.START_TIME.getType(), DataDictionaryEnum.START_TIME.getCode());
        DataDictionaryCustom endTimeDic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(DataDictionaryEnum.END_TIME.getType(), DataDictionaryEnum.END_TIME.getCode());
        //获取时间对应的秒数
        Integer dateNow = DateUtil.timeToSecond(DateUtil.formatTime(DateUtil.date()));
        Integer startTime = DateUtil.timeToSecond(startTimeDic.getValue());
        Integer endTime = DateUtil.timeToSecond(endTimeDic.getValue());
        if(startTime <= dateNow && endTime >= dateNow){
            return new FebsResponse().fail().message(MessageSourceUtils.getString("member_err_0012"));
        }


        DappMemberEntity dappMemberEntityOut = LoginUserUtil.getAppUser();
        Long memberIdOut = dappMemberEntityOut.getId();
@@ -534,7 +548,8 @@
        }

        String inviteIdIn = memberEntityIn.getInviteId();
        Boolean isMemberIn = dappMemberService.isMember(apiTransferInsideDto.getInviteId());
        Boolean isMemberIn = dappMemberService.isMember(inviteIdIn);
//        Boolean isMemberIn = dappMemberService.isMember(apiTransferInsideDto.getInviteId());
        if(!isMemberIn){
            return new FebsResponse().fail().message(MessageSourceUtils.getString("member_err_003"));
        }
@@ -566,7 +581,7 @@
        //查询转出会员
        //转出会员当前余额要大于等于划转金额
        DappWalletCoinEntity dappWalletCoinEntityOut = dappWalletCoinDao.selectByMemberId(memberIdOut);
        BigDecimal availableAmountOut = dappWalletCoinEntityOut.getAvailableAmount().setScale(2,BigDecimal.ROUND_DOWN);
        BigDecimal availableAmountOut = dappWalletCoinEntityOut.getAvailableAmount().setScale(4,BigDecimal.ROUND_DOWN);
        if(availableAmountOut.compareTo(balance) < 0){
            return new FebsResponse().fail().message(MessageSourceUtils.getString("balance_err_002"));
        }
@@ -666,7 +681,7 @@
        memberCoinWithdrawEntity.setFeeAmount(serviceFee);
        if(1 == apiTransferOutsideDto.getType()){
            memberCoinWithdrawEntity.setTag("银行卡");
            memberCoinWithdrawEntity.setSymbol("RMB");
            memberCoinWithdrawEntity.setSymbol("$");
        }else{
            memberCoinWithdrawEntity.setTag("钱包");
            memberCoinWithdrawEntity.setSymbol("USDT");