From eeb68fc3ca75b5d05fe8aba2d76fb8964348bb6b Mon Sep 17 00:00:00 2001
From: KKSU <15274802129@163.com>
Date: Fri, 14 Jun 2024 09:49:11 +0800
Subject: [PATCH] 星级矩阵
---
src/main/java/cc/mrbird/febs/dapp/service/impl/DappSystemServiceImpl.java | 14 ++++++++------
1 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/src/main/java/cc/mrbird/febs/dapp/service/impl/DappSystemServiceImpl.java b/src/main/java/cc/mrbird/febs/dapp/service/impl/DappSystemServiceImpl.java
index 338eb57..59ab027 100644
--- a/src/main/java/cc/mrbird/febs/dapp/service/impl/DappSystemServiceImpl.java
+++ b/src/main/java/cc/mrbird/febs/dapp/service/impl/DappSystemServiceImpl.java
@@ -570,10 +570,11 @@
if(ObjectUtil.isEmpty(dappMemberEntityRef)){
return;
}
+
+ memberId = dappMemberEntityRef.getId();
//如果为购买星级激活用户，则跳过
Integer activeStatus = dappMemberEntityRef.getActiveStatus();
if(1 != activeStatus){
- memberId = dappMemberEntityRef.getId();
continue;
}
//获取上级全部的直推
@@ -584,7 +585,6 @@
//如果没有直推，则跳过
if(CollUtil.isEmpty(memberInviteList)){
- memberId = dappMemberEntityRef.getId();
continue;
}
@@ -594,10 +594,9 @@
}
//如果直推不满足当前规则需要的人数，则跳过
if(memberInviteList.size() < rule.getInviteNum()){
- memberId = dappMemberEntityRef.getId();
continue;
}
- BigDecimal perkPercent = new BigDecimal(rule.getPerkPercent());
+ BigDecimal perkPercent = new BigDecimal(rule.getPerkPercent()).multiply(new BigDecimal("0.01"));
BigDecimal perkAmount = perkPercent.multiply(amount);
Long perkMemberId = dappMemberEntityRef.getId();
//生成一条流水
@@ -640,7 +639,7 @@
DataDictionaryEnum.PERK_NUM.getType(),
DataDictionaryEnum.PERK_NUM.getCode()
);
- BigDecimal perKNum = new BigDecimal(ObjectUtil.isEmpty(perkPercentDic) ? "1000" : perKNumDic.getValue());
+ BigDecimal perKNum = new BigDecimal(ObjectUtil.isEmpty(perKNumDic) ? "1000" : perKNumDic.getValue());
BigDecimal perkAmount = amount.multiply(perkPercent).divide(perKNum, 8, BigDecimal.ROUND_DOWN);
if(BigDecimal.ZERO.compareTo(perkAmount) >= 0){
@@ -667,7 +666,10 @@
return;
}
//奖励金额
- BigDecimal memberPerk = perkPercent.multiply(buyNode);
+ BigDecimal memberPerk = perkAmount.multiply(buyNode);
+ if(BigDecimal.ZERO.compareTo(memberPerk) >= 0){
+ continue;
+ }
dappWalletService.updateWalletCoinWithLock(memberPerk, dappMemberEntity.getId(), 1);
DappFundFlowEntity fundFlow = new DappFundFlowEntity(
--
Gitblit v1.9.1