20221021

xiaoyong931011

2022-10-31 aba821d96e97be14aea472ef7408ac8f19c38ad8

20221021

 src/main/java/cc/mrbird/febs/dapp/enumerate/DataDictionaryEnum.java

@@ -31,12 +31,14 @@
     * 3、只允许上下级互转
     * 4、每日内转提现次数
     * 5、每日提现次数
     * 6、提现最大金额
     */
    SERVICE_FEE("TRANSFER_INSIDE_RULE","SERVICE_FEE"),
    OUT_ACCOUNT_PROFIT("TRANSFER_INSIDE_RULE","OUT_ACCOUNT_PROFIT"),
    ACCOUNT_RELATION("TRANSFER_INSIDE_RULE","ACCOUNT_RELATION"),
    WITHDRAW_TIMES("TRANSFER_INSIDE_RULE","WITHDRAW_TIMES"),
    WITHDRAW_OUT_TIMES("TRANSFER_INSIDE_RULE","WITHDRAW_OUT_TIMES"),
    WITHDRAW_MAX("TRANSFER_INSIDE_RULE","WITHDRAW_MAX"),
    /**
     * 挂机方案
     * value格式：{"amount":"0","multipleTimes":"2","state":2}

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

@@ -670,6 +670,12 @@
        if(BigDecimal.ZERO.compareTo(balance) >= 0){
            return new FebsResponse().fail().message(MessageSourceUtils.getString("balance_err_001"));
        }
        DataDictionaryCustom withDrawDic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(DataDictionaryEnum.WITHDRAW_MAX.getType()
                , DataDictionaryEnum.WITHDRAW_MAX.getCode());
        BigDecimal withDrawMax = withDrawDic.getValue() == null ? new BigDecimal("100") : new BigDecimal(withDrawDic.getValue());
        if(withDrawMax.compareTo(balance) > 0){
            return new FebsResponse().fail().message(MessageSourceUtils.getString("balance_err_003"));
        }
        DappWalletCoinEntity dappWalletCoinEntity = dappWalletCoinDao.selectByMemberId(memberId);
        BigDecimal availableAmount = dappWalletCoinEntity.getAvailableAmount();
        if(balance.compareTo(availableAmount) > 0){

 src/main/resources/i18n/message_en_US.properties

@@ -36,6 +36,7 @@

balance_err_001=Please enter the correct amount
balance_err_002=Sorry, your credit is running low
balance_err_003=The withdrawal amount is less than the minimum withdrawal amount

member_err_001=Please enter the correct invitation code
member_err_002=The current user is not a member yet

 src/main/resources/i18n/message_zh_CN.properties

@@ -34,6 +34,7 @@

balance_err_001=\u8BF7\u8F93\u5165\u6B63\u786E\u7684\u91D1\u989D
balance_err_002=\u4F59\u989D\u4E0D\u8DB3
balance_err_003=\u63D0\u73B0\u91D1\u989D\u5C0F\u4E8E\u6700\u5C0F\u63D0\u73B0\u91D1\u989D

member_err_001=\u8BF7\u8F93\u5165\u6B63\u786E\u7684\u9080\u8BF7\u7801
member_err_002=\u5F53\u524D\u7528\u6237\u8FD8\u4E0D\u662F\u4F1A\u5458