From c84de2a02892d1a4d9af628b226ee0960011fd41 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Sat, 29 Oct 2022 21:55:14 +0800
Subject: [PATCH] 20221021
---
src/main/java/cc/mrbird/febs/job/OnHookPlanJob.java | 10 ++++++----
1 files changed, 6 insertions(+), 4 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..075389a 100644
--- a/src/main/java/cc/mrbird/febs/job/OnHookPlanJob.java
+++ b/src/main/java/cc/mrbird/febs/job/OnHookPlanJob.java
@@ -238,14 +238,16 @@
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,1,igtOnHookPlanOrder.getId());
+ if(ObjectUtil.isNotEmpty(igtOld)){
+ startTime = igtOld.getCreateTime();
+ }
BigDecimal totalAmount = igtOnHookPlanOrderItemDao.selectTotalAmountByCreateTimeAndOrderId(startTime,endTime,igtOnHookPlanOrder.getId());
//如果中奖，增加挂机主表的挂机总收益,返还两次中奖之间的本金
- igtOnHookPlanOrderDao.AddProfitById(igtOnHookPlanOrder.getId()
- ,igtOnHookPlanOrderItem.getProfit());
igtOnHookPlanOrderDao.addAvaAmountById(igtOnHookPlanOrder.getId()
,totalAmount);
}else{
--
Gitblit v1.9.1