From 19c3da86d8c6adcb91baccac6981c63307e3dba1 Mon Sep 17 00:00:00 2001
From: KKSU <15274802129@163.com>
Date: Fri, 20 Dec 2024 13:01:12 +0800
Subject: [PATCH] fix(mall): 修复会员提现状态更新逻辑
---
src/main/java/cc/mrbird/febs/mall/service/impl/AgentServiceImpl.java | 289 ++++++++++++++++++++++++++++++---------------------------
1 files changed, 153 insertions(+), 136 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..ee71133 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,23 +1,23 @@
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.entity.MallOrderInfo;
+import cc.mrbird.febs.common.enumerates.*;
+import cc.mrbird.febs.common.utils.MallUtils;
+import cc.mrbird.febs.mall.dto.ApiMemberChargeFailDto;
+import cc.mrbird.febs.mall.entity.*;
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 cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.date.DateTime;
+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;
@@ -25,10 +25,7 @@
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
@@ -40,21 +37,22 @@
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;
@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())) {
@@ -68,7 +66,7 @@
}
AgentInfo agentInfo = JSONObject.parseObject(nextLevel.getValue(), AgentInfo.class);
- if (!orderCntFinish(parent, agentInfo)) {
+ if (!directMemberCnt(parent, agentInfo)) {
continue;
}
@@ -76,28 +74,32 @@
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 = 0;
- if (AgentInfo.ORDER_TYPE_DIRECT.equals(agentInfo.getOrderType())) {
- cnt = orderInfoMapper.selectCntDirect(member.getInviteId());
- } else {
- 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.getPhone(), cnt, agentInfo.getOrderCnt(), member.getLevel());
+
+ log.info("用户:{}直推数量未达标, 当前等级:{}, 当前数量:{}, 目标数量:{}", member.getPhone(), member.getLevel(), childs.size(), agentInfo.getLastAgentCnt());
return false;
}
@@ -107,12 +109,12 @@
* @return
*/
private boolean agentCntFinish(MallMember member, AgentInfo agentInfo) {
- if (agentInfo.getLastCnt() == null || agentInfo.getLastCnt() == 0) {
+ 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;
}
@@ -120,128 +122,143 @@
// 用户团队达到指定代理数量，且都不在同一条线
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.getPhone(), 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())) {
- 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()) || AgentLevelEnum.ZERO_LEVEL.name().equals(parent.getLevel())) {
- return;
- }
-
- AgentInfo agentInfo = getAgentInfo(parent.getLevel());
- if (agentInfo == null) {
- return;
- }
-
- 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);
- }
-
- /**
- * 团队奖励
- *
- */
- 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), 2, RoundingMode.DOWN).multiply(orderInfo.getAmount());
- }
- 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;
- }
-
- 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);
}
@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;
+ }
+
+ // 获取充值订单的状态
+ Integer state = mallCharge.getState();
+
+ // 如果充值订单状态不是正在进行中，则直接返回
+ if(YesOrNoEnum.ING.getValue() != state){
+ return;
+ }
+
+ // 更新充值订单状态为失败
+ mallCharge.setState(YesOrNoEnum.NO.getValue());
+
+ // 更新数据库中的充值订单信息
+ mallChargeMapper.updateById(mallCharge);
+ }
+
+ @Override
+ public void buyVipSuccessMsg(Long chargeId) {
+ MallCharge mallCharge = mallChargeMapper.selectById(chargeId);
+ //更新会员的等级和过期时间
+ Long memberId = mallCharge.getMemberId();
+ String vipCode = mallCharge.getVipCode();
+ DateTime dateTime = DateUtil.offsetMonth(DateUtil.date(), 1);
+ mallMemberMapper.updateVipLevelTimeAndLevel(memberId,dateTime,vipCode);
+
+ //购买成功后，是否返利上级
+ MallMember mallMember = mallMemberMapper.selectById(memberId);
+ if(null == mallMember.getReferrerId()){
+ return;
+ }
+
+ RunVip runVip = runVipMapper.selectOne(new LambdaQueryWrapper<RunVip>().eq(RunVip::getVipCode, vipCode));
+ BigDecimal rebatePercent = runVip.getRebatePercent();
+ BigDecimal amount = mallCharge.getAmount();
+ BigDecimal rebateAmount = amount.multiply(rebatePercent).setScale(2, RoundingMode.DOWN);
+ BigDecimal balanceToCoin =
+ new BigDecimal(
+ dataDictionaryCustomMapper.selectDicDataByTypeAndCode(
+ RunVipDataDictionaryEnum.RUN_VIP_BALANCE_TO_COIN.getType(),
+ RunVipDataDictionaryEnum.RUN_VIP_BALANCE_TO_COIN.getCode()
+ ).getValue()
+ );
+ BigDecimal rebateCoin = rebateAmount.divide(balanceToCoin, 2, RoundingMode.DOWN);
+ if(BigDecimal.ZERO.compareTo(rebateCoin) >= 0){
+ return;
+ }
+ MallMember parent = mallMemberMapper.selectInfoByInviteId(mallMember.getReferrerId());
+ if(null == parent){
+ return;
+ }
+ String orderNo = MallUtils.getOrderNum("FL");
+ if(null != parent.getReferrerId()){
+ BigDecimal rebateCoinGrandpa = rebateCoin.multiply(rebatePercent).setScale(2, RoundingMode.DOWN);
+ MallMember grandpa = mallMemberMapper.selectInfoByInviteId(parent.getReferrerId());
+ if(null != grandpa){
+ if(BigDecimal.ZERO.compareTo(rebateCoinGrandpa) < 0){
+ //返利给上上级
+ walletService.addBalance(rebateCoinGrandpa,grandpa.getId());
+ mallMemberService.runVipMoneyFlowAdd(
+ grandpa.getId(),
+ mallMember.getId(),
+ orderNo,
+ FlowTypeEnum.BALANCE.getValue(),
+ RunVipMoneyFlowTypeEnum.BUY_VIP_REBATE.getValue(),
+ rebateCoinGrandpa,
+ StrUtil.format(RunVipMoneyFlowTypeEnum.BUY_VIP_REBATE.getDescription(),mallMember.getPhone(),runVip.getVipName(),rebateCoinGrandpa),
+ YesOrNoEnum.YES.getValue()
+ );
+ rebateCoin = rebateCoin.subtract(rebateCoinGrandpa).setScale(2, RoundingMode.DOWN);
+ }
+ }
+ }
+ //返利给上级
+ walletService.addBalance(rebateCoin,parent.getId());
+ mallMemberService.runVipMoneyFlowAdd(
+ parent.getId(),
+ mallMember.getId(),
+ orderNo,
+ FlowTypeEnum.BALANCE.getValue(),
+ RunVipMoneyFlowTypeEnum.BUY_VIP_REBATE.getValue(),
+ rebateCoin,
+ StrUtil.format(RunVipMoneyFlowTypeEnum.BUY_VIP_REBATE.getDescription(),mallMember.getPhone(),runVip.getVipName(),rebateCoin),
+ YesOrNoEnum.YES.getValue()
+ );
+ }
}
--
Gitblit v1.9.1