From f1474f682d2bf0ed2eeb78d94287d45844700c06 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Wed, 26 Oct 2022 15:17:30 +0800
Subject: [PATCH] 20221021

---
 src/main/java/cc/mrbird/febs/dapp/service/impl/ApiIgtOnHookPlanServiceImpl.java |   12 +++---------
 1 files changed, 3 insertions(+), 9 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 b560fc3..d63c917 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
@@ -163,7 +163,7 @@
             throw new FebsException(MessageSourceUtils.getString("login_err_003"));
         }
         //获取下一个开奖
-        String redisKey = "on_hook_award_id";
+        String redisKey = "on_hook_award_id_test";
         String onHookAwardRedisId = redisUtils.getString(redisKey);
         DappOnHookAward dappOnHookAward = dappOnHookAwardDao.selectById(Long.parseLong(onHookAwardRedisId));
         if(ObjectUtil.isEmpty(dappOnHookAward)){
@@ -254,15 +254,9 @@
 
         DappWalletCoinEntity dappWalletCoinEntity = dappWalletCoinDao.selectByMemberId(memberId);
         BigDecimal availableAmount = dappWalletCoinEntity.getAvailableAmount();
-        BigDecimal total = BigDecimal.ZERO;
-        if(isProfit == 2){
-            //设置成不盈利,只返回收益加剩余挂机总金额
-            total = totalProfit.add(igtOnHookPlanOrder.getAvaAmount()).setScale(4, BigDecimal.ROUND_DOWN);
-        }else{
-            //设置成盈利,如果中奖,返回收益,如果没中奖,则返回本金,最后加上剩余总挂机金额
+            //如果中奖,返回收益,最后加上剩余总挂机金额
 //            total = totalProfit.add(totalAmount).add(igtOnHookPlanOrder.getAvaAmount()).setScale(4, BigDecimal.ROUND_DOWN);
-            total = totalProfit.add(igtOnHookPlanOrder.getAvaAmount()).setScale(4, BigDecimal.ROUND_DOWN);
-        }
+        BigDecimal total = totalProfit.add(igtOnHookPlanOrder.getAvaAmount()).setScale(4, BigDecimal.ROUND_DOWN);
         dappWalletCoinDao.addTotalAndaddAvailableById(dappWalletCoinEntity.getId(),total);
         //生成流水记录
         BigDecimal add = availableAmount.add(total);

--
Gitblit v1.9.1