From 5b924f97d699e4d7c0175fb09125c964e29d6416 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Sun, 30 Oct 2022 10:57:29 +0800
Subject: [PATCH] 20221021
---
src/main/java/cc/mrbird/febs/dapp/service/impl/ApiIgtOnHookPlanServiceImpl.java | 18 ++++++++----------
1 files changed, 8 insertions(+), 10 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 b05e763..3cb9ffa 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
@@ -391,23 +391,21 @@
if(2 == igtOnHookPlanOrderItem.getIsGoal()){
//返还两次中奖之间的本金
Date endTime = igtOnHookPlanOrderItem.getCreateTime();
- Date startTime = null;
+ BigDecimal totalAmount = BigDecimal.ZERO;
//返回上次中奖的记录
IgtOnHookPlanOrderItem igtOld = igtOnHookPlanOrderItemDao.selectByCreateTimeAndIsgoaAndOrderId(endTime,2,igtOnHookPlanOrder.getId());
if(ObjectUtil.isNotEmpty(igtOld)){
- startTime = igtOld.getCreateTime();
+ totalAmount = igtOnHookPlanOrderItemDao.selectTotalAmountByIDAndOrderId(igtOld.getId(),
+ igtOnHookPlanOrderItem.getId(),igtOnHookPlanOrderItem.getOrderId());
+ }else{
+ totalAmount = igtOnHookPlanOrderItemDao.selectTotalAmountByIDAndOrderId(igtOld.getId(),
+ null,igtOnHookPlanOrderItem.getOrderId());
}
- BigDecimal totalAmount = igtOnHookPlanOrderItemDao.selectTotalAmountByCreateTimeAndOrderId(startTime,endTime,igtOnHookPlanOrderItem.getOrderId());
- int i = (totalAmount.add(igtOnHookPlanOrder.getAvaAmount())).compareTo(igtOnHookPlanOrder.getPlanAmount());
//如果中奖，增加挂机主表的挂机总收益,返还两次中奖之间的本金
igtOnHookPlanOrderDao.AddProfitById(igtOnHookPlanOrder.getId()
,igtOnHookPlanOrderItem.getProfit());
- if(i >= 0){
- igtOnHookPlanOrder.setAvaAmount(igtOnHookPlanOrder.getPlanAmount());
- }else{
- igtOnHookPlanOrder.setAvaAmount(totalAmount);
- }
- igtOnHookPlanOrderDao.updateById(igtOnHookPlanOrder);
+ igtOnHookPlanOrderDao.addAvaAmountById(igtOnHookPlanOrder.getId()
+ ,totalAmount);
}else{
//如果不中奖，减少挂机剩余金额即减少本金
Integer updateCount = igtOnHookPlanOrderDao.updateAvaAmountById(igtOnHookPlanOrder.getId()
--
Gitblit v1.9.1