From 3468c100b9ef9747f5202c412a4ecbd4789d8a5d Mon Sep 17 00:00:00 2001
From: wzy <wzy19931122ai@163.com>
Date: Mon, 31 Oct 2022 22:37:08 +0800
Subject: [PATCH] fix
---
src/main/java/cc/mrbird/febs/dapp/service/impl/ApiIgtOnHookPlanServiceImpl.java | 24 +++++++++++-------------
1 files changed, 11 insertions(+), 13 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..3017b6d 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
@@ -126,7 +126,7 @@
dappMember.setIsOnHook(1);
dappMemberDao.updateById(dappMember);
- DappAccountMoneyChangeEntity dappAccountMoneyChangeEntity = new DappAccountMoneyChangeEntity(memberId, availableAmount, balance
+ DappAccountMoneyChangeEntity dappAccountMoneyChangeEntity = new DappAccountMoneyChangeEntity(memberId, availableAmount, balance.negate()
, availableAmount.subtract(balance).setScale(2,BigDecimal.ROUND_DOWN), "挂机", 6);
dappAccountMoneyChangeDao.insert(dappAccountMoneyChangeEntity);
return new FebsResponse().success().message(MessageSourceUtils.getString("Operation_001"));
@@ -390,24 +390,22 @@
if(2 == igtOnHookPlanOrderItem.getIsGoal()){
//返还两次中奖之间的本金
- Date endTime = igtOnHookPlanOrderItem.getCreateTime();
- Date startTime = null;
+ BigDecimal totalAmount = BigDecimal.ZERO;
//返回上次中奖的记录
- IgtOnHookPlanOrderItem igtOld = igtOnHookPlanOrderItemDao.selectByCreateTimeAndIsgoaAndOrderId(endTime,2,igtOnHookPlanOrder.getId());
+ IgtOnHookPlanOrderItem igtOld = igtOnHookPlanOrderItemDao.selectByCreateTimeAndIsgoaAndOrderId(
+ igtOnHookPlanOrderItem.getId(),2,igtOnHookPlanOrderItem.getOrderId());
if(ObjectUtil.isNotEmpty(igtOld)){
- startTime = igtOld.getCreateTime();
+ totalAmount = igtOnHookPlanOrderItemDao.selectTotalAmountByIDAndOrderId(igtOld.getId(),
+ igtOnHookPlanOrderItem.getId(),igtOnHookPlanOrderItem.getOrderId());
+ }else{
+ totalAmount = igtOnHookPlanOrderItemDao.selectTotalAmountByIDAndOrderId(null,
+ igtOnHookPlanOrderItem.getId(),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