20221021

xiaoyong931011

2022-10-30 f7e72df35e6829242adfc9fb330f296595a5f10f

20221021

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

@@ -398,8 +398,8 @@
                                        totalAmount = igtOnHookPlanOrderItemDao.selectTotalAmountByIDAndOrderId(igtOld.getId(),
                                                igtOnHookPlanOrderItem.getId(),igtOnHookPlanOrderItem.getOrderId());
                                    }else{
                                        totalAmount = igtOnHookPlanOrderItemDao.selectTotalAmountByIDAndOrderId(igtOld.getId(),
                                                null,igtOnHookPlanOrderItem.getOrderId());
                                        totalAmount = igtOnHookPlanOrderItemDao.selectTotalAmountByIDAndOrderId(null,
                                                igtOnHookPlanOrderItem.getId(),igtOnHookPlanOrderItem.getOrderId());
                                    }
                                    //如果中奖，增加挂机主表的挂机总收益,返还两次中奖之间的本金
                                    igtOnHookPlanOrderDao.AddProfitById(igtOnHookPlanOrder.getId()

 src/test/java/cc/mrbird/febs/JunitTest.java

@@ -250,15 +250,29 @@

    @Test
    public void testUpdateIgt(){//返还两次中奖之间的本金
        IgtOnHookPlanOrderItem igtOnHookPlanOrderItem = igtOnHookPlanOrderItemDao.selectById(3889L);
//        IgtOnHookPlanOrderItem igtOnHookPlanOrderItem = igtOnHookPlanOrderItemDao.selectById(3889L);
//        Date endTime = igtOnHookPlanOrderItem.getCreateTime();
//        Date startTime = null;
//        //返回上次中奖的记录
//        IgtOnHookPlanOrderItem igtOld = igtOnHookPlanOrderItemDao.selectByCreateTimeAndIsgoaAndOrderId(endTime,2,198L);
//        if(ObjectUtil.isNotEmpty(igtOld)){
//            startTime = igtOld.getCreateTime();
//        }
//        BigDecimal totalAmount = igtOnHookPlanOrderItemDao.selectTotalAmountByCreateTimeAndOrderId(startTime,endTime,198L);

        IgtOnHookPlanOrderItem igtOnHookPlanOrderItem = igtOnHookPlanOrderItemDao.selectById(3899L);
        //返还两次中奖之间的本金
        Date endTime = igtOnHookPlanOrderItem.getCreateTime();
        Date startTime = null;
        BigDecimal totalAmount = BigDecimal.ZERO;
        //返回上次中奖的记录
        IgtOnHookPlanOrderItem igtOld = igtOnHookPlanOrderItemDao.selectByCreateTimeAndIsgoaAndOrderId(endTime,2,198L);
        IgtOnHookPlanOrderItem igtOld = igtOnHookPlanOrderItemDao.selectByCreateTimeAndIsgoaAndOrderId(endTime,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,198L);
    }

    @Test