From 81d826f455491f18f64c4032fc07be5c6abdd009 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Wed, 29 Sep 2021 17:03:31 +0800
Subject: [PATCH] 20210928
---
src/main/java/cc/mrbird/febs/mall/service/impl/AgentServiceImpl.java | 30 ++++++++++++++++++++----------
1 files changed, 20 insertions(+), 10 deletions(-)
diff --git a/src/main/java/cc/mrbird/febs/mall/service/impl/AgentServiceImpl.java b/src/main/java/cc/mrbird/febs/mall/service/impl/AgentServiceImpl.java
index c4040e6..61bcc1e 100644
--- a/src/main/java/cc/mrbird/febs/mall/service/impl/AgentServiceImpl.java
+++ b/src/main/java/cc/mrbird/febs/mall/service/impl/AgentServiceImpl.java
@@ -64,16 +64,16 @@
DataDictionaryCustom nextLevel = dataDictionaryCustomMapper.selectNextAgentLevelInfo(parent.getLevel());
if (nextLevel == null) {
log.info("当前层级无下一级:{}", parent.getLevel());
- return;
+ continue;
}
AgentInfo agentInfo = JSONObject.parseObject(nextLevel.getValue(), AgentInfo.class);
if (!orderCntFinish(parent, agentInfo)) {
- return;
+ continue;
}
if (!agentCntFinish(parent, agentInfo)) {
- return;
+ continue;
}
parent.setLevel(nextLevel.getCode());
@@ -156,16 +156,21 @@
*/
private void directReturnMoney(MallMember member, MallOrderInfo orderInfo) {
MallMember parent = memberMapper.selectInfoByInviteId(member.getReferrerId());
- if (AgentLevelEnum.FIRST_LEVEL.name().equals(parent.getLevel()) || AgentLevelEnum.ZERO_LEVEL.name().equals(parent.getLevel())) {
+ if (AgentLevelEnum.ZERO_LEVEL.name().equals(parent.getLevel())) {
return;
}
- AgentInfo agentInfo = getAgentInfo(parent.getLevel());
- if (agentInfo == null) {
- return;
- }
+ BigDecimal returnMoney;
+ if (AgentLevelEnum.FIRST_LEVEL.name().equals(parent.getLevel())) {
+ returnMoney = BigDecimal.valueOf(0.3).multiply(orderInfo.getAmount());
+ } else {
+ AgentInfo agentInfo = getAgentInfo(parent.getLevel());
+ if (agentInfo == null) {
+ return;
+ }
- BigDecimal returnMoney = agentInfo.getDirectIncome().divide(BigDecimal.valueOf(100), 2,RoundingMode.DOWN).multiply(orderInfo.getAmount());
+ returnMoney = agentInfo.getDirectIncome().divide(BigDecimal.valueOf(100), 2,RoundingMode.DOWN).multiply(orderInfo.getAmount());
+ }
memberWalletService.addBalance(returnMoney, parent.getId());
memberService.addMoneyFlow(parent.getId(), returnMoney, MoneyFlowTypeEnum.BONUS.getValue(), orderInfo.getOrderNo(), null, null, orderInfo.getMemberId(), null);
@@ -177,7 +182,7 @@
*/
public void teamReturnMoney(MallMember member, MallOrderInfo orderInfo) {
List<String> inviteIds = StrUtil.split(member.getReferrerIds(), ',');
- List<MallMember> agentList = memberMapper.selectMemberParentAgentList(inviteIds);
+ List<MallMember> agentList = memberMapper.selectMemberParentAgentList(inviteIds, member.getReferrerId());
if (CollUtil.isEmpty(agentList)) {
return;
}
@@ -186,6 +191,11 @@
for (MallMember mallMember : agentList) {
String level = mallMember.getLevel();
+ List<MallMember> bigLevel = memberMapper.selectMallMemberByInviteIdAndLevel(mallMember.getInviteId(),level);
+ if(CollUtil.isNotEmpty(bigLevel)){
+ continue;
+ }
+
Map<Long, BigDecimal> amount = needReturn.get(level);
// 按照代理关系，返到第二级，平级奖
--
Gitblit v1.9.1