From 4c89be40d38fac27f321dcb0c1c896cf6b5992c7 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Sun, 30 Oct 2022 00:16:27 +0800
Subject: [PATCH] 20221021

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

diff --git a/src/main/java/cc/mrbird/febs/job/OnHookPlanJob.java b/src/main/java/cc/mrbird/febs/job/OnHookPlanJob.java
index 45a3f81..3abb8a5 100644
--- a/src/main/java/cc/mrbird/febs/job/OnHookPlanJob.java
+++ b/src/main/java/cc/mrbird/febs/job/OnHookPlanJob.java
@@ -238,10 +238,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()

--
Gitblit v1.9.1