From afa46aa2d31e5dc30e8ce40d9976bea04164ce5f Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Mon, 20 Mar 2023 16:25:13 +0800
Subject: [PATCH] 后台修改
---
src/main/java/cc/mrbird/febs/mall/service/impl/AgentServiceImpl.java | 21 ++++++++++++++++++---
1 files changed, 18 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 11214b8..9f34350 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
@@ -222,7 +222,12 @@
sharePerkAmount,
MoneyFlowTypeEnum.DYNAMIC_ACHIEVE.getValue(),
mallOrderInfo.getOrderNo(),
- FlowTypeEnum.BALANCE.getValue());
+ "直推奖",
+ "补贴额度："+totalScore,
+ memberId,
+ 2,
+ FlowTypeEnum.BALANCE.getValue(),
+ 1);
}
}
/**
@@ -281,8 +286,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));
+ }
}
}
@@ -334,6 +345,8 @@
if(CollUtil.isNotEmpty(mallMemberStars)){
List<Long> mallMemberStarIds = mallMemberStars.stream().map(MallMember::getId).collect(Collectors.toList());
+ //排除掉本身
+ mallMemberStarIds.remove(memberId);
//当前等级的总贡献点
List<MallMemberWallet> mallMemberWallets = mallMemberWalletMapper.selectMemberWalletsByIds(mallMemberStarIds);
Integer starSum = mallMemberWallets.stream().mapToInt(MallMemberWallet::getStar).sum();
@@ -381,6 +394,7 @@
mallMoneyFlow.setOrderNo(orderNo);
mallMoneyFlow.setRtMemberId(memberId);
mallMoneyFlow.setStatus(2);
+ mallMoneyFlow.setRemark("补贴额度："+mallMemberWallet.getTotalScore());
mallMoneyFlow.setFlowType(FlowTypeEnum.BALANCE.getValue());
mallMoneyFlows.add(mallMoneyFlow);
}
@@ -457,6 +471,7 @@
mallMoneyFlow.setOrderNo(orderNo);
mallMoneyFlow.setRtMemberId(memberId);
mallMoneyFlow.setStatus(2);
+ mallMoneyFlow.setRemark("补贴额度："+mallMemberWallet.getTotalScore());
mallMoneyFlow.setFlowType(FlowTypeEnum.BALANCE.getValue());
mallMoneyFlows.add(mallMoneyFlow);
}
--
Gitblit v1.9.1