20221021

xiaoyong931011

2022-10-21 094ac833c36fba81421d7472ebd0f58bacf9e1a9

20221021

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

@@ -25,7 +25,7 @@
                //最大挂机次数,五分钟开奖一次，一个小时固定次数12次
                int maxTimes = new Double(hours * 12).intValue();
                //预期最大收益
                BigDecimal profitTotal = AppContants.ONHOOK_BASIC_AMOUNT.multiply(hangingRevenue).setScale(2, BigDecimal.ROUND_DOWN);
                BigDecimal profitTotal = AppContants.ONHOOK_BASIC_AMOUNT.multiply(hangingRevenue).setScale(4, BigDecimal.ROUND_DOWN);
                BigDecimal profitTotalNow = BigDecimal.ZERO;
                for(int i=1;i<=maxTimes;){

@@ -42,8 +42,8 @@
                                JSONObject jsonObject = JSONUtil.parseObj(planMapValue);
                                jsonObject.set("isGoal","2");
                                BigDecimal amount = new BigDecimal(jsonObject.get("amount").toString());
                                BigDecimal profit = amount.multiply(hangingRevenue).setScale(2, BigDecimal.ROUND_DOWN);
                                profitTotalNow = profitTotalNow.add(profit).setScale(2, BigDecimal.ROUND_DOWN);
                                BigDecimal profit = amount.multiply(hangingRevenue).setScale(4, BigDecimal.ROUND_DOWN);
                                profitTotalNow = profitTotalNow.add(profit).setScale(4, BigDecimal.ROUND_DOWN);
                                jsonObject.set("profit",profit);
                                linkedList.add(JSONUtil.toJsonStr(jsonObject));
                                maxTimes --;
@@ -62,8 +62,8 @@
                                        jsonObject.set("isGoal","1");
                                    }
                                    BigDecimal amount = new BigDecimal(jsonObject.get("amount").toString());
                                    BigDecimal profit = amount.multiply(hangingRevenue).setScale(2, BigDecimal.ROUND_DOWN);
                                    profitTotalNow = profitTotalNow.add(profit).setScale(2, BigDecimal.ROUND_DOWN);
                                    BigDecimal profit = amount.multiply(hangingRevenue).setScale(4, BigDecimal.ROUND_DOWN);
                                    profitTotalNow = profitTotalNow.add(profit).setScale(4, BigDecimal.ROUND_DOWN);
                                    jsonObject.set("profit",profit);
                                    linkedList.add(JSONUtil.toJsonStr(jsonObject));
                                    maxTimes --;
@@ -91,7 +91,7 @@
                            JSONObject jsonObject = JSONUtil.parseObj(planMapValue);
                            jsonObject.set("isGoal","1");
                            BigDecimal amount = new BigDecimal(jsonObject.get("amount").toString());
                            BigDecimal profit = amount.multiply(hangingRevenue).setScale(2, BigDecimal.ROUND_DOWN);
                            BigDecimal profit = amount.multiply(hangingRevenue).setScale(4, BigDecimal.ROUND_DOWN);
                            jsonObject.set("profit",profit);
                            linkedList.add(JSONUtil.toJsonStr(jsonObject));
                        }

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

@@ -50,7 +50,7 @@
        memberCoinWithdrawEntity.setStatus(MemberCoinWithdrawEntity.STATUS_YES);
        memberCoinWithdrawDao.updateById(memberCoinWithdrawEntity);
        //转出账户，总额减少，冻结减少
        BigDecimal amount = memberCoinWithdrawEntity.getAmount().setScale(2,BigDecimal.ROUND_DOWN);
        BigDecimal amount = memberCoinWithdrawEntity.getAmount().setScale(4,BigDecimal.ROUND_DOWN);
        Long memberIdOut = memberCoinWithdrawEntity.getMemberId();
        DappWalletCoinEntity dappWalletCoinEntityOut = dappWalletCoinDao.selectByMemberId(memberIdOut);
        dappWalletCoinDao.delTotalAndDelFrozenById(dappWalletCoinEntityOut.getId(),amount);
@@ -67,9 +67,9 @@
        }
        //转出账户生成一条账户资金变化记录
        DappAccountMoneyChangeEntity dappAccountMoneyChangeEntityOut = new DappAccountMoneyChangeEntity(memberIdOut,
                dappWalletCoinEntityOut.getTotalAmount().setScale(2,BigDecimal.ROUND_DOWN),
                dappWalletCoinEntityOut.getTotalAmount().setScale(4,BigDecimal.ROUND_DOWN),
                amount,
                dappWalletCoinEntityOut.getTotalAmount().setScale(2,BigDecimal.ROUND_DOWN).subtract(amount),
                dappWalletCoinEntityOut.getTotalAmount().setScale(4,BigDecimal.ROUND_DOWN).subtract(amount),
                content,
                type);
        dappAccountMoneyChangeDao.insert(dappAccountMoneyChangeEntityOut);
@@ -89,9 +89,9 @@
            }
            //生成流水记录
            DappAccountMoneyChangeEntity dappAccountMoneyChangeEntityIn = new DappAccountMoneyChangeEntity(dappMemberEntityIn.getId(),
                    dappWalletCoinEntityIn.getTotalAmount().setScale(2,BigDecimal.ROUND_DOWN),
                    dappWalletCoinEntityIn.getTotalAmount().setScale(4,BigDecimal.ROUND_DOWN),
                    amount,
                    dappWalletCoinEntityIn.getTotalAmount().setScale(2,BigDecimal.ROUND_DOWN).add(amount),
                    dappWalletCoinEntityIn.getTotalAmount().setScale(4,BigDecimal.ROUND_DOWN).add(amount),
                    "转账",
                    4);
            dappAccountMoneyChangeDao.insert(dappAccountMoneyChangeEntityIn);

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

