20221021

xiaoyong931011

2022-10-21 45189f71f0eb2c119ea15de98c76839e9ee4b570

 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,7 +505,7 @@
    @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"));
        }
@@ -526,7 +526,7 @@
        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_006"));
            return new FebsResponse().fail().message(MessageSourceUtils.getString("member_err_0012"));
        }


@@ -548,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"));
        }
@@ -580,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"));
        }