From 7cd5e4d9e5450aaf5617a1e69c14ceefb55c011b Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Thu, 24 Nov 2022 10:47:50 +0800
Subject: [PATCH] 20221117 挂机极差，以自己的等级为基准
---
src/main/resources/templates/febs/views/dapp/member.html | 3 ++-
src/main/resources/templates/febs/views/walletCoin/transferInsideList.html | 2 +-
src/main/java/cc/mrbird/febs/dapp/service/impl/ApiIgtOnHookPlanServiceImpl.java | 18 +++++++++++-------
3 files changed, 14 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 cbf66ad..5e7f173 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
@@ -195,7 +195,9 @@
//根据上下级，筛选用户的级别
ArrayList<String> refererIdLisstUp = new ArrayList<>();
- String levelNext = MemberLevelEnum.LEVEL_MB.getType();
+// String levelNext = MemberLevelEnum.LEVEL_MB.getType();
+ //自己挂机，初始级别即当前挂机人的级别
+ String levelNext = dappMemberEntity.getIdentity();
for(String inviteId : refererIdList){
DappMemberEntity dappMemberUp = dappMemberDao.selectMemberInfoByInviteId(inviteId);
String identityUp = dappMemberUp.getIdentity();
@@ -206,8 +208,8 @@
}
}
//生成流水佣金和盈利分成和流水记录，返回剩余盈利
- BigDecimal profitSharingTotal = dappWalletService.updateLSYJ(refererIdLisstUp, totalProfit.multiply(new BigDecimal(0.2)),igtOnHookPlanOrder.getId());
- BigDecimal profitFlowTotal = dappWalletService.updateYLFC(refererIdLisstUp, totalProfit.multiply(new BigDecimal(0.2)),igtOnHookPlanOrder.getId());
+ BigDecimal profitSharingTotal = dappWalletService.updateLSYJ(refererIdLisstUp, totalProfit,igtOnHookPlanOrder.getId());
+ BigDecimal profitFlowTotal = dappWalletService.updateYLFC(refererIdLisstUp, totalProfit,igtOnHookPlanOrder.getId());
//平台分成
//平台拿走35%盈利分成和流水佣金剩下的全部
BigDecimal systemAdd = totalProfit.multiply(new BigDecimal(0.4)).subtract(profitSharingTotal).subtract(profitFlowTotal);
@@ -589,7 +591,9 @@
//根据上下级，筛选用户的级别
ArrayList<String> refererIdLisstUp = new ArrayList<>();
- String levelNext = MemberLevelEnum.LEVEL_MB.getType();
+// String levelNext = MemberLevelEnum.LEVEL_MB.getType();
+ //自己挂机，初始级别即当前挂机人的级别
+ String levelNext = dappMemberEntity.getIdentity();
for(String inviteId : refererIdList){
DappMemberEntity dappMemberUp = dappMemberDao.selectMemberInfoByInviteId(inviteId);
String identityUp = dappMemberUp.getIdentity();
@@ -600,10 +604,10 @@
}
}
//生成流水佣金和盈利分成和流水记录，返回剩余盈利
- BigDecimal profitSharingTotal = dappWalletService.updateLSYJ(refererIdLisstUp, totalProfit.multiply(new BigDecimal(0.2)),igtOnHookPlanOrder.getId());
- BigDecimal profitFlowTotal = dappWalletService.updateYLFC(refererIdLisstUp, totalProfit.multiply(new BigDecimal(0.2)),igtOnHookPlanOrder.getId());
+ BigDecimal profitSharingTotal = dappWalletService.updateLSYJ(refererIdLisstUp, totalProfit,igtOnHookPlanOrder.getId());
+ BigDecimal profitFlowTotal = dappWalletService.updateYLFC(refererIdLisstUp, totalProfit,igtOnHookPlanOrder.getId());
//平台分成
- //平台拿走35%盈利分成和流水佣金剩下的全部
+ //平台拿走40% - 盈利分成和流水佣金剩下的全部
BigDecimal systemAdd = totalProfit.multiply(new BigDecimal(0.4)).subtract(profitSharingTotal).subtract(profitFlowTotal);
BigDecimal systemTotal = dappWalletService.updatePTFC(memberId,systemAdd,igtOnHookPlanOrder.getId());
//个人固定拿走60%
diff --git a/src/main/resources/templates/febs/views/dapp/member.html b/src/main/resources/templates/febs/views/dapp/member.html
index 821facb..079c684 100644
--- a/src/main/resources/templates/febs/views/dapp/member.html
+++ b/src/main/resources/templates/febs/views/dapp/member.html
@@ -319,7 +319,8 @@
// {field: 'username', title: '用户名', minWidth: 120},
{title: '用户名',
templet: function (d) {
- return '<button class="layui-btn layui-btn-normal layui-btn-xs" lay-event="teamInfo" shiro:hasPermission="teamInfo:update"><span>'+d.username+'</span></button>'
+ return '<a lay-event="teamInfo" shiro:hasPermission="teamInfo:update">'+d.username+'</a>'
+ // '<button class="layui-btn layui-btn-normal layui-btn-xs" lay-event="teamInfo" shiro:hasPermission="teamInfo:update"><span>'+d.username+'</span></button>'
},minWidth: 130,align:'center'},
{field: 'identity', title: '会员',
templet: function (d) {
diff --git a/src/main/resources/templates/febs/views/walletCoin/transferInsideList.html b/src/main/resources/templates/febs/views/walletCoin/transferInsideList.html
index 6b58af9..9cabbbb 100644
--- a/src/main/resources/templates/febs/views/walletCoin/transferInsideList.html
+++ b/src/main/resources/templates/febs/views/walletCoin/transferInsideList.html
@@ -158,7 +158,7 @@
}else{
return ''
}
- }, minWidth: 300, align: 'center'},
+ }, minWidth: 380, align: 'center'},
{field: 'createTime', title: '提币时间', minWidth: 180, align: 'center'},
{title: '操作',
templet: function (d) {
--
Gitblit v1.9.1