From 779298eb527bce4c508ea9d1b050c4a795dddebe Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Tue, 10 May 2022 15:27:41 +0800
Subject: [PATCH] fix sign setting
---
src/main/java/cc/mrbird/febs/mall/service/impl/AgentServiceImpl.java | 40 +++++++++++++++++++++++++---------------
1 files changed, 25 insertions(+), 15 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 2f2993f..d2a96d2 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
@@ -156,19 +156,24 @@
*/
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);
+// 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;
}
@@ -185,6 +190,11 @@
Map<String, Map<Long, BigDecimal>> needReturn = new HashMap<>();
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);
@@ -205,13 +215,13 @@
amount.put(mallMember.getId(), returnMoney);
} else {
if (!AgentLevelEnum.SECOND_LEVEL.name().equals(mallMember.getLevel())) {
- amount.put(mallMember.getId(), BigDecimal.ONE);
+ // 代理两级
+ if (amount.size() >= 2) {
+ continue;
+ } else {
+ amount.put(mallMember.getId(), BigDecimal.ONE);
+ }
}
- }
-
- // 代理两级
- if (amount.size() > 2) {
- continue;
}
needReturn.put(level, amount);
@@ -225,7 +235,7 @@
for (Map.Entry<Long, BigDecimal> amount : entry.getValue().entrySet()) {
memberWalletService.addBalance(amount.getValue(), amount.getKey());
- memberService.addMoneyFlow(amount.getKey(), amount.getValue(), MoneyFlowTypeEnum.ACHIEVE.getValue(), orderInfo.getOrderNo(), null, null, orderInfo.getMemberId(), null);
+// memberService.addMoneyFlow(amount.getKey(), amount.getValue(), MoneyFlowTypeEnum.ACHIEVE.getValue(), orderInfo.getOrderNo(), null, null, orderInfo.getMemberId(), null);
}
}
}
--
Gitblit v1.9.1