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 | 121 +++++++++++++++++++++++++++++++++++++++-
1 files changed, 118 insertions(+), 3 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 9f34350..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)
@@ -183,9 +187,9 @@
if(ObjectUtil.isEmpty(mallOrderInfo)){
return;
}
- if(2 != mallOrderInfo.getStatus()){
- return;
- }
+// if(2 != mallOrderInfo.getStatus()){
+// return;
+// }
/**
* 分享补贴 直推消费额10%
*/
@@ -214,6 +218,8 @@
if(BigDecimal.ZERO.compareTo(sharePerkAmount) < 0){
//减少补贴额度
mallMemberWalletMapper.reduceTotalScoreById(sharePerkAmount, mallMemberWallet.getId());
+
+ reduceStar(mallMemberUp.getId(),sharePerkAmount);
mallMemberWalletMapper.addBalanceById(sharePerkAmount, mallMemberWallet.getId());
@@ -269,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);
+ }
}
/**
@@ -347,9 +358,15 @@
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",
@@ -397,6 +414,8 @@
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()) {
@@ -474,6 +493,9 @@
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()) {
@@ -510,5 +532,98 @@
}
}
+ @Override
+ public void reduceStar(Long memberId,BigDecimal totalScore) {
+ /**
+ *获取用户的全部未用完的补贴额度流水
+ */
+ 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());
+
+ //减少用户的贡献点
+ 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());
+
+ //减少用户的贡献点
+ 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);
+ }
+ }
+ }
+
+ @Override
+ public void achieveReleasePercent() {
+ DataDictionaryCustom jobAchieveReleasePercentDic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(
+ GreenScoreEnum.JOB_ACHIEVE_RELEASE_PERCENT.getType(),
+ GreenScoreEnum.JOB_ACHIEVE_RELEASE_PERCENT.getCode()
+ );
+
+ 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