From b8bf19375db90bf5bd409cacfe6cb066c5f2b34a Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Tue, 25 Oct 2022 00:19:56 +0800
Subject: [PATCH] 20221021
---
src/main/java/cc/mrbird/febs/dapp/service/impl/ApiIgtOnHookPlanServiceImpl.java | 15 +++++++++------
1 files changed, 9 insertions(+), 6 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 05124a7..50323ae 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
@@ -202,10 +202,6 @@
4、生成流水记录
5、更新用户表是否正在挂机状态字段为否
*/
- //更新主表为结束状态
- IgtOnHookPlanOrder igtOnHookPlanOrder = igtOnHookPlanOrderDao.selectById(orderId);
- igtOnHookPlanOrder.setState(2);
- igtOnHookPlanOrderDao.updateById(igtOnHookPlanOrder);
//删除子表中未生效的记录
QueryWrapper<IgtOnHookPlanOrderItem> objectQueryWrapper = new QueryWrapper<>();
objectQueryWrapper.eq("order_id",orderId);
@@ -218,9 +214,16 @@
String refererIds = dappMemberDao.selectById(memberId).getRefererIds();
List<String> refererIdList = StrUtil.split(refererIds, ",", -1, true, true);
//生成流水佣金和盈利分成和流水记录，返回剩余盈利
- totalProfit = dappWalletService.updateLSYJYLFC(refererIdList,totalProfit);
+ BigDecimal profitSharingTotal = dappWalletService.updateLSYJYLFC(refererIdList, totalProfit);
//平台分成，返回剩余盈利
- totalProfit = dappWalletService.updatePTFC(memberId,totalProfit);
+ BigDecimal systemTotal = dappWalletService.updatePTFC(memberId,totalProfit);
+ totalProfit = totalProfit.subtract(profitSharingTotal).subtract(systemTotal);
+
+ //更新主表为结束状态
+ IgtOnHookPlanOrder igtOnHookPlanOrder = igtOnHookPlanOrderDao.selectById(orderId);
+ igtOnHookPlanOrder.setState(2);
+ igtOnHookPlanOrder.setPlanAmount(totalProfit);
+ igtOnHookPlanOrderDao.updateById(igtOnHookPlanOrder);
//所有未中奖的本金
BigDecimal totalAmount = igtOnHookPlanOrderItemDao.selectTotalAmountByByOrderIdAndMemberIdAndState(orderId,memberId,1,1);
DappWalletCoinEntity dappWalletCoinEntity = dappWalletCoinDao.selectByMemberId(memberId);
--
Gitblit v1.9.1