20221021

xiaoyong931011

2022-10-31 58cfc5ca855cce53c148e1dcf78e069a406ca5d4

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

@@ -126,7 +126,7 @@
        dappMember.setIsOnHook(1);
        dappMemberDao.updateById(dappMember);

        DappAccountMoneyChangeEntity dappAccountMoneyChangeEntity = new DappAccountMoneyChangeEntity(memberId, availableAmount, balance
        DappAccountMoneyChangeEntity dappAccountMoneyChangeEntity = new DappAccountMoneyChangeEntity(memberId, availableAmount, balance.negate()
                , availableAmount.subtract(balance).setScale(2,BigDecimal.ROUND_DOWN), "挂机", 6);
        dappAccountMoneyChangeDao.insert(dappAccountMoneyChangeEntity);
        return new FebsResponse().success().message(MessageSourceUtils.getString("Operation_001"));
@@ -390,14 +390,17 @@

                                if(2 == igtOnHookPlanOrderItem.getIsGoal()){
                                    //返还两次中奖之间的本金
                                    Date endTime = igtOnHookPlanOrderItem.getCreateTime();
                                    Date startTime = null;
                                    BigDecimal totalAmount = BigDecimal.ZERO;
                                    //返回上次中奖的记录
                                    IgtOnHookPlanOrderItem igtOld = igtOnHookPlanOrderItemDao.selectByCreateTimeAndIsgoaAndOrderId(endTime,2,igtOnHookPlanOrder.getId());
                                    IgtOnHookPlanOrderItem igtOld = igtOnHookPlanOrderItemDao.selectByCreateTimeAndIsgoaAndOrderId(
                                            igtOnHookPlanOrderItem.getId(),2,igtOnHookPlanOrderItem.getOrderId());
                                    if(ObjectUtil.isNotEmpty(igtOld)){
                                        startTime = igtOld.getCreateTime();
                                        totalAmount = igtOnHookPlanOrderItemDao.selectTotalAmountByIDAndOrderId(igtOld.getId(),
                                                igtOnHookPlanOrderItem.getId(),igtOnHookPlanOrderItem.getOrderId());
                                    }else{
                                        totalAmount = igtOnHookPlanOrderItemDao.selectTotalAmountByIDAndOrderId(null,
                                                igtOnHookPlanOrderItem.getId(),igtOnHookPlanOrderItem.getOrderId());
                                    }
                                    BigDecimal totalAmount = igtOnHookPlanOrderItemDao.selectTotalAmountByCreateTimeAndOrderId(startTime,endTime,igtOnHookPlanOrderItem.getOrderId());
                                    //如果中奖，增加挂机主表的挂机总收益,返还两次中奖之间的本金
                                    igtOnHookPlanOrderDao.AddProfitById(igtOnHookPlanOrder.getId()
                                            ,igtOnHookPlanOrderItem.getProfit());