From e1492349639179900654ce2b2e387cc9d385193f Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Sun, 30 Oct 2022 02:39:23 +0800
Subject: [PATCH] 20221021

---
 src/main/java/cc/mrbird/febs/job/OnHookPlanJob.java |    7 +++++++
 1 files changed, 7 insertions(+), 0 deletions(-)

diff --git a/src/main/java/cc/mrbird/febs/job/OnHookPlanJob.java b/src/main/java/cc/mrbird/febs/job/OnHookPlanJob.java
index 2538e97..f1404fe 100644
--- a/src/main/java/cc/mrbird/febs/job/OnHookPlanJob.java
+++ b/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())
@@ -248,6 +253,8 @@
                             }
                             BigDecimal totalAmount = igtOnHookPlanOrderItemDao.selectTotalAmountByCreateTimeAndOrderId(startTime,endTime,igtOnHookPlanOrder.getId());
                             //如果中奖,增加挂机主表的挂机总收益,返还两次中奖之间的本金
+                            igtOnHookPlanOrderDao.AddProfitById(igtOnHookPlanOrder.getId()
+                                    ,igtOnHookPlanOrderItem.getProfit());
                             igtOnHookPlanOrderDao.addAvaAmountById(igtOnHookPlanOrder.getId()
                                     ,totalAmount);
                         }else{

--
Gitblit v1.9.1