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/resources/mapper/dapp/IgtOnHookPlanOrderItemDao.xml                    |    2 +-
 src/main/java/cc/mrbird/febs/dapp/service/impl/ApiIgtOnHookPlanServiceImpl.java |    3 +--
 src/main/java/cc/mrbird/febs/dapp/mapper/IgtOnHookPlanOrderItemDao.java         |    2 +-
 3 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/main/java/cc/mrbird/febs/dapp/mapper/IgtOnHookPlanOrderItemDao.java b/src/main/java/cc/mrbird/febs/dapp/mapper/IgtOnHookPlanOrderItemDao.java
index aa147f0..47ecfa8 100644
--- a/src/main/java/cc/mrbird/febs/dapp/mapper/IgtOnHookPlanOrderItemDao.java
+++ b/src/main/java/cc/mrbird/febs/dapp/mapper/IgtOnHookPlanOrderItemDao.java
@@ -29,7 +29,7 @@
 
     Long selectByIsgoalAndOrderId(@Param("isGoal")int i, @Param("orderId")Long orderId);
 
-    IgtOnHookPlanOrderItem selectByCreateTimeAndIsgoaAndOrderId(@Param("endTime")Date endTime, @Param("isGoal")int i, @Param("orderId")Long orderId);
+    IgtOnHookPlanOrderItem selectByCreateTimeAndIsgoaAndOrderId(@Param("id")Long id, @Param("isGoal")int i, @Param("orderId")Long orderId);
 
     IgtOnHookPlanOrderItem selectOneByIgtIdAndMemberId(@Param("orderId") Long orderId, @Param("memberId")Long memberId);
 
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 b7682e8..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,10 +390,9 @@
 
                                 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());
diff --git a/src/main/resources/mapper/dapp/IgtOnHookPlanOrderItemDao.xml b/src/main/resources/mapper/dapp/IgtOnHookPlanOrderItemDao.xml
index 6d95d97..145c095 100644
--- a/src/main/resources/mapper/dapp/IgtOnHookPlanOrderItemDao.xml
+++ b/src/main/resources/mapper/dapp/IgtOnHookPlanOrderItemDao.xml
@@ -89,7 +89,7 @@
         FROM igt_on_hook_plan_order_item a
         where a.order_id = #{orderId}
           and a.is_goal = #{isGoal}
-          and a.create_time &lt; #{endTime}
+          and a.id &lt; #{id}
         order by a.id desc
         limit 1
     </select>

--
Gitblit v1.9.1