From 3ab2ed92242306ca46a5a0ea7b42b1e3d07f7f3f Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Fri, 07 Apr 2023 11:04:23 +0800
Subject: [PATCH] 在mq之前，先更新订单状态
---
src/main/java/cc/mrbird/febs/mall/service/impl/AgentServiceImpl.java | 342 ++++++++++++++++++++++++++++++++++++---------------------
1 files changed, 216 insertions(+), 126 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 6f2ed11..ed594fb 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,20 +1,12 @@
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.enumerates.*;
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.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.service.IAgentService;
-import cc.mrbird.febs.mall.service.IApiMallMemberService;
-import cc.mrbird.febs.mall.service.IApiMallMemberWalletService;
+import cc.mrbird.febs.mall.entity.*;
+import cc.mrbird.febs.mall.mapper.*;
+import cc.mrbird.febs.mall.service.*;
import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.util.ObjectUtil;
import cn.hutool.core.util.StrUtil;
import com.alibaba.fastjson.JSONObject;
import jdk.nashorn.internal.ir.IfNode;
@@ -29,6 +21,7 @@
import java.util.HashMap;
import java.util.List;
import java.util.Map;
+import java.util.stream.Collectors;
/**
* @author wzy
@@ -41,9 +34,11 @@
private final DataDictionaryCustomMapper dataDictionaryCustomMapper;
private final MallMemberMapper memberMapper;
- private final MallOrderInfoMapper orderInfoMapper;
- private final IApiMallMemberWalletService memberWalletService;
- private final IApiMallMemberService memberService;
+ private final MallOrderInfoMapper mallOrderInfoMapper;
+ private final MallOrderItemMapper mallOrderItemMapper;
+ private final IApiMallMemberWalletService iApiMallMemberWalletService;
+ private final IMallMoneyFlowService mallMoneyFlowService;
+ private final MallMemberMapper mallMemberMapper;
@Override
@Transactional(rollbackFor = Exception.class)
@@ -53,27 +48,31 @@
return;
}
- // 未激活用户无法升级
- if (AgentLevelEnum.ZERO_LEVEL.name().equals(member.getLevel())) {
- return;
- }
-
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());
@@ -82,22 +81,22 @@
}
/**
- * 判断用户直推下单数量或团队下单数量是否达标
+ * 判断直推人数是否达标
*
+ * @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 = memberMapper.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,7 +106,7 @@
* @return
*/
private boolean agentCntFinish(MallMember member, AgentInfo agentInfo) {
- if (agentInfo.getLastCnt() == null) {
+ if (agentInfo.getLastAgentCnt() == null || agentInfo.getLastAgentCnt() == 0) {
return true;
}
@@ -126,118 +125,209 @@
}
}
- 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
+ * @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())) {
+ /**
+ * 1、购买人获得固定比例的积分
+ * 2、直推获取8%的现金->余额,4%的积分->积分
+ * 3、不同代理级别获取不用的比例的现金和积分
+ * 4、董事享受全公司入单分红2%加权（现金）
+ * 5、合伙人享全公司入单分红5%加权（现金）
+ */
+ //获取当前订单子表信息
+ List<MallOrderItem> mallOrderItemList = mallOrderItemMapper.selectbyOrderId(orderId);
+ if(CollUtil.isEmpty(mallOrderItemList)){
return;
}
+ //获取订单中套餐的信息
+ List<MallOrderItem> mallOrderItemIsTCs = mallOrderItemList.stream().filter(mallOrderItem -> mallOrderItem.getIsNormal() == 2).collect(Collectors.toList());
+ if(CollUtil.isEmpty(mallOrderItemIsTCs)){
+ return;
+ }
+ //获取订单中套餐总数金额
+ BigDecimal amountTC = mallOrderItemIsTCs.stream().map(MallOrderItem::getAmount).reduce(BigDecimal.ZERO, BigDecimal::add);
+ if(BigDecimal.ZERO.compareTo(amountTC) >= 0){
+ return;
+ }
+ MallOrderInfo mallOrderInfo = mallOrderInfoMapper.selectById(orderId);
+ String orderNo = mallOrderInfo.getOrderNo();
+ //购买人
+ Long memberId = mallOrderInfo.getMemberId();
- // 直推奖励
- directReturnMoney(member, orderInfo);
- // 团队奖励
- teamReturnMoney(member, orderInfo);
+ /**
+ * 1、购买人获得固定比例的积分
+ * = amountTC * 固定比例
+ */
+ perkMember(memberId,
+ PerkEnum.BUY_SET_MEAL_PERK_PERCENT,
+ amountTC,
+ "score",
+ MoneyFlowTypeEnum.BUY_SET_MEAL_PERK.getValue(),
+ FlowTypeEnum.SCORE.getValue(),
+ orderNo);
+
+ /**
+ * 2、直推获取8%的现金->余额,4%的积分->积分
+ */
+ MallMember mallMember = mallMemberMapper.selectById(memberId);
+ if(ObjectUtil.isNotEmpty(mallMember.getReferrerId())){
+ String referrerId = mallMember.getReferrerId();
+ MallMember mallMemberDirect = mallMemberMapper.selectInfoByInviteId(referrerId);
+ Long directMemberId = mallMemberDirect.getId();
+
+ perkMember(directMemberId,
+ PerkEnum.DIRECT_CASH_PERK_PERCENT,
+ amountTC,
+ "balance",
+ MoneyFlowTypeEnum.DIRECT_CASH_PERK.getValue(),
+ FlowTypeEnum.BALANCE.getValue(),
+ orderNo);
+
+ perkMember(directMemberId,
+ PerkEnum.DIRECT_SCORE_PERK_PERCENT,
+ amountTC,
+ "score",
+ MoneyFlowTypeEnum.DIRECT_SCORE_PERK.getValue(),
+ FlowTypeEnum.SCORE.getValue(),
+ orderNo);
+ }
+
+ /**
+ * 4、董事享受全公司入单分红2%加权（现金）
+ */
+ List<MallMember> mallMembersDirectors = mallMemberMapper.selectDirectorsOrStoreMaster(1);
+ if(CollUtil.isNotEmpty(mallMembersDirectors)){
+ perkMembersLevel(mallMembersDirectors,
+ PerkEnum.DIRECTOR_CASH_PERK_PERCENT,
+ amountTC,
+ "balance",
+ MoneyFlowTypeEnum.DIRECTOR_CASH_PERK.getValue(),
+ FlowTypeEnum.BALANCE.getValue(),
+ orderNo);
+ }
+
+ /**
+ * 5、合伙人享全公司入单分红5%加权（现金）
+ */
+ List<MallMember> mallMemberPartners = mallMemberMapper.selectDirectorsOrStoreMaster(3);
+ if(CollUtil.isNotEmpty(mallMemberPartners)){
+ perkMembersLevel(mallMemberPartners,
+ PerkEnum.PARTNER_CASH_PERK_PERCENT,
+ amountTC,
+ "balance",
+ MoneyFlowTypeEnum.PARTNER_CASH_PERK.getValue(),
+ FlowTypeEnum.BALANCE.getValue(),
+ orderNo);
+ }
+
+ /**
+ * 3、团队下不同代理级别获取不用的比例的现金和积分
+ */
+ if(StrUtil.isNotEmpty(mallMember.getReferrerIds())){
+ String referrerIds = mallMember.getReferrerIds();
+
+ }
+
+
}
/**
- * 直推奖励
- * @param member
+ * 给某一个用户根据订单金额去加权平分
+ * @param memberId 用户ID
+ * @param perkEnum 比例的枚举值
+ * @param amountTC 总金额
+ * @param walletField 类型：score:积分 balance：余额
+ * @param type 流水类型
+ * @param flowType 流水分类
+ * @param orderNo 订单编号
*/
- 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 void perkMember(Long memberId,PerkEnum perkEnum,BigDecimal amountTC,String walletField,int type,int flowType,String orderNo){
+ DataDictionaryCustom perkEnumDic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(
+ perkEnum.getType(),
+ perkEnum.getCode());
+ if(ObjectUtil.isNotEmpty(perkEnumDic)){
+ BigDecimal perkEnumDicPercent = new BigDecimal(perkEnumDic.getValue() == null ? "0" : perkEnumDic.getValue());
+ //获得数量
+ BigDecimal perkEnumDicPercentPerk = perkEnumDicPercent.multiply(AppContants.PERCENTAGE).multiply(amountTC).setScale(2, BigDecimal.ROUND_DOWN);
+ if(perkEnumDicPercentPerk.compareTo(BigDecimal.ZERO) > 0){
+ //增加
+ iApiMallMemberWalletService.add(perkEnumDicPercentPerk,memberId,walletField);
+ //增加一个流水记录
+ mallMoneyFlowService.addMoneyFlow(
+ memberId,
+ perkEnumDicPercentPerk,
+ type,
+ orderNo,
+ flowType,
+ AppContants.IS_RETURN_YES);
}
}
}
- private AgentInfo getAgentInfo(String level) {
- DataDictionaryCustom dic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(AppContants.AGENT_LEVEL_REQUIRE, level);
- if (dic == null) {
- log.info("当前用户父级等级:{}", level);
- return null;
+ /**
+ * 按照级别，根据订单金额去加权平分
+ * @param mallMembers 用户
+ * @param perkEnum 比例的枚举值
+ * @param amountTC 总金额
+ * @param walletField 类型：score:积分 balance：余额
+ * @param type 流水类型
+ * @param flowType 流水分类
+ * @param orderNo 订单编号
+ */
+ private void perkMembersLevel(List<MallMember> mallMembers,PerkEnum perkEnum,BigDecimal amountTC,String walletField,int type,int flowType,String orderNo){
+ DataDictionaryCustom perkEnumDic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(
+ perkEnum.getType(),
+ perkEnum.getCode());
+ if(ObjectUtil.isNotEmpty(perkEnumDic)){
+ BigDecimal perkEnumDicPercent = new BigDecimal(perkEnumDic.getValue() == null ? "0" : perkEnumDic.getValue());
+ //获得的现金
+ BigDecimal perkEnumDicPercentPerkSum = perkEnumDicPercent.multiply(AppContants.PERCENTAGE).multiply(amountTC).setScale(2, BigDecimal.ROUND_DOWN);
+ //然后董事平分
+ BigDecimal perkEnumDicPercentPerk = perkEnumDicPercentPerkSum.divide(new BigDecimal(mallMembers.size()), 2, BigDecimal.ROUND_DOWN);
+ if(perkEnumDicPercentPerk.compareTo(BigDecimal.ZERO) > 0){
+ for(MallMember mallMember : mallMembers){
+ Long memberId = mallMember.getId();
+ //增加余额
+ iApiMallMemberWalletService.add(perkEnumDicPercentPerk,memberId,walletField);
+ //增加一个获得现金的流水记录
+ mallMoneyFlowService.addMoneyFlow(
+ memberId,
+ perkEnumDicPercentPerk,
+ type,
+ orderNo,
+ flowType,
+ AppContants.IS_RETURN_YES);
+ }
+ }
}
-
- return JSONObject.parseObject(dic.getValue(), AgentInfo.class);
}
@Override
--
Gitblit v1.9.1