From 5274e48fdb951e007b3ffdb1e4a9fcfe84b7c72c Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Thu, 29 Sep 2022 17:57:08 +0800
Subject: [PATCH] 20220902
---
src/main/java/cc/mrbird/febs/mall/service/impl/AgentServiceImpl.java | 81 ++++++++++++++++++++++++++++++++--------
1 files changed, 65 insertions(+), 16 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 cfc8201..eb14dd2 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
@@ -1,12 +1,17 @@
package cc.mrbird.febs.mall.service.impl;
+import cc.mrbird.febs.common.enumerates.AgentLevelEnum;
+import cc.mrbird.febs.common.enumerates.MoneyFlowTypeEnum;
+import cc.mrbird.febs.common.utils.AppContants;
import cc.mrbird.febs.mall.entity.AgentInfo;
import cc.mrbird.febs.mall.entity.DataDictionaryCustom;
import cc.mrbird.febs.mall.entity.MallMember;
-import cc.mrbird.febs.mall.mapper.DataDictionaryCustomMapper;
-import cc.mrbird.febs.mall.mapper.MallMemberMapper;
-import cc.mrbird.febs.mall.mapper.MallOrderInfoMapper;
+import cc.mrbird.febs.mall.entity.MallOrderInfo;
+import cc.mrbird.febs.mall.mapper.*;
import cc.mrbird.febs.mall.service.IAgentService;
+import cc.mrbird.febs.mall.service.IApiMallMemberService;
+import cc.mrbird.febs.mall.service.IApiMallMemberWalletService;
+import cc.mrbird.febs.mall.service.IMallAchieveService;
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.util.StrUtil;
import com.alibaba.fastjson.JSONObject;
@@ -14,8 +19,14 @@
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import java.math.BigDecimal;
+import java.math.RoundingMode;
+import java.util.ArrayList;
+import java.util.HashMap;
import java.util.List;
+import java.util.Map;
/**
* @author wzy
@@ -28,9 +39,9 @@
private final DataDictionaryCustomMapper dataDictionaryCustomMapper;
private final MallMemberMapper memberMapper;
- private final MallOrderInfoMapper orderInfoMapper;
@Override
+ @Transactional(rollbackFor = Exception.class)
public void autoUpAgentLevel(Long memberId) {
MallMember member = memberMapper.selectById(memberId);
if(StrUtil.isBlank(member.getReferrerIds())) {
@@ -40,19 +51,28 @@
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;
+ if (!directMemberCnt(parent, agentInfo)) {
+ continue;
}
if (!agentCntFinish(parent, agentInfo)) {
- return;
+ continue;
+ }
+
+ if (!teamIncome(parent, agentInfo)) {
+ continue;
}
parent.setLevel(nextLevel.getCode());
@@ -61,17 +81,22 @@
}
/**
- * 判断用户直推下单数量或团队下单数量是否达标
+ * 判断直推人数是否达标
*
+ * @param member
* @return
*/
- private boolean orderCntFinish(MallMember member, AgentInfo agentInfo) {
- Integer cnt = orderInfoMapper.selectCntDirectOrTeam(agentInfo.getOrderType(), member.getInviteId());
+ private boolean directMemberCnt(MallMember member, AgentInfo agentInfo) {
+ List<MallMember> childs = memberMapper.selectByRefererId(member.getInviteId());
+ if (CollUtil.isEmpty(childs)) {
+ return false;
+ }
- if (cnt >= agentInfo.getOrderCnt()) {
+ if (childs.size() >= agentInfo.getDirectCnt()) {
return true;
}
- log.info("用户{}订单未达标, 当前数量为:{},要求数量:{}, 当前等级为:{}", member.getAccount(), cnt, agentInfo.getOrderCnt(), member.getLevel());
+
+ log.info("用户:{}直推数量未达标, 当前等级:{}, 当前数量:{}, 目标数量:{}", member.getPhone(), member.getLevel(), childs.size(), agentInfo.getLastAgentCnt());
return false;
}
@@ -81,7 +106,7 @@
* @return
*/
private boolean agentCntFinish(MallMember member, AgentInfo agentInfo) {
- if (agentInfo.getLastCnt() == null) {
+ if (agentInfo.getLastAgentCnt() == null || agentInfo.getLastAgentCnt() == 0) {
return true;
}
@@ -100,16 +125,40 @@
}
}
- if (i >= agentInfo.getLastCnt()) {
+ if (i >= agentInfo.getLastAgentCnt()) {
return true;
}
- log.info("用户:{}代理数量未达标, 当前等级:{}, 当前数量:{}, 目标数量:{}", member.getAccount(), member.getLevel(), i, agentInfo.getLastCnt());
+ log.info("用户:{}代理数量未达标, 当前等级:{}, 当前数量:{}, 目标数量:{}", member.getPhone(), member.getLevel(), i, agentInfo.getLastAgentCnt());
+ return false;
+ }
+
+ /**
+ * 团队业绩是否达标
+ *
+ * @param mallMember
+ * @param agentInfo
+ * @return
+ */
+ private boolean teamIncome(MallMember member, AgentInfo agentInfo) {
+ BigDecimal totalIncome = memberMapper.selectAchieveByMemberId(member.getInviteId(), 2);
+
+ BigDecimal targetIncome = agentInfo.getTeamIncome().multiply(new BigDecimal("10000"));
+ if (totalIncome.compareTo(targetIncome) >= 0) {
+ return true;
+ }
+
+ log.info("用户:{}团队业绩未达标, 当前等级:{}, 当前数量:{}, 目标数量:{}", member.getPhone(), member.getLevel(), totalIncome, targetIncome);
return false;
}
@Override
+ @Transactional(rollbackFor = Exception.class)
public void returnMoneyToAgent(Long orderId) {
+ }
+
+ @Override
+ public void rankReturnMoney(Long orderId) {
}
}
--
Gitblit v1.9.1