From 529ad9dd8d1876b57e852bc45b602ba3ccc8df2a Mon Sep 17 00:00:00 2001
From: KKSU <15274802129@163.com>
Date: Wed, 10 Apr 2024 17:19:08 +0800
Subject: [PATCH] 公告-首页公告调整
---
src/main/java/cc/mrbird/febs/mall/service/impl/AgentServiceImpl.java | 171 ++++++++++++++++----------------------------------------
1 files changed, 49 insertions(+), 122 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 33cc37d..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
@@ -7,13 +7,11 @@
import cc.mrbird.febs.mall.entity.DataDictionaryCustom;
import cc.mrbird.febs.mall.entity.MallMember;
import cc.mrbird.febs.mall.entity.MallOrderInfo;
-import cc.mrbird.febs.mall.mapper.DataDictionaryCustomMapper;
-import cc.mrbird.febs.mall.mapper.MallMemberMapper;
-import cc.mrbird.febs.mall.mapper.MallMemberWalletMapper;
-import cc.mrbird.febs.mall.mapper.MallOrderInfoMapper;
+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;
@@ -41,9 +39,6 @@
private final DataDictionaryCustomMapper dataDictionaryCustomMapper;
private final MallMemberMapper memberMapper;
- private final MallOrderInfoMapper orderInfoMapper;
- private final IApiMallMemberWalletService memberWalletService;
- private final IApiMallMemberService memberService;
@Override
@Transactional(rollbackFor = Exception.class)
@@ -56,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());
@@ -77,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;
}
@@ -97,7 +106,7 @@
* @return
*/
private boolean agentCntFinish(MallMember member, AgentInfo agentInfo) {
- if (agentInfo.getLastCnt() == null) {
+ if (agentInfo.getLastAgentCnt() == null || agentInfo.getLastAgentCnt() == 0) {
return true;
}
@@ -116,122 +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) {
- MallOrderInfo orderInfo = orderInfoMapper.selectById(orderId);
-
- MallMember member = memberMapper.selectById(orderInfo.getMemberId());
- if (StrUtil.isBlank(member.getReferrerIds())) {
- return;
- }
-
- // 直推奖励
- directReturnMoney(member, orderInfo);
- // 团队奖励
- teamReturnMoney(member, orderInfo);
}
- /**
- * 直推奖励
- * @param member
- */
- private void directReturnMoney(MallMember member, MallOrderInfo orderInfo) {
- MallMember parent = memberMapper.selectInfoByInviteId(member.getReferrerId());
- if (AgentLevelEnum.FIRST_LEVEL.name().equals(parent.getLevel())) {
- return;
- }
+ @Override
+ public void rankReturnMoney(Long orderId) {
- AgentInfo agentInfo = getAgentInfo(parent.getLevel());
- if (agentInfo == null) {
- return;
- }
-
- BigDecimal returnMoney = agentInfo.getDirectIncome().divide(BigDecimal.valueOf(100), RoundingMode.UP).multiply(orderInfo.getAmount());
- memberWalletService.addBalance(returnMoney, parent.getId());
-
- memberService.addMoneyFlow(parent.getId(), returnMoney, MoneyFlowTypeEnum.BONUS.getValue(), orderInfo.getOrderNo(), null, null, orderInfo.getMemberId(), null);
- }
-
- /**
- * 团队奖励
- *
- */
- public void teamReturnMoney(MallMember member, MallOrderInfo orderInfo) {
- List<String> inviteIds = StrUtil.split(member.getReferrerIds(), ',');
- List<MallMember> agentList = memberMapper.selectMemberParentAgentList(inviteIds);
- if (CollUtil.isEmpty(agentList)) {
- return;
- }
-
- Map<String, Map<Long, BigDecimal>> needReturn = new HashMap<>();
- for (MallMember mallMember : agentList) {
- String level = mallMember.getLevel();
-
- Map<Long, BigDecimal> amount = needReturn.get(level);
-
- if (amount != null) {
-// amount = new HashMap<>();
-// AgentInfo agentInfo = getAgentInfo(level);
-// if (agentInfo == null) {
-// continue;
-// }
-//
-// BigDecimal returnMoney;
-// if (AgentInfo.TEAM_INCOME_TYPE_AMOUNT.equals(agentInfo.getTeamIncomeType())) {
-// returnMoney = agentInfo.getTeamIncome();
-// } else {
-// returnMoney = agentInfo.getTeamIncome().divide(BigDecimal.valueOf(100), RoundingMode.UP).multiply(orderInfo.getAmount());
-// }
-// amount.put(mallMember.getId(), returnMoney);
-
- continue;
- }
- amount = new HashMap<>();
- AgentInfo agentInfo = getAgentInfo(level);
- if (agentInfo == null) {
- continue;
- }
-
- BigDecimal returnMoney;
- if (AgentInfo.TEAM_INCOME_TYPE_AMOUNT.equals(agentInfo.getTeamIncomeType())) {
- returnMoney = agentInfo.getTeamIncome();
- } else {
- returnMoney = agentInfo.getTeamIncome().divide(BigDecimal.valueOf(100), RoundingMode.UP).multiply(orderInfo.getAmount());
- }
-
- amount.put(mallMember.getId(), returnMoney);
- needReturn.put(level, amount);
- }
-
- if(needReturn.isEmpty()) {
- return;
- }
-
- for (Map.Entry<String, Map<Long, BigDecimal>> entry : needReturn.entrySet()) {
- 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);
- }
- }
- }
-
- private AgentInfo getAgentInfo(String level) {
- DataDictionaryCustom dic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(AppContants.AGENT_LEVEL_REQUIRE, level);
- if (dic == null) {
- log.info("当前用户父级等级:{}", level);
- return null;
- }
-
- return JSONObject.parseObject(dic.getValue(), AgentInfo.class);
}
}
--
Gitblit v1.9.1