From 0b0ce2eb06961c3670f687e2274d982004dfde41 Mon Sep 17 00:00:00 2001
From: Hentua <wangdoubleone@gmail.com>
Date: Tue, 09 May 2023 09:56:03 +0800
Subject: [PATCH] fix
---
src/main/java/cc/mrbird/febs/mall/service/impl/MemberProfitServiceImpl.java | 13 ++++++++++++-
1 files changed, 12 insertions(+), 1 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 89c6fbd..d6cab8e 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
@@ -74,6 +74,11 @@
// 非代理推代理，非代理上级拿的收益比例
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());
@@ -127,6 +132,7 @@
// 直推奖
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());
// 非代理推代理
@@ -140,13 +146,18 @@
continue;
}
+ int index = 1;
for (MallMember mallMember : mallMembers) {
if (!item.getGoodsLevel().equals(mallMember.getAccountLevel())) {
break;
}
+ if (index != 2) {
+ indirectPerDic = indirectPerTwoDic;
+ }
BigDecimal doubleParentProfit = profit.multiply(new BigDecimal(indirectPerDic.getValue()));
changeScoreAndCommission(mallMember.getId(), doubleParentProfit, MoneyFlowTypeEnum.DIRECT_BONUS.getValue(), orderInfo.getOrderNo());
+ index++;
}
}
// ----- 直推奖 end -------
@@ -421,7 +432,7 @@
}
memberList.add(item);
- levelMemberMap.put(item.getLevel(), memberList);
+ levelMemberMap.put(level, memberList);
});
if (levelMemberMap.isEmpty()) {
--
Gitblit v1.9.1