@@ -136,7 +136,7 @@
            String levelMemberValue = levelMember.getValue();
            JSONObject levelMemberValueParse = JSONUtil.parseObj(levelMemberValue);
            hangingRevenue = new BigDecimal(levelMemberValueParse.get("hangingRevenue").toString())
                    .multiply(new BigDecimal(0.01)).setScale(2,BigDecimal.ROUND_DOWN);
                    .multiply(new BigDecimal(0.01)).setScale(4,BigDecimal.ROUND_DOWN);
        }
        //获取挂机字表的顺序
        LinkedList<String> isProfitPlan = new LinkedList<>();
@@ -213,7 +213,7 @@
        DappWalletCoinEntity dappWalletCoinEntity = dappWalletCoinDao.selectByMemberId(memberId);
        BigDecimal availableAmount = dappWalletCoinEntity.getAvailableAmount();
        //如果中奖，返回本金加收益加剩余总挂机金额
        BigDecimal total = totalProfit.add(totalAmount).add(igtOnHookPlanOrder.getAvaAmount()).setScale(2, BigDecimal.ROUND_DOWN);
        BigDecimal total = totalProfit.add(totalAmount).add(igtOnHookPlanOrder.getAvaAmount()).setScale(4, BigDecimal.ROUND_DOWN);
        dappWalletCoinDao.addTotalAndaddAvailableById(memberId,total);
        //生成流水记录
        BigDecimal add = availableAmount.add(total);
@@ -242,7 +242,7 @@
                apiPlanInfoVo.setId(igtOnHookPlanOrder.getId());
                apiPlanInfoVo.setAvaAmount(igtOnHookPlanOrder.getAvaAmount());
                BigDecimal totalProfit = igtOnHookPlanOrderItemDao.selectTotalProfitByByOrderIdAndMemberIdAndState(igtOnHookPlanOrder.getId(),memberId,1,2);
                apiPlanInfoVo.setProfit(totalProfit.setScale(2,BigDecimal.ROUND_DOWN));
                apiPlanInfoVo.setProfit(totalProfit.setScale(4,BigDecimal.ROUND_DOWN));
            }
        }
        return new FebsResponse().success().data(apiPlanInfoVo);
@@ -293,7 +293,7 @@
                //挂机收益
                BigDecimal hangingRevenue = new BigDecimal(profitValue.get("hangingRevenue").toString()).divide(new BigDecimal(100));
                //预计收益
                BigDecimal expectProfit = balance.multiply(balance).setScale(2, BigDecimal.ROUND_DOWN);
                BigDecimal expectProfit = balance.multiply(balance).setScale(4, BigDecimal.ROUND_DOWN);
            }
        }


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

@@ -609,17 +609,17 @@
            if(BigDecimal.ZERO.compareTo(totalAmount) > 0){
                memberInfoVo.setTotalAmount(AppContants.INIT_MONEY);
            }else{
                memberInfoVo.setTotalAmount(totalAmount.setScale(2,BigDecimal.ROUND_DOWN));
                memberInfoVo.setTotalAmount(totalAmount.setScale(4,BigDecimal.ROUND_DOWN));
            }
            if(BigDecimal.ZERO.compareTo(frozenAmount) > 0){
                memberInfoVo.setFrozenAmount(AppContants.INIT_MONEY);
            }else{
                memberInfoVo.setFrozenAmount(frozenAmount.setScale(2,BigDecimal.ROUND_DOWN));
                memberInfoVo.setFrozenAmount(frozenAmount.setScale(4,BigDecimal.ROUND_DOWN));
            }
            if(BigDecimal.ZERO.compareTo(availableAmount) > 0){
                memberInfoVo.setAvailableAmount(AppContants.INIT_MONEY);
            }else{
                memberInfoVo.setAvailableAmount(availableAmount.setScale(2,BigDecimal.ROUND_DOWN));
                memberInfoVo.setAvailableAmount(availableAmount.setScale(4,BigDecimal.ROUND_DOWN));
            }
        }
        return memberInfoVo;

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

 src/main/java/cc/mrbird/febs/dapp/vo/TeamListVo.java

@@ -23,6 +23,6 @@
    private BigDecimal selfCoinCount;

    public BigDecimal getCoinCount() {
        return coinCount.setScale(2, RoundingMode.HALF_DOWN);
        return coinCount.setScale(4, RoundingMode.HALF_DOWN);
    }
}

 src/main/java/cc/mrbird/febs/job/OnHookPlanJob.java

@@ -135,7 +135,7 @@
                DappWalletCoinEntity dappWalletCoinEntity = dappWalletCoinDao.selectByMemberId(memberId);
                BigDecimal availableAmount = dappWalletCoinEntity.getAvailableAmount();
                //如果中奖，返回本金加收益加剩余投注金额
                BigDecimal total = totalProfit.add(totalAmount).add(igtOnHookPlanOrder.getAvaAmount()).setScale(2, BigDecimal.ROUND_DOWN);
                BigDecimal total = totalProfit.add(totalAmount).add(igtOnHookPlanOrder.getAvaAmount()).setScale(4, BigDecimal.ROUND_DOWN);
                dappWalletCoinDao.addTotalAndaddAvailableById(memberId,total);

                BigDecimal add = availableAmount.add(total);