From b597374d300e39dd43261c8f21bc8aa56ab5af18 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Thu, 02 Jun 2022 15:15:24 +0800
Subject: [PATCH] fix
---
src/main/java/cc/mrbird/febs/mall/service/impl/MemberProfitServiceImpl.java | 50 ++++++++++++++++++++++++++++++++++----------------
1 files changed, 34 insertions(+), 16 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 42b04dd..b2e2e65 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,10 +107,10 @@
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());
+
// 直接父级
MallMember parent = mallMemberMapper.selectInfoByInviteId(member.getReferrerId());
@@ -120,6 +120,11 @@
BigDecimal amount = item.getPrice().subtract(item.getCostPrice()).multiply(BigDecimal.valueOf(item.getCnt()));
if (amount.compareTo(BigDecimal.ZERO) < 1) {
continue;
+ }
+
+ Integer isReturn = null;
+ if (item.getIsNormal() == 1) {
+ isReturn = 2;
}
// =======直推返利== start =====
@@ -137,7 +142,7 @@
walletService.add(dynamicProfit, parent.getId(), "commission");
- moneyFlowService.addMoneyFlow(parent.getId(), dynamicProfit, MoneyFlowTypeEnum.DYNAMIC_ACHIEVE.getValue(), orderInfo.getOrderNo(), FlowTypeEnum.COMMISSION.getValue());
+ moneyFlowService.addMoneyFlow(parent.getId(), dynamicProfit, MoneyFlowTypeEnum.DYNAMIC_ACHIEVE.getValue(), orderInfo.getOrderNo(), FlowTypeEnum.COMMISSION.getValue(), isReturn);
moneyFlowService.addMoneyFlow(parent.getId(), dynamicProfit.negate(), MoneyFlowTypeEnum.DYNAMIC_ACHIEVE.getValue(), orderInfo.getOrderNo(), FlowTypeEnum.SCORE.getValue());
// =======直推返利== end =====
@@ -151,19 +156,34 @@
if (CollUtil.isEmpty(members)) {
return;
}
- // 隔代比例
- BigDecimal indrectDicProp = new BigDecimal(indrectDic.getValue());
- // 隔代推荐奖 收益
- BigDecimal direct = dynamicProfit.divide(indrectDicProp, 2, RoundingMode.HALF_UP);
-
- // direct 收益小于1，则跳出
- if (direct.compareTo(BigDecimal.ONE) < 1) {
- continue;
- }
-
+ BigDecimal direct = dynamicProfit;
for (MallMember parentMember : members) {
if (parent.getInviteId().equals(parentMember.getInviteId())) {
+ continue;
+ }
+
+ // 直推数量
+ Integer directCnt = mallMemberMapper.selectOwnCntByInviteId(member.getReferrerId());
+ List<DataDictionaryCustom> dataDices = dataDictionaryCustomMapper.selectDicByType(DataDictionaryEnum.INDIRECT_BONUS_SETTING.getType());
+
+ directCnt = directCnt == null ? 0 :directCnt;
+ // 隔代字典
+ DataDictionaryCustom indrectDic = new DataDictionaryCustom();
+ for (DataDictionaryCustom dataDic : dataDices) {
+ if (directCnt > Integer.parseInt(dataDic.getValue())) {
+ indrectDic = dataDic;
+ }
+ }
+
+ // 隔代比例
+ BigDecimal indrectDicProp = new BigDecimal(indrectDic.getValue());
+
+ // 隔代推荐奖 收益
+ direct = direct.divide(indrectDicProp, 2, RoundingMode.HALF_UP);
+
+ // direct 收益小于1，则跳出
+ if (direct.compareTo(BigDecimal.ONE) < 1) {
continue;
}
@@ -173,10 +193,8 @@
}
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, MoneyFlowTypeEnum.RECOMMEND_BONUS.getValue(), orderInfo.getOrderNo(), FlowTypeEnum.COMMISSION.getValue(), isReturn);
moneyFlowService.addMoneyFlow(parentMember.getId(), direct.negate(), MoneyFlowTypeEnum.RECOMMEND_BONUS.getValue(), orderInfo.getOrderNo(), FlowTypeEnum.SCORE.getValue());
-
- direct = direct.divide(indrectDicProp, 2, RoundingMode.HALF_UP);
}
// =======隔代奖== end =====
}
--
Gitblit v1.9.1