From 6f1a86a0b191285eae862f33e2a2dc61e3459186 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Sun, 30 Oct 2022 11:40:04 +0800
Subject: [PATCH] 20221021

---
 src/main/java/cc/mrbird/febs/dapp/service/impl/ApiIgtOnHookPlanServiceImpl.java |    7 +++----
 1 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/main/java/cc/mrbird/febs/dapp/service/impl/ApiIgtOnHookPlanServiceImpl.java b/src/main/java/cc/mrbird/febs/dapp/service/impl/ApiIgtOnHookPlanServiceImpl.java
index 3cb9ffa..fc01fec 100644
--- a/src/main/java/cc/mrbird/febs/dapp/service/impl/ApiIgtOnHookPlanServiceImpl.java
+++ b/src/main/java/cc/mrbird/febs/dapp/service/impl/ApiIgtOnHookPlanServiceImpl.java
@@ -390,16 +390,15 @@
 
                                 if(2 == igtOnHookPlanOrderItem.getIsGoal()){
                                     //返还两次中奖之间的本金
-                                    Date endTime = igtOnHookPlanOrderItem.getCreateTime();
                                     BigDecimal totalAmount = BigDecimal.ZERO;
                                     //返回上次中奖的记录
-                                    IgtOnHookPlanOrderItem igtOld = igtOnHookPlanOrderItemDao.selectByCreateTimeAndIsgoaAndOrderId(endTime,2,igtOnHookPlanOrder.getId());
+                                    IgtOnHookPlanOrderItem igtOld = igtOnHookPlanOrderItemDao.selectByCreateTimeAndIsgoaAndOrderId(igtOnHookPlanOrderItem.getId(),2,igtOnHookPlanOrder.getId());
                                     if(ObjectUtil.isNotEmpty(igtOld)){
                                         totalAmount = igtOnHookPlanOrderItemDao.selectTotalAmountByIDAndOrderId(igtOld.getId(),
                                                 igtOnHookPlanOrderItem.getId(),igtOnHookPlanOrderItem.getOrderId());
                                     }else{
-                                        totalAmount = igtOnHookPlanOrderItemDao.selectTotalAmountByIDAndOrderId(igtOld.getId(),
-                                                null,igtOnHookPlanOrderItem.getOrderId());
+                                        totalAmount = igtOnHookPlanOrderItemDao.selectTotalAmountByIDAndOrderId(null,
+                                                igtOnHookPlanOrderItem.getId(),igtOnHookPlanOrderItem.getOrderId());
                                     }
                                     //如果中奖,增加挂机主表的挂机总收益,返还两次中奖之间的本金
                                     igtOnHookPlanOrderDao.AddProfitById(igtOnHookPlanOrder.getId()

--
Gitblit v1.9.1