From 0eb89737650e091c0f377732beb761cbd6d8e577 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Fri, 27 May 2022 15:17:26 +0800
Subject: [PATCH] fix
---
src/main/java/cc/mrbird/febs/mall/service/impl/MemberProfitServiceImpl.java | 37 +++++++++++++++++++++++++------------
1 files changed, 25 insertions(+), 12 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 7fab9d0..2392be0 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
@@ -107,18 +107,27 @@
if (StrUtil.isBlank(member.getReferrerId())) {
return;
}
+ // 直推奖励字典
DataDictionaryCustom dic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(DataDictionaryEnum.DYNAMIC_BONUS.getType(), DataDictionaryEnum.DYNAMIC_BONUS.getCode());
+ // 隔代字典
DataDictionaryCustom indrectDic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(DataDictionaryEnum.INDRECT_BONUS.getType(), DataDictionaryEnum.INDRECT_BONUS.getCode());
- String parent = member.getReferrerId();
+ // 直接父级
+ MallMember parent = mallMemberMapper.selectInfoByInviteId(member.getReferrerId());
+
List<MallOrderItem> items = mallOrderInfoMapper.getMallOrderItemByOrderId(orderId);
for (MallOrderItem item : items) {
// 减去成本后算收益
BigDecimal amount = item.getPrice().subtract(item.getCostPrice()).multiply(BigDecimal.valueOf(item.getCnt()));
+ // 直接奖励收益
BigDecimal dynamicProfit = amount.divide(new BigDecimal(dic.getValue()), 2, RoundingMode.HALF_UP);
- List<String> parents = StrUtil.split(member.getReferrerIds(), ',');
+ if (StrUtil.isBlank(parent.getReferrerId())) {
+ continue;
+ }
+
+ List<String> parents = StrUtil.split(parent.getReferrerIds(), ',');
List<MallMember> members = mallMemberMapper.selectByInviteIds(parents);
if (CollUtil.isEmpty(members)) {
return;
@@ -127,11 +136,15 @@
// 隔代比例
BigDecimal indrectDicProp = new BigDecimal(indrectDic.getValue());
- // 隔代推荐奖
+ // 隔代推荐奖 收益
BigDecimal direct = dynamicProfit.divide(indrectDicProp, 2, RoundingMode.HALF_UP);
for (MallMember parentMember : members) {
- if (parent.equals(parentMember.getInviteId())) {
+ if (parent.getInviteId().equals(parentMember.getInviteId())) {
continue;
+ }
+
+ if (direct.compareTo(BigDecimal.ONE) < 1) {
+ break;
}
int reduce = walletService.reduce(direct, parentMember.getId(), "score");
@@ -140,25 +153,25 @@
}
walletService.add(direct, parentMember.getId(), "commission");
-
moneyFlowService.addMoneyFlow(parentMember.getId(), direct, MoneyFlowTypeEnum.RECOMMEND_BONUS.getValue(), orderInfo.getOrderNo(), FlowTypeEnum.COMMISSION.getValue());
moneyFlowService.addMoneyFlow(parentMember.getId(), direct.negate(), MoneyFlowTypeEnum.RECOMMEND_BONUS.getValue(), orderInfo.getOrderNo(), FlowTypeEnum.SCORE.getValue());
- if (direct.compareTo(BigDecimal.ONE) < 1) {
- break;
- }
direct = direct.divide(indrectDicProp, 2, RoundingMode.HALF_UP);
}
- int reduce = walletService.reduce(dynamicProfit, member.getId(), "score");
+ if (dynamicProfit.compareTo(BigDecimal.ZERO) < 1) {
+ continue;
+ }
+
+ int reduce = walletService.reduce(dynamicProfit, parent.getId(), "score");
if (reduce == 2) {
continue;
}
- walletService.add(dynamicProfit, member.getId(), "commission");
+ walletService.add(dynamicProfit, parent.getId(), "commission");
- moneyFlowService.addMoneyFlow(member.getId(), dynamicProfit, MoneyFlowTypeEnum.DYNAMIC_ACHIEVE.getValue(), orderInfo.getOrderNo(), FlowTypeEnum.COMMISSION.getValue());
- moneyFlowService.addMoneyFlow(member.getId(), dynamicProfit.negate(), MoneyFlowTypeEnum.DYNAMIC_ACHIEVE.getValue(), orderInfo.getOrderNo(), FlowTypeEnum.SCORE.getValue());
+ moneyFlowService.addMoneyFlow(parent.getId(), dynamicProfit, MoneyFlowTypeEnum.DYNAMIC_ACHIEVE.getValue(), orderInfo.getOrderNo(), FlowTypeEnum.COMMISSION.getValue());
+ moneyFlowService.addMoneyFlow(parent.getId(), dynamicProfit.negate(), MoneyFlowTypeEnum.DYNAMIC_ACHIEVE.getValue(), orderInfo.getOrderNo(), FlowTypeEnum.SCORE.getValue());
}
}
--
Gitblit v1.9.1