From 509ab38451069abe074db11a303c6119e00f010a Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Mon, 05 Dec 2022 18:02:49 +0800
Subject: [PATCH] 20221130
---
src/main/java/cc/mrbird/febs/dapp/service/impl/ApiIgtOnHookPlanServiceImpl.java | 62 +++++++++++++++++++++++++++----
1 files changed, 54 insertions(+), 8 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 525328b..18477a2 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
@@ -9,6 +9,7 @@
import cc.mrbird.febs.dapp.dto.ApiStartDto;
import cc.mrbird.febs.dapp.entity.*;
import cc.mrbird.febs.dapp.enumerate.DataDictionaryEnum;
+import cc.mrbird.febs.dapp.enumerate.MemberLevelEnum;
import cc.mrbird.febs.dapp.enumerate.MemberOnHookPlanEnum;
import cc.mrbird.febs.dapp.mapper.*;
import cc.mrbird.febs.dapp.service.ApiIgtOnHookPlanService;
@@ -154,7 +155,7 @@
// BigDecimal totalProfit = igtOnHookPlanOrder.getProfit();
BigDecimal planAmount = igtOnHookPlanOrder.getPlanAmount();
// BigDecimal avaAmount = igtOnHookPlanOrder.getAvaAmount();
- //更新用户表是否正在挂机状态字段为否
+ //更新用户表是否正在挂机状态字段为结算中
DappMemberEntity dappMember = dappMemberDao.selectById(memberId);
dappMember.setIsOnHook(3);
dappMemberDao.updateById(dappMember);
@@ -174,6 +175,9 @@
long between = DateUtil.between(startTime, DateUtil.date(), DateUnit.MINUTE);
//获得总收益
BigDecimal totalProfit = minuteProfit.multiply(new BigDecimal(between));
+ if(multiply.compareTo(totalProfit) < 0){
+ totalProfit = multiply;
+ }
String refererIds = dappMemberEntity.getRefererIds();
List<String> refererIdList = StrUtil.split(refererIds, ",", -1, true, true);
@@ -188,12 +192,28 @@
// }
// }
// }
+
+ //根据上下级，筛选用户的级别
+ ArrayList<String> refererIdLisstUp = new ArrayList<>();
+// String levelNext = MemberLevelEnum.LEVEL_MB.getType();
+ //自己挂机，初始级别即当前挂机人的级别
+ String levelNext = dappMemberEntity.getIdentity();
+ for(String inviteId : refererIdList){
+ DappMemberEntity dappMemberUp = dappMemberDao.selectMemberInfoByInviteId(inviteId);
+ String identityUp = dappMemberUp.getIdentity();
+ int compareLevelResult = MemberLevelEnum.LEVEL_MB.compareLevel(identityUp, levelNext);
+ if(0 < compareLevelResult){
+ levelNext = identityUp;
+ refererIdLisstUp.add(inviteId);
+ }
+ }
//生成流水佣金和盈利分成和流水记录，返回剩余盈利
- BigDecimal profitSharingTotal = dappWalletService.updateLSYJYLFC(refererIdList, totalProfit,igtOnHookPlanOrder.getId());
- //生成流水佣金和盈利分成和流水记录，返回盈利分成和流水佣金总共分成
-// BigDecimal profitSharingTotal = dappWalletService.updateLSYJYLFC(refererIdList, totalProfit,igtOnHookPlanOrder.getId());
+ BigDecimal profitSharingTotal = dappWalletService.updateLSYJ(refererIdLisstUp, totalProfit,igtOnHookPlanOrder.getId());
+// BigDecimal profitFlowTotal = dappWalletService.updateYLFC(refererIdLisstUp, totalProfit,igtOnHookPlanOrder.getId());
+ BigDecimal profitFlowTotal = dappWalletService.updateYLFC(refererIdLisstUp, planAmount,igtOnHookPlanOrder.getId());
//平台分成
//平台拿走35%盈利分成和流水佣金剩下的全部
+// BigDecimal systemAdd = totalProfit.multiply(new BigDecimal(0.4)).subtract(profitSharingTotal).subtract(profitFlowTotal);
BigDecimal systemAdd = totalProfit.multiply(new BigDecimal(0.4)).subtract(profitSharingTotal);
BigDecimal systemTotal = dappWalletService.updatePTFC(memberId,systemAdd,igtOnHookPlanOrder.getId());
//个人固定拿走60%
@@ -279,7 +299,8 @@
Date date = dappOnHookAwardNow.getAwardTime();
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm");
String yyyyMMddHHMM = sdf.format(date);
- List<DappOnHookAward> dappOnHookAwards = dappOnHookAwardDao.selectInfoByByAwardTime(yyyyMMddHHMM);
+// List<DappOnHookAward> dappOnHookAwards = dappOnHookAwardDao.selectInfoByByAwardTime(yyyyMMddHHMM);
+ List<DappOnHookAward> dappOnHookAwards = dappOnHookAwardDao.selectByIdLimitTT(Long.parseLong(onHookAwardRedisId));
if(CollUtil.isNotEmpty(dappOnHookAwards)){
for(DappOnHookAward dappOnHookAward : dappOnHookAwards){
ApiAwardInfoVo apiAwardInfoVo = new ApiAwardInfoVo();
@@ -316,7 +337,9 @@
DateTime dateTime = DateUtil.offsetMinute(awardTime, 5);
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm");
String yyyyMMddHHMM = sdf.format(dateTime);
- DappOnHookAward dappOnHookAwardNext = dappOnHookAwardDao.selectByByAwardTime(yyyyMMddHHMM);
+ long onHookAwardNextId = Long.parseLong(onHookAwardRedisId) + 1;
+// DappOnHookAward dappOnHookAwardNext = dappOnHookAwardDao.selectByByAwardTime(yyyyMMddHHMM);
+ DappOnHookAward dappOnHookAwardNext = dappOnHookAwardDao.selectById(onHookAwardNextId);
//系统挂机总次数 = 时长 * 60 / 5
DataDictionaryCustom maxHoursDic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(DataDictionaryEnum.MAX_HOURS.getType(), DataDictionaryEnum.MAX_HOURS.getCode());
@@ -536,6 +559,7 @@
.multiply(new BigDecimal(0.01)).setScale(4,BigDecimal.ROUND_DOWN);
//获取收益
//获取当前用户每分钟应该获取的收益
+ //预期最大收益
BigDecimal multiply = hangingRevenueLevel.multiply(planAmount);
DataDictionaryCustom maxHoursDic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(DataDictionaryEnum.MAX_HOURS.getType(), DataDictionaryEnum.MAX_HOURS.getCode());
//挂机总时长（分钟）
@@ -547,6 +571,10 @@
long between = DateUtil.between(startTime, DateUtil.date(), DateUnit.MINUTE);
//获得总收益
BigDecimal totalProfit = minuteProfit.multiply(new BigDecimal(between)).setScale(4,BigDecimal.ROUND_DOWN);
+ if(multiply.compareTo(totalProfit) < 0){
+ totalProfit = multiply;
+ }
+
// BigDecimal totalProfit = planAmount.multiply(hangingRevenueLevel).setScale(4,BigDecimal.ROUND_DOWN);
String refererIds = dappMemberEntity.getRefererIds();
@@ -562,10 +590,28 @@
// }
// }
// }
+
+ //根据上下级，筛选用户的级别
+ ArrayList<String> refererIdLisstUp = new ArrayList<>();
+// String levelNext = MemberLevelEnum.LEVEL_MB.getType();
+ //自己挂机，初始级别即当前挂机人的级别
+ String levelNext = dappMemberEntity.getIdentity();
+ for(String inviteId : refererIdList){
+ DappMemberEntity dappMemberUp = dappMemberDao.selectMemberInfoByInviteId(inviteId);
+ String identityUp = dappMemberUp.getIdentity();
+ int compareLevelResult = MemberLevelEnum.LEVEL_MB.compareLevel(identityUp, levelNext);
+ if(0 < compareLevelResult){
+ levelNext = identityUp;
+ refererIdLisstUp.add(inviteId);
+ }
+ }
//生成流水佣金和盈利分成和流水记录，返回剩余盈利
- BigDecimal profitSharingTotal = dappWalletService.updateLSYJYLFC(refererIdList, totalProfit,igtOnHookPlanOrder.getId());
+ BigDecimal profitSharingTotal = dappWalletService.updateLSYJ(refererIdLisstUp, totalProfit,igtOnHookPlanOrder.getId());
+// BigDecimal profitFlowTotal = dappWalletService.updateYLFC(refererIdLisstUp, totalProfit,igtOnHookPlanOrder.getId());
+ BigDecimal profitFlowTotal = dappWalletService.updateYLFC(refererIdLisstUp, planAmount,igtOnHookPlanOrder.getId());
//平台分成
- //平台拿走35%盈利分成和流水佣金剩下的全部
+ //平台拿走40% - 盈利分成和流水佣金剩下的全部
+// BigDecimal systemAdd = totalProfit.multiply(new BigDecimal(0.4)).subtract(profitSharingTotal).subtract(profitFlowTotal);
BigDecimal systemAdd = totalProfit.multiply(new BigDecimal(0.4)).subtract(profitSharingTotal);
BigDecimal systemTotal = dappWalletService.updatePTFC(memberId,systemAdd,igtOnHookPlanOrder.getId());
//个人固定拿走60%
--
Gitblit v1.9.1