From eaee69069ce738410058075bc69b780b260786e1 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Mon, 17 Apr 2023 11:14:56 +0800
Subject: [PATCH] 后台修改
---
src/main/java/cc/mrbird/febs/mall/service/impl/AgentServiceImpl.java | 70 +++++++++++++++++++++++++++++++++-
1 files changed, 67 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 ff9da3d..b61b090 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
@@ -184,9 +184,9 @@
if(ObjectUtil.isEmpty(mallOrderInfo)){
return;
}
- if(2 != mallOrderInfo.getStatus()){
- return;
- }
+// if(2 != mallOrderInfo.getStatus()){
+// return;
+// }
/**
* 分享补贴 直推消费额10%
*/
@@ -215,6 +215,8 @@
if(BigDecimal.ZERO.compareTo(sharePerkAmount) < 0){
//减少补贴额度
mallMemberWalletMapper.reduceTotalScoreById(sharePerkAmount, mallMemberWallet.getId());
+
+ reduceStar(mallMemberUp.getId(),sharePerkAmount);
mallMemberWalletMapper.addBalanceById(sharePerkAmount, mallMemberWallet.getId());
@@ -353,9 +355,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",
@@ -403,6 +411,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()) {
@@ -480,6 +490,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()) {
@@ -516,5 +529,56 @@
}
}
+ @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);
+ }
+ }
+ }
+
}
--
Gitblit v1.9.1