From 15aca237e53c5eebf51c048e2f4e57741bbfec88 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Thu, 30 Sep 2021 11:30:54 +0800
Subject: [PATCH] 20210928
---
src/main/java/cc/mrbird/febs/mall/service/impl/AgentServiceImpl.java | 50 +++++++++++++++++++++++++++++++++++---------------
1 files changed, 35 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 47820ca..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
@@ -56,19 +56,24 @@
List<String> ids = StrUtil.split(member.getReferrerIds(), ',');
List<MallMember> parentMembers = memberMapper.selectByInviteIds(ids);
for (MallMember parent : parentMembers) {
+ // 未激活用户无法升级
+ if (AgentLevelEnum.ZERO_LEVEL.name().equals(member.getLevel())) {
+ continue;
+ }
+
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());
@@ -82,12 +87,17 @@
* @return
*/
private boolean orderCntFinish(MallMember member, AgentInfo agentInfo) {
- Integer cnt = orderInfoMapper.selectCntDirectOrTeam(agentInfo.getOrderType(), member.getInviteId());
+ Integer cnt = 0;
+ if (AgentInfo.ORDER_TYPE_DIRECT.equals(agentInfo.getOrderType())) {
+ cnt = orderInfoMapper.selectCntDirect(member.getInviteId());
+ } else {
+ cnt = orderInfoMapper.selectCntDirectOrTeam(agentInfo.getOrderType(), member.getInviteId());
+ }
if (cnt >= agentInfo.getOrderCnt()) {
return true;
}
- log.info("用户{}订单未达标, 当前数量为:{},要求数量:{}, 当前等级为:{}", member.getAccount(), cnt, agentInfo.getOrderCnt(), member.getLevel());
+ log.info("用户{}订单未达标, 当前数量为:{},要求数量:{}, 当前等级为:{}", member.getPhone(), cnt, agentInfo.getOrderCnt(), member.getLevel());
return false;
}
@@ -97,7 +107,7 @@
* @return
*/
private boolean agentCntFinish(MallMember member, AgentInfo agentInfo) {
- if (agentInfo.getLastCnt() == null) {
+ if (agentInfo.getLastCnt() == null || agentInfo.getLastCnt() == 0) {
return true;
}
@@ -120,7 +130,7 @@
return true;
}
- log.info("用户:{}代理数量未达标, 当前等级:{}, 当前数量:{}, 目标数量:{}", member.getAccount(), member.getLevel(), i, agentInfo.getLastCnt());
+ log.info("用户:{}代理数量未达标, 当前等级:{}, 当前数量:{}, 目标数量:{}", member.getPhone(), member.getLevel(), i, agentInfo.getLastCnt());
return false;
}
@@ -146,16 +156,21 @@
*/
private void directReturnMoney(MallMember member, MallOrderInfo orderInfo) {
MallMember parent = memberMapper.selectInfoByInviteId(member.getReferrerId());
+ if (AgentLevelEnum.ZERO_LEVEL.name().equals(parent.getLevel())) {
+ return;
+ }
+
+ BigDecimal returnMoney;
if (AgentLevelEnum.FIRST_LEVEL.name().equals(parent.getLevel())) {
- return;
- }
+ returnMoney = BigDecimal.valueOf(0.3).multiply(orderInfo.getAmount());
+ } else {
+ AgentInfo agentInfo = getAgentInfo(parent.getLevel());
+ if (agentInfo == null) {
+ return;
+ }
- AgentInfo agentInfo = getAgentInfo(parent.getLevel());
- if (agentInfo == null) {
- return;
+ returnMoney = agentInfo.getDirectIncome().divide(BigDecimal.valueOf(100), 2,RoundingMode.DOWN).multiply(orderInfo.getAmount());
}
-
- BigDecimal 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);
@@ -167,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;
}
@@ -176,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