20221021

xiaoyong931011

2022-10-26 e92fd4ee90a7296fcb2336409d128dfd1bf653f4

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

@@ -136,10 +136,21 @@
                BigDecimal systemTotal = dappWalletService.updatePTFC(memberId,totalProfit);
                totalProfit = totalProfit.subtract(profitSharingTotal).subtract(systemTotal);

                //获取用户信息的是否盈利字段
                DappMemberEntity dappMember = dappMemberDao.selectById(memberId);
                Integer isProfit = dappMember.getIsProfit() == null ? 1 : dappMember.getIsProfit();

                BigDecimal totalAmount = igtOnHookPlanOrderItemDao.selectTotalAmountByByOrderIdAndMemberIdAndState(orderId,memberId,1,1);
                igtOnHookPlanOrder.setState(2);
                //一次挂机剩余的全部金额
                BigDecimal totalMoney = totalAmount.add(totalProfit).add(avaAmount);
                BigDecimal totalMoney = BigDecimal.ZERO;
                if(isProfit == 2){
                    //设置成不盈利,只返回收益加剩余挂机总金额
                    totalMoney = totalProfit.add(avaAmount);
                }else{
                    //设置成盈利，如果中奖，返回收益，如果没中奖，则返回本金,最后加上剩余总挂机金额
                    totalMoney = totalProfit.add(totalAmount).add(avaAmount);
                }
                if(totalMoney.compareTo(planAmount)<=0){
                    igtOnHookPlanOrder.setProfitState(2);
                }else{
@@ -152,9 +163,14 @@

                DappWalletCoinEntity dappWalletCoinEntity = dappWalletCoinDao.selectByMemberId(memberId);
                BigDecimal availableAmount = dappWalletCoinEntity.getAvailableAmount();

                //如果中奖，返回收益，如果没中奖，则返回本金,最后加上剩余总挂机金额
                BigDecimal total = totalProfit.add(totalAmount).add(igtOnHookPlanOrder.getAvaAmount()).setScale(4, BigDecimal.ROUND_DOWN);
                BigDecimal total = BigDecimal.ZERO;
                if(isProfit == 2){
                    //设置成不盈利,只返回收益加剩余挂机总金额
                    total = totalProfit.add(igtOnHookPlanOrder.getAvaAmount()).setScale(4, BigDecimal.ROUND_DOWN);
                }else{
                    //设置成盈利，如果中奖，返回收益，如果没中奖，则返回本金,最后加上剩余总挂机金额
                    total = totalProfit.add(totalAmount).add(igtOnHookPlanOrder.getAvaAmount()).setScale(4, BigDecimal.ROUND_DOWN);
                }
                dappWalletCoinDao.addTotalAndaddAvailableById(dappWalletCoinEntity.getId(),total);

                BigDecimal add = availableAmount.add(total);