From 49c60ab9c9cdbb131ac29de39cec8dfe30155257 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Sun, 30 Oct 2022 10:27:27 +0800
Subject: [PATCH] 20221021

---
 src/main/java/cc/mrbird/febs/dapp/service/impl/ApiIgtOnHookPlanServiceImpl.java |   10 ++++++++--
 1 files changed, 8 insertions(+), 2 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 2d1cefc..faf9c21 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
@@ -398,11 +398,17 @@
                                         startTime = igtOld.getCreateTime();
                                     }
                                     BigDecimal totalAmount = igtOnHookPlanOrderItemDao.selectTotalAmountByCreateTimeAndOrderId(startTime,endTime,igtOnHookPlanOrderItem.getOrderId());
+                                    int i = (totalAmount.add(igtOnHookPlanOrder.getAvaAmount())).compareTo(igtOnHookPlanOrder.getPlanAmount());
                                     //如果中奖,增加挂机主表的挂机总收益,返还两次中奖之间的本金
                                     igtOnHookPlanOrderDao.AddProfitById(igtOnHookPlanOrder.getId()
                                             ,igtOnHookPlanOrderItem.getProfit());
-                                    igtOnHookPlanOrderDao.addAvaAmountById(igtOnHookPlanOrder.getId()
-                                            ,totalAmount);
+                                    if(i >= 0){
+                                        igtOnHookPlanOrderDao.addAvaAmountById(igtOnHookPlanOrder.getId()
+                                                ,igtOnHookPlanOrder.getPlanAmount());
+                                    }else{
+                                        igtOnHookPlanOrderDao.addAvaAmountById(igtOnHookPlanOrder.getId()
+                                                ,totalAmount);
+                                    }
                                 }else{
                                     //如果不中奖,减少挂机剩余金额即减少本金
                                     Integer updateCount = igtOnHookPlanOrderDao.updateAvaAmountById(igtOnHookPlanOrder.getId()

--
Gitblit v1.9.1