xiaoyong931011
2022-10-30 e1492349639179900654ce2b2e387cc9d385193f
src/main/java/cc/mrbird/febs/job/OnHookPlanJob.java
@@ -206,6 +206,11 @@
                    DataDictionaryCustom dataDictionaryCustom = dataDictionaryCustomMapper.selectDicDataByTypeAndCodeAndDesc(
                            DataDictionaryEnum.PLAN_A.getType(),
                            Integer.toString(Integer.parseInt(plan)+1));
                    if(ObjectUtil.isEmpty(dataDictionaryCustom)){
                        igtOnHookPlanOrder.setState(3);
                        igtOnHookPlanOrderDao.updateById(igtOnHookPlanOrder);
                        return;
                    }
                    String dataDictionaryCustomValue = dataDictionaryCustom.getValue();
                    JSONObject levelMemberValueParse = JSONUtil.parseObj(dataDictionaryCustomValue);
                    BigDecimal amountPlanA = new BigDecimal(levelMemberValueParse.get("amount").toString())
@@ -238,10 +243,14 @@
                        igtOnHookPlanOrderItemDao.insert(igtOnHookPlanOrderItem);
                        if(2 == igtOnHookPlanOrderItem.getIsGoal()){
                            //返还两次中奖之间的本金
                            Date startTime = igtOnHookPlanOrderItemsOld.get(0).getCreateTime();
                            Date endTime = igtOnHookPlanOrderItem.getCreateTime();
                            Date startTime = null;
                            //返回上次中奖的记录
                            IgtOnHookPlanOrderItem igtOld = igtOnHookPlanOrderItemDao.selectByCreateTimeAndIsgoaAndOrderId(endTime,2,igtOnHookPlanOrder.getId());
                            if(ObjectUtil.isNotEmpty(igtOld)){
                                startTime = igtOld.getCreateTime();
                            }
                            BigDecimal totalAmount = igtOnHookPlanOrderItemDao.selectTotalAmountByCreateTimeAndOrderId(startTime,endTime,igtOnHookPlanOrder.getId());
                            //如果中奖,增加挂机主表的挂机总收益,返还两次中奖之间的本金
                            igtOnHookPlanOrderDao.AddProfitById(igtOnHookPlanOrder.getId()