From 903d74d64f8d97f4b176d5454736c35b0268ada0 Mon Sep 17 00:00:00 2001
From: KKSU <15274802129@163.com>
Date: Tue, 31 Dec 2024 16:10:45 +0800
Subject: [PATCH] feat(mall): 为资金流列表添加来源电话字段
---
src/main/java/cc/mrbird/febs/mall/service/impl/AgentServiceImpl.java | 320 +++++++++++++++++++++++++++++++++-------------------
1 files changed, 202 insertions(+), 118 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..a939650 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,34 +1,36 @@
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.common.enumerates.RunVipDataDictionaryEnum;
+import cc.mrbird.febs.common.enumerates.YesOrNoEnum;
+import cc.mrbird.febs.mall.dto.ApiMemberChargeFailDto;
import cc.mrbird.febs.mall.entity.AgentInfo;
import cc.mrbird.febs.mall.entity.DataDictionaryCustom;
+import cc.mrbird.febs.mall.entity.MallCharge;
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.MallChargeMapper;
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.RunVipMapper;
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.rabbit.producter.AgentProducer;
import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.date.DateUtil;
+import cn.hutool.core.util.ObjectUtil;
import cn.hutool.core.util.StrUtil;
import com.alibaba.fastjson.JSONObject;
-import jdk.nashorn.internal.ir.IfNode;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
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;
+import java.util.Set;
+import java.util.stream.Collectors;
/**
* @author wzy
@@ -40,54 +42,70 @@
public class AgentServiceImpl implements IAgentService {
private final DataDictionaryCustomMapper dataDictionaryCustomMapper;
- private final MallMemberMapper memberMapper;
- private final MallOrderInfoMapper orderInfoMapper;
- private final IApiMallMemberWalletService memberWalletService;
- private final IApiMallMemberService memberService;
+ private final MallMemberMapper mallMemberMapper;
+ private final MallChargeMapper mallChargeMapper;
+ private final RunVipMapper runVipMapper;
+ private final IApiMallMemberWalletService walletService;
+ private final IApiMallMemberService mallMemberService;
+ private final AgentProducer agentProducer;
@Override
@Transactional(rollbackFor = Exception.class)
public void autoUpAgentLevel(Long memberId) {
- MallMember member = memberMapper.selectById(memberId);
+ MallMember member = mallMemberMapper.selectById(memberId);
if(StrUtil.isBlank(member.getReferrerIds())) {
return;
}
List<String> ids = StrUtil.split(member.getReferrerIds(), ',');
- List<MallMember> parentMembers = memberMapper.selectByInviteIds(ids);
+ List<MallMember> parentMembers = mallMemberMapper.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());
- memberMapper.updateById(parent);
+ mallMemberMapper.updateById(parent);
}
}
/**
- * 判断用户直推下单数量或团队下单数量是否达标
+ * 判断直推人数是否达标
*
+ * @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 = mallMemberMapper.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,12 +115,12 @@
* @return
*/
private boolean agentCntFinish(MallMember member, AgentInfo agentInfo) {
- if (agentInfo.getLastCnt() == null) {
+ if (agentInfo.getLastAgentCnt() == null || agentInfo.getLastAgentCnt() == 0) {
return true;
}
// 直推用户
- List<MallMember> directMember = memberMapper.selectByRefererId(member.getInviteId());
+ List<MallMember> directMember = mallMemberMapper.selectByRefererId(member.getInviteId());
if (CollUtil.isEmpty(directMember)) {
return false;
}
@@ -110,128 +128,194 @@
// 用户团队达到指定代理数量，且都不在同一条线
int i = 0;
for (MallMember child : directMember) {
- List<MallMember> mallMembers = memberMapper.selectChildAgentList(child.getInviteId(), member.getLevel());
+ List<MallMember> mallMembers = mallMemberMapper.selectChildAgentList(child.getInviteId(), member.getLevel());
if (CollUtil.isNotEmpty(mallMembers)) {
i++;
}
}
- 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 agentInfo
+ * @return
+ */
+ private boolean teamIncome(MallMember member, AgentInfo agentInfo) {
+ BigDecimal totalIncome = mallMemberMapper.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())) {
+ @Override
+ public void rankReturnMoney(Long orderId) {
+
+ }
+
+ @Override
+ public void sendMemberChargeFailMsg(ApiMemberChargeFailDto apiMemberChargeFailDto) {
+ // 获取充值订单ID
+ Long chargeId = apiMemberChargeFailDto.getChargeId();
+
+ // 根据充值订单ID查询充值订单信息
+ MallCharge mallCharge = mallChargeMapper.selectById(chargeId);
+
+ // 如果查询不到充值订单信息，则直接返回
+ if(ObjectUtil.isEmpty(mallCharge)){
return;
}
- // 直推奖励
- directReturnMoney(member, orderInfo);
- // 团队奖励
- teamReturnMoney(member, orderInfo);
+ // 获取充值订单的状态
+ Integer state = mallCharge.getState();
+
+ // 如果充值订单状态不是正在进行中，则直接返回
+ if(YesOrNoEnum.ING.getValue() != state){
+ return;
+ }
+
+ // 更新充值订单状态为失败
+ mallCharge.setState(YesOrNoEnum.NO.getValue());
+
+ // 更新数据库中的充值订单信息
+ mallChargeMapper.updateById(mallCharge);
}
/**
- * 直推奖励
- * @param member
+ * 购买会员看你的上级和上上级是否满足升级节点的条件
+ * 直推 10人
+ * 团队 50人
+ * 团队总业绩 10000
+ * 满足以上三个条件
+ * 更新升级节点的时间
*/
- private void directReturnMoney(MallMember member, MallOrderInfo orderInfo) {
- MallMember parent = memberMapper.selectInfoByInviteId(member.getReferrerId());
- if (AgentLevelEnum.FIRST_LEVEL.name().equals(parent.getLevel())) {
- return;
- }
-
- 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;
+ private void NodeUp(Long memberId,Integer directCnt,Integer teamCnt,BigDecimal achieveCnt){
+ try {
+ // 获取会员信息
+ MallMember mallMember = mallMemberMapper.selectById(memberId);
+ if (mallMember == null) {
+ throw new IllegalArgumentException("会员不存在");
}
- 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());
+ // 已经是节点则跳过
+ if (YesOrNoEnum.YES.getValue() == mallMember.getDirector()) {
+ return;
}
- amount.put(mallMember.getId(), returnMoney);
- needReturn.put(level, amount);
- }
+ // 获取直推成员和团队成员
+ List<MallMember> allMembers = mallMemberMapper.selectList(
+ new LambdaQueryWrapper<MallMember>()
+ .eq(MallMember::getReferrerId, mallMember.getInviteId())
+ .or()
+ .in(MallMember::getReferrerId, mallMemberMapper.selectList(
+ new LambdaQueryWrapper<MallMember>()
+ .eq(MallMember::getReferrerId, mallMember.getInviteId())
+ ).stream()
+ .map(MallMember::getInviteId)
+ .collect(Collectors.toSet()))
+ );
- 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);
+ if (allMembers == null || allMembers.isEmpty()) {
+ return;
}
+
+ // 检查直推人数
+ long directCount = allMembers.stream()
+ .filter(member -> mallMember.getInviteId().equals(member.getReferrerId()))
+ .count();
+ if (directCount < directCnt) {
+ return;
+ }
+
+ // 检查团队人数
+ if (allMembers.size() < teamCnt) {
+ return;
+ }
+
+ // 获取团队业绩(不包含本人业绩)
+ Set<Long> memberIds = allMembers.stream()
+ .map(MallMember::getId)
+ .collect(Collectors.toSet());
+
+ List<MallCharge> mallCharges = mallChargeMapper.selectList(
+ new LambdaQueryWrapper<MallCharge>()
+ .in(MallCharge::getMemberId, memberIds)
+ .eq(MallCharge::getState, YesOrNoEnum.YES.getValue())
+ );
+
+ BigDecimal totalCharge = mallCharges.stream()
+ .map(MallCharge::getAmount)
+ .reduce(BigDecimal.ZERO, BigDecimal::add);
+
+ if (totalCharge.compareTo(achieveCnt) < 0) {
+ return;
+ }
+
+ mallMember.setDirector(YesOrNoEnum.YES.getValue());
+ mallMember.setDirectorTime(DateUtil.date());
+ mallMemberMapper.updateById(mallMember);
+ } catch (Exception e) {
+ // 记录日志并处理异常
+ log.error("会员升级节点失败: {}", memberId, e);
+ throw new RuntimeException("会员升级节点失败", e);
}
}
+ @Override
+ public void buyVipSuccessMsg(Long chargeId) {
+ MallCharge mallCharge = mallChargeMapper.selectById(chargeId);
+ //更新会员的等级和会员升级的时间
+ Long memberId = mallCharge.getMemberId();
+ String vipCode = mallCharge.getVipCode();
+ mallMemberMapper.updateVipLevelTimeAndLevel(memberId,DateUtil.date(),vipCode);
- private AgentInfo getAgentInfo(String level) {
- DataDictionaryCustom dic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(AppContants.AGENT_LEVEL_REQUIRE, level);
- if (dic == null) {
- log.info("当前用户父级等级:{}", level);
- return null;
+ agentProducer.sendNodeUpMsg(memberId);
+ }
+
+ @Override
+ public void nodeUpMsg(Long memberId) {
+ DataDictionaryCustom directCntDic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(
+ RunVipDataDictionaryEnum.NODE_DIRECT_CNT.getType(),
+ RunVipDataDictionaryEnum.NODE_DIRECT_CNT.getCode());
+ Integer directCnt = Integer.parseInt(directCntDic.getValue());
+ DataDictionaryCustom teamCntDic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(
+ RunVipDataDictionaryEnum.NODE_TEAM_CNT.getType(),
+ RunVipDataDictionaryEnum.NODE_TEAM_CNT.getCode());
+ Integer teamCnt = Integer.parseInt(teamCntDic.getValue());
+ DataDictionaryCustom achieveCntDic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(
+ RunVipDataDictionaryEnum.NODE_ACHIEVE_CNT.getType(),
+ RunVipDataDictionaryEnum.NODE_ACHIEVE_CNT.getCode());
+ BigDecimal achieveCnt = new BigDecimal(achieveCntDic.getValue());
+
+ MallMember mallMember = mallMemberMapper.selectById(memberId);
+ if(StrUtil.isEmpty(mallMember.getReferrerId())){
+ return;
}
+ //上级
+ MallMember parentMember = mallMemberMapper.selectInfoByInviteId(mallMember.getReferrerId());
+ NodeUp(parentMember.getId(),directCnt,teamCnt,achieveCnt);
- return JSONObject.parseObject(dic.getValue(), AgentInfo.class);
+ if(StrUtil.isEmpty(parentMember.getReferrerId())){
+ return;
+ }
+ //上上级
+ MallMember graMember = mallMemberMapper.selectInfoByInviteId(parentMember.getReferrerId());
+ NodeUp(graMember.getId(),directCnt,teamCnt,achieveCnt);
}
}
--
Gitblit v1.9.1