From ebf31962a00aa4b3bb7d17274133821352f1522d Mon Sep 17 00:00:00 2001
From: KKSU <15274802129@163.com>
Date: Tue, 14 Jan 2025 10:34:26 +0800
Subject: [PATCH] feat(mall): 增加团队总览功能
---
src/main/java/cc/mrbird/febs/mall/service/impl/MemberProfitServiceImpl.java | 15 +++++++++++++--
1 files changed, 13 insertions(+), 2 deletions(-)
diff --git a/src/main/java/cc/mrbird/febs/mall/service/impl/MemberProfitServiceImpl.java b/src/main/java/cc/mrbird/febs/mall/service/impl/MemberProfitServiceImpl.java
index 39b108d..f5229f3 100644
--- a/src/main/java/cc/mrbird/febs/mall/service/impl/MemberProfitServiceImpl.java
+++ b/src/main/java/cc/mrbird/febs/mall/service/impl/MemberProfitServiceImpl.java
@@ -625,7 +625,11 @@
BigDecimal V3 = BigDecimal.ZERO;
if (flag) {
V2 = V1.divide(new BigDecimal("2"), 0, RoundingMode.DOWN);
- V3 = new BigDecimal(RandomUtil.randomInt(V2.intValue(),V1.intValue())).setScale(0,RoundingMode.DOWN);
+ if(V1.intValue() <= V2.intValue()){
+ V3 = new BigDecimal(RandomUtil.randomInt(V1.intValue(),V2.intValue()+1)).setScale(0,RoundingMode.DOWN);
+ }else{
+ V3 = new BigDecimal(RandomUtil.randomInt(V2.intValue(),V1.intValue())).setScale(0,RoundingMode.DOWN);
+ }
}else{
List<MallMoneyFlow> mallMoneyFlows = mallMoneyFlowMapper.selectList(
new LambdaQueryWrapper<MallMoneyFlow>()
@@ -642,7 +646,13 @@
}else{
V2 = V1.multiply(new BigDecimal("2")).setScale(0,RoundingMode.DOWN);
}
- V3 = new BigDecimal(RandomUtil.randomInt(V1.intValue(),V2.intValue())).setScale(0,RoundingMode.DOWN);
+ if(V1.intValue() < V2.intValue()){
+ V3 = new BigDecimal(RandomUtil.randomInt(V1.intValue(),V2.intValue())).setScale(0,RoundingMode.DOWN);
+ }else if(V1.intValue() == V2.intValue()){
+ V3 = new BigDecimal(RandomUtil.randomInt(V1.intValue(),V2.intValue()+1)).setScale(0,RoundingMode.DOWN);
+ }else{
+ V3 = new BigDecimal(RandomUtil.randomInt(V2.intValue(),V1.intValue())).setScale(0,RoundingMode.DOWN);
+ }
}
//会员权益的收益
RunVipGrow runVipGrow = runVipGrowMapper.selectList(
@@ -728,6 +738,7 @@
.collect(Collectors.toMap(MallMember::getId, member -> member));
// 缓存直推成员
Map<String, Set<MallMember>> directMembersCache = mallMembers.stream()
+ .filter(member -> StrUtil.isNotBlank(member.getReferrerId()))
.collect(Collectors.groupingBy(MallMember::getReferrerId, Collectors.toSet()));
--
Gitblit v1.9.1