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 | 69 ++++++++++++++++++++++------------
1 files changed, 45 insertions(+), 24 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 55bb1e4..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;
/**
* 直推收益
@@ -74,11 +75,16 @@
// 非代理推代理，非代理上级拿的收益比例
DataDictionaryCustom indirectPerDic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(DataDictionaryEnum.UNAGENT_TO_AGENT_PARENT.getType(), DataDictionaryEnum.UNAGENT_TO_AGENT_PARENT.getCode());
+
+ // 非代理推代理，非代理上级拿的收益比例
+ DataDictionaryCustom indirectPerTwoDic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(DataDictionaryEnum.UNAGENT_TO_AGENT_PARENT_TWO.getType(), DataDictionaryEnum.UNAGENT_TO_AGENT_PARENT_TWO.getCode());
+
+
// 非代理推代理，非代理的直推收益比例
DataDictionaryCustom unAgentDirectDic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(DataDictionaryEnum.UNAGENT_TO_AGENT.getType(), DataDictionaryEnum.UNAGENT_TO_AGENT.getCode());
- // 父级会员直推人数
- Integer directCnt = mallMemberMapper.selectOwnCntByInviteIdAndAccountLevel(parentMember.getInviteId(), parentMember.getAccountLevel());
+ // 父级需要拥有 此会员 对应级别的直推数量
+ Integer directCnt = mallMemberMapper.selectOwnCntByInviteIdAndAccountLevel(parentMember.getInviteId(), member.getAccountLevel());
List<DataDictionaryCustom> dataDices = dataDictionaryCustomMapper.selectDicByType(DataDictionaryEnum.DIRECT_BONUS_SETTING.getType());
directCnt = directCnt == null ? 0 : directCnt;
@@ -92,8 +98,8 @@
DataDictionaryCustom indrectDicPropDic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(DataDictionaryEnum.RECOMMEND_BONUS.getType(), DataDictionaryEnum.RECOMMEND_BONUS.getCode());
for (MallOrderItem item : items) {
- // 减去成本后算收益
- BigDecimal amount = item.getPrice().subtract(item.getCostPrice()).multiply(BigDecimal.valueOf(item.getCnt()));
+ // 减去成本后算收益 减去积分付款
+ BigDecimal amount = item.getPrice().subtract(item.getCostPrice()).multiply(BigDecimal.valueOf(item.getCnt())).subtract(orderInfo.getScoreAmount());
if (amount.compareTo(BigDecimal.ZERO) < 1) {
continue;
}
@@ -110,8 +116,12 @@
} else {
// 判断上级是否与自己购买的套餐符合，若符合则走3级直推逻辑，若不符合则另外一个
- if (parentMember.getAccountLevel().equals(item.getGoodsLevel()) || AccountLevelEnums.VIP.getLevel().equals(parentMember.getAccountLevel())) {
+ // 非代理推代理/非股东推股东
+ 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")) {
@@ -119,15 +129,12 @@
}
}
isSameLevel = 1;
- // 非代理推代理/非股东推股东
- } else {
- profitPer = new BigDecimal(unAgentDirectDic.getValue());
- isSameLevel = 2;
}
}
// 直推奖
BigDecimal profit = amount.multiply(profitPer.divide(new BigDecimal(100), 2, RoundingMode.HALF_UP));
+ log.info("直推奖励:{}", profit);
changeScoreAndCommission(parentMember.getId(), profit, MoneyFlowTypeEnum.DIRECT_BONUS.getValue(), orderInfo.getOrderNo());
// 非代理推代理
@@ -136,18 +143,23 @@
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;
}
- BigDecimal doubleParentProfit = profit.multiply(new BigDecimal(indirectPerDic.getValue()));
+ if (index == 2) {
+ indirectPerDic = indirectPerTwoDic;
+ }
+ 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++;
}
}
// ----- 直推奖 end -------
@@ -158,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;
}
@@ -183,8 +195,8 @@
continue;
}
- walletService.add(direct, parent.getId(), "commission");
- moneyFlowService.addMoneyFlow(parent.getId(), direct, MoneyFlowTypeEnum.RECOMMEND_BONUS.getValue(), orderInfo.getOrderNo(), FlowTypeEnum.COMMISSION.getValue());
+ walletService.add(direct, parent.getId(), "balance");
+ moneyFlowService.addMoneyFlow(parent.getId(), direct, MoneyFlowTypeEnum.RECOMMEND_BONUS.getValue(), orderInfo.getOrderNo(), FlowTypeEnum.BALANCE.getValue());
moneyFlowService.addMoneyFlow(parent.getId(), direct.negate(), MoneyFlowTypeEnum.RECOMMEND_BONUS.getValue(), orderInfo.getOrderNo(), FlowTypeEnum.SCORE.getValue());
}
// =======隔代奖== end =====
@@ -330,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);
@@ -346,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);
@@ -365,8 +384,8 @@
}
income = map.get("amount");
- walletService.add(income, memberId, "commission");
- moneyFlowService.addMoneyFlow(memberId, income, type, orderNo, FlowTypeEnum.COMMISSION.getValue());
+ walletService.add(income, memberId, "balance");
+ moneyFlowService.addMoneyFlow(memberId, income, type, orderNo, FlowTypeEnum.BALANCE.getValue());
moneyFlowService.addMoneyFlow(memberId, income.negate(), type, orderNo, FlowTypeEnum.SCORE.getValue());
return income;
}
@@ -422,7 +441,7 @@
}
memberList.add(item);
- levelMemberMap.put(item.getLevel(), memberList);
+ levelMemberMap.put(level, memberList);
});
if (levelMemberMap.isEmpty()) {
@@ -446,7 +465,9 @@
totalBonus = totalBonus.add(levelBonus);
}
- changeSystemBonus(totalBonus, null, null);
+ changeSystemBonus(totalBonus.negate(), null, null);
+
+ bonusRecord(totalBonus, 1, null, null);
log.info("###全网分红执行--end--###");
}
@@ -483,7 +504,7 @@
BigDecimal hundred = new BigDecimal(100);
for (MallOrderItem item : items) {
// 减去成本后算收益
- BigDecimal amount = item.getPrice().subtract(item.getCostPrice()).multiply(BigDecimal.valueOf(item.getCnt()));
+ BigDecimal amount = item.getPrice().subtract(item.getCostPrice()).multiply(BigDecimal.valueOf(item.getCnt())).subtract(orderInfo.getScoreAmount());
if (amount.compareTo(BigDecimal.ZERO) < 1) {
continue;
}
--
Gitblit v1.9.1