From 5b1a5025c72a80f58fe6bdbaf90eeaf487d71076 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Mon, 17 Apr 2023 16:35:08 +0800
Subject: [PATCH] 只针对一星会员做修改： 按购买业绩（不按权益积分）每天静态释0.6%~1.2%
---
src/main/java/cc/mrbird/febs/mall/service/impl/AgentServiceImpl.java | 200 ++++++++++++++++++++++++++++++++++++-------------
1 files changed, 146 insertions(+), 54 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 e253eae..9190cce 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,6 +1,7 @@
package cc.mrbird.febs.mall.service.impl;
import cc.mrbird.febs.common.enumerates.*;
+import cc.mrbird.febs.common.utils.AppContants;
import cc.mrbird.febs.common.utils.MallUtils;
import cc.mrbird.febs.mall.entity.*;
import cc.mrbird.febs.mall.mapper.*;
@@ -9,6 +10,7 @@
import cc.mrbird.febs.mall.vo.AdminTeamEqualsPerkVo;
import cc.mrbird.febs.system.mapper.UserMapper;
import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.math.MathUtil;
import cn.hutool.core.util.ObjectUtil;
import cn.hutool.core.util.StrUtil;
import cn.hutool.json.JSONUtil;
@@ -39,6 +41,7 @@
private final DataDictionaryCustomMapper dataDictionaryCustomMapper;
private final MallMemberMapper memberMapper;
+ private final MallAchieveRecordMapper mallAchieveRecordMapper;
private final MallOrderInfoMapper mallOrderInfoMapper;
private final IApiMallMemberWalletService iApiMallMemberWalletService;
@@ -47,6 +50,7 @@
private final SqlSessionTemplate sqlSessionTemplate;
private final IApiMallMemberWalletService memberWalletService;
private final MallMoneyFlowMapper mallMoneyFlowMapper;
+ private final MallMqRecordMapper mallMqRecordMapper;
@Override
@Transactional(rollbackFor = Exception.class)
@@ -59,18 +63,20 @@
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) {
+ //合伙人的下一个层级
+ String parentLevel = parent.getLevel();
+ String nextLevel = MemberLevelEnum.SECOND_LEVEL.getNextLevel(parentLevel);
+ if (parentLevel.equals(nextLevel)) {
log.info("当前层级无下一级:{}", parent.getLevel());
continue;
}
- AgentInfo agentInfo = JSONObject.parseObject(nextLevel.getValue(), AgentInfo.class);
+ DataDictionaryCustom nextLevelDic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode("AGENT_LEVEL_REQUIRE", nextLevel);
+ AgentInfo agentInfo = JSONObject.parseObject(nextLevelDic.getValue(), AgentInfo.class);
if (!directMemberCnt(parent, agentInfo)) {
continue;
}
@@ -83,7 +89,7 @@
continue;
}
- parent.setLevel(nextLevel.getCode());
+ parent.setLevel(nextLevel);
memberMapper.updateById(parent);
}
}
@@ -104,7 +110,7 @@
return true;
}
- log.info("用户:{}直推数量未达标, 当前等级:{}, 当前数量:{}, 目标数量:{}", member.getPhone(), member.getLevel(), childs.size(), agentInfo.getLastAgentCnt());
+ log.info("用户:{}直推数量未达标, 当前等级:{}, 当前数量:{}, 目标数量:{}", member.getPhone(), member.getLevel(), childs.size(), agentInfo.getDirectCnt());
return false;
}
@@ -142,20 +148,24 @@
}
/**
- * 团队业绩是否达标
+ * 团队贡献点是否达标
*
* @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) {
+ List<MallMember> mallMembers = memberMapper.selectAllChildAgentListByInviteId(member.getInviteId());
+ List<Long> ids = mallMembers.stream().map(MallMember::getId).collect(Collectors.toList());
+ List<MallMemberWallet> mallMemberWallets = mallMemberWalletMapper.selectMemberWalletsByIds(ids);
+
+ int starSum = mallMemberWallets.stream().mapToInt(MallMemberWallet::getStar).sum();
+ BigDecimal teamIncome = agentInfo.getTeamIncome();
+ if (teamIncome.compareTo(new BigDecimal(starSum)) <= 0) {
return true;
}
- log.info("用户:{}团队业绩未达标, 当前等级:{}, 当前数量:{}, 目标数量:{}", member.getPhone(), member.getLevel(), totalIncome, targetIncome);
+ log.info("用户:{}团队贡献点未达标, 当前等级:{}, 当前数量:{}, 目标数量:{}", member.getPhone(), member.getLevel(), starSum, teamIncome);
return false;
}
@@ -177,9 +187,9 @@
if(ObjectUtil.isEmpty(mallOrderInfo)){
return;
}
- if(2 != mallOrderInfo.getStatus()){
- return;
- }
+// if(2 != mallOrderInfo.getStatus()){
+// return;
+// }
/**
* 分享补贴 直推消费额10%
*/
@@ -209,6 +219,8 @@
//减少补贴额度
mallMemberWalletMapper.reduceTotalScoreById(sharePerkAmount, mallMemberWallet.getId());
+ reduceStar(mallMemberUp.getId(),sharePerkAmount);
+
mallMemberWalletMapper.addBalanceById(sharePerkAmount, mallMemberWallet.getId());
mallMoneyFlowService.addMoneyFlow(
@@ -216,7 +228,12 @@
sharePerkAmount,
MoneyFlowTypeEnum.DYNAMIC_ACHIEVE.getValue(),
mallOrderInfo.getOrderNo(),
- FlowTypeEnum.BALANCE.getValue());
+ "直推奖",
+ "补贴额度："+totalScore,
+ memberId,
+ 2,
+ FlowTypeEnum.BALANCE.getValue(),
+ 1);
}
}
/**
@@ -258,6 +275,11 @@
long end = System.currentTimeMillis();
log.info("============订单：{},时间：{}===========",mallOrderInfo.getOrderNo(),(end - start)/1000);
+ MallMqRecord mallMqRecord = mallMqRecordMapper.selectByOrderId(orderId);
+ if(ObjectUtil.isNotEmpty(mallMqRecord)){
+ mallMqRecord.setState(1);
+ mallMqRecordMapper.updateById(mallMqRecord);
+ }
}
/**
@@ -275,8 +297,14 @@
Map<String, List<MallMember>> collect = mallMembers.stream().collect(Collectors.groupingBy(MallMember::getLevel));
Set<String> set = collect.keySet(); // 得到所有key的集合
for (String key : set) {
- List<MallMember> value = collect.get(key);
- mallMemberTeamPerk.add(value.get(0));
+ /**
+ * 团队补贴从二星开始
+ */
+ int compareLevel = MemberLevelEnum.SECOND_LEVEL.compareLevel(key, MemberLevelEnum.SECOND_LEVEL.getType());
+ if(compareLevel > 0){
+ List<MallMember> value = collect.get(key);
+ mallMemberTeamPerk.add(value.get(0));
+ }
}
}
@@ -328,9 +356,17 @@
if(CollUtil.isNotEmpty(mallMemberStars)){
List<Long> mallMemberStarIds = mallMemberStars.stream().map(MallMember::getId).collect(Collectors.toList());
+ //排除掉本身
+ mallMemberStarIds.remove(memberId);
+ if(CollUtil.isEmpty(mallMemberStarIds)){
+ return mallMemberStars;
+ }
//当前等级的总贡献点
List<MallMemberWallet> mallMemberWallets = mallMemberWalletMapper.selectMemberWalletsByIds(mallMemberStarIds);
Integer starSum = mallMemberWallets.stream().mapToInt(MallMemberWallet::getStar).sum();
+ if(starSum <= 0){
+ return mallMemberStars;
+ }
//星级补贴比例
DataDictionaryCustom starPerkDic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(
"AGENT_LEVEL_REQUIRE",
@@ -375,8 +411,11 @@
mallMoneyFlow.setOrderNo(orderNo);
mallMoneyFlow.setRtMemberId(memberId);
mallMoneyFlow.setStatus(2);
+ mallMoneyFlow.setRemark("补贴额度："+mallMemberWallet.getTotalScore());
mallMoneyFlow.setFlowType(FlowTypeEnum.BALANCE.getValue());
mallMoneyFlows.add(mallMoneyFlow);
+
+ reduceStar(mallMemberWallet.getMemberId(),starPerkAmount);
}
count = count + 1;
if (count % 1000 == 0 || count == mallMemberWallets.size()) {
@@ -425,6 +464,7 @@
* @param orderNo
* @param memberId
*/
+ @Override
public void flowTotalScoreBalance(List<MallMemberWallet> mallMemberWallets,BigDecimal amount,int flowType,String orderNo,Long memberId){
//给当前等级的每个用户发放星级奖励
int count = 0;
@@ -450,8 +490,12 @@
mallMoneyFlow.setOrderNo(orderNo);
mallMoneyFlow.setRtMemberId(memberId);
mallMoneyFlow.setStatus(2);
+ mallMoneyFlow.setRemark("补贴额度："+mallMemberWallet.getTotalScore());
mallMoneyFlow.setFlowType(FlowTypeEnum.BALANCE.getValue());
mallMoneyFlows.add(mallMoneyFlow);
+
+ reduceStar(mallMemberWallet.getMemberId(),amount);
+
}
count = count + 1;
if (count % 1000 == 0 || count == mallMemberWallets.size()) {
@@ -488,50 +532,98 @@
}
}
- /**
- * 平级奖励补贴
- */
- public void getPeerPerk(){
+ @Override
+ public void reduceStar(Long memberId,BigDecimal totalScore) {
/**
- * 全体用户
- * 对象：产生了收益的用户的直属上级
- * 条件：等级和用户等级一样
- * 补贴：每日补贴的10%，例如用户当日的补贴总额为100，直属上级拿100*10%=10，
- * 限制：直推收益除外。
+ *获取用户的全部未用完的补贴额度流水
*/
- //平级补贴百分比
- DataDictionaryCustom teamEqualsPerkDic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(
- DataDictionaryEnum.TEAM_EQUALS_PERK.getType(),
- DataDictionaryEnum.TEAM_EQUALS_PERK.getCode());
- BigDecimal teamEqualsPerkPercent = new BigDecimal(teamEqualsPerkDic.getValue()).abs().multiply(BigDecimal.valueOf(0.01));
+ MallMemberWallet mallMemberWallet = mallMemberWalletMapper.selectWalletByMemberId(memberId);
+ List<MallMoneyFlow> mallMoneyFlows = mallMoneyFlowMapper.selectMoneyFlowByMemberIdAndIsRetrun(memberId,2);
+ //如果补贴额度全部用完则更新用户的贡献点为零
+ if(CollUtil.isEmpty(mallMoneyFlows)){
+ mallMemberWalletMapper.reduceStarByMemberId(mallMemberWallet.getStar(), memberId);
+ return;
+ }
+ for(MallMoneyFlow mallMoneyFlow : mallMoneyFlows){
+ String remark = mallMoneyFlow.getRemark();
+ BigDecimal remarkNum = new BigDecimal(remark);
+ //如果补贴额度小于记录的剩余补贴额度
+ if(totalScore.compareTo(remarkNum) < 0){
+ remarkNum = remarkNum.subtract(totalScore).setScale(2,BigDecimal.ROUND_DOWN);
+ mallMoneyFlowMapper.updateRemarkById(remarkNum.toString(),mallMoneyFlow.getId());
+ break;
+ }
+ //如果补贴额度等于等于记录的剩余补贴额度
+ if(totalScore.compareTo(remarkNum) == 0){
+ remarkNum = remarkNum.subtract(totalScore).setScale(2,BigDecimal.ROUND_DOWN);
+ mallMoneyFlowMapper.updateRemarkAndIsReturnById(remarkNum.toString(),mallMoneyFlow.getId());
- //产生了收益的用户和直属上级
- List<AdminTeamEqualsPerkVo> adminTeamEqualsPerkVos = mallMoneyFlowMapper.selectTeamEqualsMemberByDate(new Date());
- if(CollUtil.isNotEmpty(adminTeamEqualsPerkVos)){
- for(AdminTeamEqualsPerkVo adminTeamEqualsPerkVo : adminTeamEqualsPerkVos){
- BigDecimal sumAmount = adminTeamEqualsPerkVo.getSumAmount();
- //平级补贴
- BigDecimal teamEqualsPerkAmount = teamEqualsPerkPercent.multiply(sumAmount).setScale(2, BigDecimal.ROUND_DOWN);
+ //减少用户的贡献点
+ String orderNo = mallMoneyFlow.getOrderNo();
+ MallMoneyFlow mallMoneyFlowStar = mallMoneyFlowMapper.selectByOrderNoAndMemberId(orderNo,memberId,2);
+ BigDecimal amount = mallMoneyFlowStar.getAmount();
+ mallMemberWalletMapper.reduceStarByMemberId(amount.intValue(), memberId);
+ //更新记录的返利状态为已返利
+ mallMoneyFlowMapper.updateRemarkAndIsReturnById("0",mallMoneyFlowStar.getId());
+ break;
+ }
+ //如果补贴额度大于记录的剩余补贴额度
+ if(totalScore.compareTo(remarkNum) > 0){
+ mallMoneyFlowMapper.updateRemarkAndIsReturnById("0",mallMoneyFlow.getId());
- MallMemberWallet mallMemberWallet = mallMemberWalletMapper.selectWalletByMemberId(adminTeamEqualsPerkVo.getRtMemberId());
- BigDecimal totalScore = mallMemberWallet.getTotalScore();
- if(totalScore.compareTo(teamEqualsPerkAmount) < 0){
- teamEqualsPerkAmount = totalScore;
- }
- if(BigDecimal.ZERO.compareTo(teamEqualsPerkAmount) < 0){
- //减少补贴额度
- mallMemberWalletMapper.reduceTotalScoreById(teamEqualsPerkAmount, mallMemberWallet.getId());
+ //减少用户的贡献点
+ String orderNo = mallMoneyFlow.getOrderNo();
+ MallMoneyFlow mallMoneyFlowStar = mallMoneyFlowMapper.selectByOrderNoAndMemberId(orderNo,memberId,2);
+ BigDecimal amount = mallMoneyFlowStar.getAmount();
+ mallMemberWalletMapper.reduceStarByMemberId(amount.intValue(), memberId);
+ //更新记录的返利状态为已返利
+ mallMoneyFlowMapper.updateRemarkAndIsReturnById("0",mallMoneyFlowStar.getId());
+ totalScore = totalScore.subtract(remarkNum);
+ }
+ }
+ }
- mallMemberWalletMapper.addBalanceById(teamEqualsPerkAmount, mallMemberWallet.getId());
+ @Override
+ public void achieveReleasePercent() {
+ DataDictionaryCustom jobAchieveReleasePercentDic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(
+ GreenScoreEnum.JOB_ACHIEVE_RELEASE_PERCENT.getType(),
+ GreenScoreEnum.JOB_ACHIEVE_RELEASE_PERCENT.getCode()
+ );
- mallMoneyFlowService.addMoneyFlow(
- adminTeamEqualsPerkVo.getRtMemberId(),
- teamEqualsPerkAmount,
- MoneyFlowTypeEnum.TEAM_EQUALS_PERK.getValue(),
- MallUtils.getOrderNum("TEP"),
- FlowTypeEnum.BALANCE.getValue());
+ List<MallMember> mallMembers = memberMapper.selectByLevel(MemberLevelEnum.SECOND_LEVEL.getType());
+ if(CollUtil.isNotEmpty(mallMembers)){
+ for(MallMember mallMember : mallMembers){
+ //总业绩
+ BigDecimal sumAchieve = mallAchieveRecordMapper.selectSumAchieveByMemberId(mallMember.getId());
+ BigDecimal jobAchieveReleasePercent = new BigDecimal(jobAchieveReleasePercentDic.getValue())
+ .multiply(new BigDecimal(0.001));
+ //每个人的补贴额度
+ BigDecimal multiply = sumAchieve.multiply(jobAchieveReleasePercent);
+ if(multiply.compareTo(new BigDecimal(50)) < 0){
+ MallMemberWallet mallMemberWallet = mallMemberWalletMapper.selectWalletByMemberId(mallMember.getId());
+ BigDecimal totalScore = mallMemberWallet.getTotalScore();
+ if(BigDecimal.ZERO.compareTo(totalScore) < 0){
+ if(totalScore.compareTo(multiply) < 0){
+ multiply = totalScore;
+ }
+ //减少补贴额度
+ mallMemberWalletMapper.reduceTotalScoreById(multiply, mallMemberWallet.getId());
+
+ reduceStar(mallMember.getId(),multiply);
+
+ mallMemberWalletMapper.addBalanceById(multiply, mallMemberWallet.getId());
+
+ mallMoneyFlowService.addMoneyFlow(
+ mallMember.getId(),
+ multiply,
+ MoneyFlowTypeEnum.STATIC_BONUS.getValue(),
+ MallUtils.getOrderNum(),
+ FlowTypeEnum.BALANCE.getValue());
+ }
}
}
}
}
+
+
}
--
Gitblit v1.9.1