From e92fd4ee90a7296fcb2336409d128dfd1bf653f4 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Wed, 26 Oct 2022 15:01:06 +0800
Subject: [PATCH] 20221021
---
src/main/java/cc/mrbird/febs/job/OnHookPlanJob.java | 28 ++++++++++++++++++++++------
1 files changed, 22 insertions(+), 6 deletions(-)
diff --git a/src/main/java/cc/mrbird/febs/job/OnHookPlanJob.java b/src/main/java/cc/mrbird/febs/job/OnHookPlanJob.java
index 926227b..2952920 100644
--- a/src/main/java/cc/mrbird/febs/job/OnHookPlanJob.java
+++ b/src/main/java/cc/mrbird/febs/job/OnHookPlanJob.java
@@ -136,29 +136,45 @@
BigDecimal systemTotal = dappWalletService.updatePTFC(memberId,totalProfit);
totalProfit = totalProfit.subtract(profitSharingTotal).subtract(systemTotal);
+ //获取用户信息的是否盈利字段
+ DappMemberEntity dappMember = dappMemberDao.selectById(memberId);
+ Integer isProfit = dappMember.getIsProfit() == null ? 1 : dappMember.getIsProfit();
+
BigDecimal totalAmount = igtOnHookPlanOrderItemDao.selectTotalAmountByByOrderIdAndMemberIdAndState(orderId,memberId,1,1);
igtOnHookPlanOrder.setState(2);
//一次挂机剩余的全部金额
- BigDecimal totalMoney = totalAmount.add(totalProfit).add(avaAmount);
+ BigDecimal totalMoney = BigDecimal.ZERO;
+ if(isProfit == 2){
+ //设置成不盈利,只返回收益加剩余挂机总金额
+ totalMoney = totalProfit.add(avaAmount);
+ }else{
+ //设置成盈利，如果中奖，返回收益，如果没中奖，则返回本金,最后加上剩余总挂机金额
+ totalMoney = totalProfit.add(totalAmount).add(avaAmount);
+ }
if(totalMoney.compareTo(planAmount)<=0){
igtOnHookPlanOrder.setProfitState(2);
}else{
igtOnHookPlanOrder.setProfitState(1);
}
- igtOnHookPlanOrder.setPlanAmount(totalProfit);
+ igtOnHookPlanOrder.setProfit(totalProfit);
igtOnHookPlanOrderDao.updateById(igtOnHookPlanOrder);
dappMemberEntity.setIsOnHook(3);
dappMemberDao.updateById(dappMemberEntity);
DappWalletCoinEntity dappWalletCoinEntity = dappWalletCoinDao.selectByMemberId(memberId);
BigDecimal availableAmount = dappWalletCoinEntity.getAvailableAmount();
-
- //如果中奖，返回收益，如果没中奖，则返回本金,最后加上剩余总挂机金额
- BigDecimal total = totalProfit.add(totalAmount).add(igtOnHookPlanOrder.getAvaAmount()).setScale(4, BigDecimal.ROUND_DOWN);
+ 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);
+ }
dappWalletCoinDao.addTotalAndaddAvailableById(dappWalletCoinEntity.getId(),total);
BigDecimal add = availableAmount.add(total);
- BigDecimal subtract = add.subtract(totalAmount);
+ BigDecimal subtract = add.subtract(totalProfit);
DappAccountMoneyChangeEntity dappAccountMoneyChangeEntity = new DappAccountMoneyChangeEntity(memberId, subtract, totalProfit, add, "投注盈利", 5);
dappAccountMoneyChangeDao.insert(dappAccountMoneyChangeEntity);
}
--
Gitblit v1.9.1