xiaoyong931011
2022-10-29 e6f6094a3b1173954cd9979e637a6f1b3bafaf0b
20221021
4 files modified
14 ■■■■ changed files
src/main/java/cc/mrbird/febs/dapp/enumerate/DataDictionaryEnum.java 4 ●●● patch | view | raw | blame | history
src/main/java/cc/mrbird/febs/dapp/service/impl/AdminOperationServiceImpl.java 2 ●●● patch | view | raw | blame | history
src/main/java/cc/mrbird/febs/dapp/service/impl/DappMemberServiceImpl.java 2 ●●● patch | view | raw | blame | history
src/main/java/cc/mrbird/febs/dapp/service/impl/DappWalletServiceImpl.java 6 ●●●● patch | view | raw | blame | history
src/main/java/cc/mrbird/febs/dapp/enumerate/DataDictionaryEnum.java
@@ -28,12 +28,14 @@
     * 1、没有手续费
     * 2、转出账号得盈利满30%
     * 3、只允许上下级互转
     * 4、每日提现次数
     * 4、每日内转提现次数
     * 5、每日提现次数
     */
    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"),
    /**
     * 挂机方案
     * value格式:{"amount":"0","multipleTimes":"2","state":2}
src/main/java/cc/mrbird/febs/dapp/service/impl/AdminOperationServiceImpl.java
@@ -68,7 +68,7 @@
        //转出账户生成一条账户资金变化记录
        DappAccountMoneyChangeEntity dappAccountMoneyChangeEntityOut = new DappAccountMoneyChangeEntity(memberIdOut,
                dappWalletCoinEntityOut.getTotalAmount().setScale(4,BigDecimal.ROUND_DOWN),
                amount,
                amount.negate(),
                dappWalletCoinEntityOut.getTotalAmount().setScale(4,BigDecimal.ROUND_DOWN).subtract(amount),
                content,
                type);
src/main/java/cc/mrbird/febs/dapp/service/impl/DappMemberServiceImpl.java
@@ -594,7 +594,7 @@
        }else{
            memberInfoVo.setInviteId(dappMemberEntity.getInviteId());
            memberInfoVo.setIdentityCode(identity);
            memberInfoVo.setIdentity("会员");
            memberInfoVo.setIdentity("Member");
            memberInfoVo.setUsername(dappMemberEntity.getUsername());
        }
        if(ObjectUtil.isNotEmpty(dappMemberEntity.getTransferCode())){
src/main/java/cc/mrbird/febs/dapp/service/impl/DappWalletServiceImpl.java
@@ -698,8 +698,12 @@
            }
        }
        //(2)每24小时只能提现一次
        // 提现次数
        DataDictionaryCustom withdrawOutTimesDic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(DataDictionaryEnum.OUT_ACCOUNT_PROFIT.getType(), DataDictionaryEnum.OUT_ACCOUNT_PROFIT.getCode());
        String withdrawOutTimesStr = withdrawOutTimesDic.getValue() == null ? "1" : withdrawOutTimesDic.getValue();
        int withdrawOutTimes = Integer.parseInt(withdrawOutTimesStr);
        Integer withdrawTimesReal = memberCoinWithdrawDao.selectByMemberIdAndCreateTime(memberId,DateUtil.format(DateUtil.date(),"yyyy-MM-dd"));
        if(1 > withdrawTimesReal){
        if(withdrawOutTimes < withdrawTimesReal){
            return new FebsResponse().fail().message(MessageSourceUtils.getString("member_err_0014"));
        }