From f96177f4ae8a0a68164f023b86ee0b8e07fae12c Mon Sep 17 00:00:00 2001
From: wzy <wzy19931122ai@163.com>
Date: Sun, 30 Oct 2022 00:25:24 +0800
Subject: [PATCH] Merge branch 'IGT-dev' of http://120.27.238.55:7000/r/sys-dapp into IGT-dev
---
src/main/java/cc/mrbird/febs/job/OnHookPlanJob.java | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/src/main/java/cc/mrbird/febs/job/OnHookPlanJob.java b/src/main/java/cc/mrbird/febs/job/OnHookPlanJob.java
index 075389a..3abb8a5 100644
--- a/src/main/java/cc/mrbird/febs/job/OnHookPlanJob.java
+++ b/src/main/java/cc/mrbird/febs/job/OnHookPlanJob.java
@@ -242,12 +242,14 @@
Date endTime = igtOnHookPlanOrderItem.getCreateTime();
Date startTime = null;
//返回上次中奖的记录
- IgtOnHookPlanOrderItem igtOld = igtOnHookPlanOrderItemDao.selectByCreateTimeAndIsgoaAndOrderId(endTime,1,igtOnHookPlanOrder.getId());
+ 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()
+ ,igtOnHookPlanOrderItem.getProfit());
igtOnHookPlanOrderDao.addAvaAmountById(igtOnHookPlanOrder.getId()
,totalAmount);
}else{
--
Gitblit v1.9.1