From 672316e653a0cda94537e5e390ff604dde14ef53 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Mon, 31 Oct 2022 14:20:14 +0800
Subject: [PATCH] 20221021

---
 src/main/java/cc/mrbird/febs/dapp/service/impl/ApiIgtOnHookPlanServiceImpl.java |   10 +++++-----
 1 files changed, 5 insertions(+), 5 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 3cb9ffa..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,16 +390,16 @@
 
                                 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,igtOnHookPlanOrderItem.getOrderId());
                                     if(ObjectUtil.isNotEmpty(igtOld)){
                                         totalAmount = igtOnHookPlanOrderItemDao.selectTotalAmountByIDAndOrderId(igtOld.getId(),
                                                 igtOnHookPlanOrderItem.getId(),igtOnHookPlanOrderItem.getOrderId());
                                     }else{
-                                        totalAmount = igtOnHookPlanOrderItemDao.selectTotalAmountByIDAndOrderId(igtOld.getId(),
-                                                null,igtOnHookPlanOrderItem.getOrderId());
+                                        totalAmount = igtOnHookPlanOrderItemDao.selectTotalAmountByIDAndOrderId(null,
+                                                igtOnHookPlanOrderItem.getId(),igtOnHookPlanOrderItem.getOrderId());
                                     }
                                     //如果中奖,增加挂机主表的挂机总收益,返还两次中奖之间的本金
                                     igtOnHookPlanOrderDao.AddProfitById(igtOnHookPlanOrder.getId()

--
Gitblit v1.9.1