20221021

xiaoyong931011

2022-10-30 e2fd269da3eafdc7251317a69c6bffbf9c9fca73

 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())
@@ -246,7 +251,7 @@
                            if(ObjectUtil.isNotEmpty(igtOld)){
                                startTime = igtOld.getCreateTime();
                            }
                            BigDecimal totalAmount = igtOnHookPlanOrderItemDao.selectTotalAmountByCreateTimeAndOrderId(startTime,endTime,igtOnHookPlanOrder.getId());
                            BigDecimal totalAmount = igtOnHookPlanOrderItemDao.selectTotalAmountByCreateTimeAndOrderId(startTime,endTime,igtOnHookPlanOrderItem.getOrderId());
                            //如果中奖，增加挂机主表的挂机总收益,返还两次中奖之间的本金
                            igtOnHookPlanOrderDao.AddProfitById(igtOnHookPlanOrder.getId()
                                    ,igtOnHookPlanOrderItem.getProfit());