From 8bf923b44bbe9b45b73ddcc25df75c9c59f54e07 Mon Sep 17 00:00:00 2001
From: Hentua <wangdoubleone@gmail.com>
Date: Thu, 15 Jun 2023 11:19:44 +0800
Subject: [PATCH] fix
---
src/main/java/cc/mrbird/febs/mall/service/impl/MemberProfitServiceImpl.java | 41 ++++++++++++++++++++++++++---------------
1 files changed, 26 insertions(+), 15 deletions(-)
diff --git a/src/main/java/cc/mrbird/febs/mall/service/impl/MemberProfitServiceImpl.java b/src/main/java/cc/mrbird/febs/mall/service/impl/MemberProfitServiceImpl.java
index d6cab8e..f09832b 100644
--- a/src/main/java/cc/mrbird/febs/mall/service/impl/MemberProfitServiceImpl.java
+++ b/src/main/java/cc/mrbird/febs/mall/service/impl/MemberProfitServiceImpl.java
@@ -38,6 +38,7 @@
private final DataDictionaryCustomMapper dataDictionaryCustomMapper;
private final MallSystemSettingMapper mallSystemSettingMapper;
+ private final IAdminMallMemberService adminMallMemberService;
/**
* 直推收益
@@ -115,7 +116,12 @@
} else {
// 判断上级是否与自己购买的套餐符合，若符合则走3级直推逻辑，若不符合则另外一个
- if (parentMember.getAccountLevel() >= item.getGoodsLevel()) {
+
+ // 非代理推代理/非股东推股东
+ if (parentMember.getAccountLevel() == 1 && item.getGoodsLevel() != 1) {
+ profitPer = new BigDecimal(unAgentDirectDic.getValue());
+ isSameLevel = 2;
+ } else {
for (DataDictionaryCustom dataDic : dataDices) {
JSONObject jsonObject = JSONObject.parseObject(dataDic.getValue());
if (directCnt >= jsonObject.getInteger("pushCnt")) {
@@ -123,10 +129,6 @@
}
}
isSameLevel = 1;
- // 非代理推代理/非股东推股东
- } else {
- profitPer = new BigDecimal(unAgentDirectDic.getValue());
- isSameLevel = 2;
}
}
@@ -141,21 +143,21 @@
continue;
}
- List<MallMember> mallMembers = mallMemberMapper.selectParentMemberList(StrUtil.split(parentMember.getReferrerIds(), ','), parentMember.getReferrerId(), 2);
+ List<MallMember> mallMembers = adminMallMemberService.findParentMemberList(StrUtil.split(parentMember.getReferrerIds(), ','), 2, true);
if (CollUtil.isEmpty(mallMembers)) {
continue;
}
int index = 1;
for (MallMember mallMember : mallMembers) {
- if (!item.getGoodsLevel().equals(mallMember.getAccountLevel())) {
- break;
+ if (mallMember.getAccountLevel() == 1) {
+ continue;
}
- if (index != 2) {
+ if (index == 2) {
indirectPerDic = indirectPerTwoDic;
}
- BigDecimal doubleParentProfit = profit.multiply(new BigDecimal(indirectPerDic.getValue()));
+ BigDecimal doubleParentProfit = amount.multiply(new BigDecimal(indirectPerDic.getValue()).divide(new BigDecimal(100), 2, RoundingMode.HALF_UP));
changeScoreAndCommission(mallMember.getId(), doubleParentProfit, MoneyFlowTypeEnum.DIRECT_BONUS.getValue(), orderInfo.getOrderNo());
index++;
}
@@ -168,7 +170,7 @@
}
List<String> parents = StrUtil.split(parentMember.getReferrerIds(), ',');
- List<MallMember> members = mallMemberMapper.selectByInviteIds(parents);
+ List<MallMember> members = adminMallMemberService.findParentMemberList(parents, null, true);
if (CollUtil.isEmpty(members)) {
return;
}
@@ -340,8 +342,15 @@
return;
}
+ BigDecimal bonus = BigDecimal.ZERO;
+ if (AccountLevelEnums.VVIP.getLevel().equals(type)) {
+ bonus = systemSetting.getAgentBonus();
+ } else {
+ bonus = systemSetting.getPartnerBonus();
+ }
+
// 代理
- BigDecimal waitToBonus = systemSetting.getAgentBonus().multiply(new BigDecimal(dic.getValue()).divide(hundred, 2, RoundingMode.HALF_UP));
+ BigDecimal waitToBonus = bonus.multiply(new BigDecimal(dic.getValue()).divide(hundred, 2, RoundingMode.HALF_UP));
// 代理
List<MallMember> mallMembers = mallMemberMapper.selectAgentOrPartnetMemberList(type);
@@ -356,9 +365,9 @@
});
if (type.equals(AccountLevelEnums.VVIP.getLevel())) {
- changeSystemBonus(null, waitToBonus,null);
+ changeSystemBonus(null, waitToBonus.negate(),null);
} else {
- changeSystemBonus(null, null, waitToBonus);
+ changeSystemBonus(null, null, waitToBonus.negate());
}
bonusRecord(waitToBonus, type, null, null);
@@ -456,7 +465,9 @@
totalBonus = totalBonus.add(levelBonus);
}
- changeSystemBonus(totalBonus, null, null);
+ changeSystemBonus(totalBonus.negate(), null, null);
+
+ bonusRecord(totalBonus, 1, null, null);
log.info("###全网分红执行--end--###");
}
--
Gitblit v1.9.1