20221021

xiaoyong931011

2022-10-30 3e21242780b4c981fb734f15939e208b0fed0eb2

20221021

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

@@ -392,7 +392,8 @@
                                    //返还两次中奖之间的本金
                                    BigDecimal totalAmount = BigDecimal.ZERO;
                                    //返回上次中奖的记录
                                    IgtOnHookPlanOrderItem igtOld = igtOnHookPlanOrderItemDao.selectByCreateTimeAndIsgoaAndOrderId(igtOnHookPlanOrderItem.getId(),2,igtOnHookPlanOrder.getId());
                                    IgtOnHookPlanOrderItem igtOld = igtOnHookPlanOrderItemDao.selectByCreateTimeAndIsgoaAndOrderId(
                                            igtOnHookPlanOrderItem.getId(),2,igtOnHookPlanOrderItem.getOrderId());
                                    if(ObjectUtil.isNotEmpty(igtOld)){
                                        totalAmount = igtOnHookPlanOrderItemDao.selectTotalAmountByIDAndOrderId(igtOld.getId(),
                                                igtOnHookPlanOrderItem.getId(),igtOnHookPlanOrderItem.getOrderId());

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

@@ -260,12 +260,12 @@
//        }
//        BigDecimal totalAmount = igtOnHookPlanOrderItemDao.selectTotalAmountByCreateTimeAndOrderId(startTime,endTime,198L);

        IgtOnHookPlanOrderItem igtOnHookPlanOrderItem = igtOnHookPlanOrderItemDao.selectById(3899L);
        IgtOnHookPlanOrderItem igtOnHookPlanOrderItem = igtOnHookPlanOrderItemDao.selectById(3903L);
        //返还两次中奖之间的本金
        Date endTime = igtOnHookPlanOrderItem.getCreateTime();
        BigDecimal totalAmount = BigDecimal.ZERO;
        //返回上次中奖的记录
        IgtOnHookPlanOrderItem igtOld = igtOnHookPlanOrderItemDao.selectByCreateTimeAndIsgoaAndOrderId(endTime,2,igtOnHookPlanOrderItem.getOrderId());
        IgtOnHookPlanOrderItem igtOld = igtOnHookPlanOrderItemDao.selectByCreateTimeAndIsgoaAndOrderId(
                igtOnHookPlanOrderItem.getId(),2,igtOnHookPlanOrderItem.getOrderId());
        if(ObjectUtil.isNotEmpty(igtOld)){
            totalAmount = igtOnHookPlanOrderItemDao.selectTotalAmountByIDAndOrderId(igtOld.getId(),
                    igtOnHookPlanOrderItem.getId(),igtOnHookPlanOrderItem.getOrderId());