From 300e26d6ce2be358d6452911ef46ac298d744ea5 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Fri, 17 Jun 2022 10:14:38 +0800
Subject: [PATCH] fix
---
src/test/java/cc/mrbird/febs/ProfitTest.java | 2 +-
src/main/java/cc/mrbird/febs/mall/service/impl/MemberProfitServiceImpl.java | 6 +++---
2 files changed, 4 insertions(+), 4 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 c170ad3..ec32b6e 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
@@ -205,7 +205,7 @@
}
// 直推数量
- Integer directCnt = mallMemberMapper.selectOwnCntByInviteId(member.getReferrerId());
+ Integer directCnt = mallMemberMapper.selectOwnCntByInviteId(parentMember.getInviteId());
List<DataDictionaryCustom> dataDices = dataDictionaryCustomMapper.selectDicByType(DataDictionaryEnum.INDIRECT_BONUS_SETTING.getType());
directCnt = directCnt == null ? 0 :directCnt;
@@ -220,11 +220,11 @@
}
// 隔代推荐奖 收益
- direct = direct.divide(indrectDicProp, 2, RoundingMode.HALF_UP);
+ direct = direct.multiply(indrectDicProp.divide(new BigDecimal("100"), 2, RoundingMode.HALF_UP));
// direct 收益小于1，则跳出
if (direct.compareTo(BigDecimal.ONE) < 1) {
- continue;
+ break;
}
int reduceResult = walletService.reduce(direct, parentMember.getId(), "score");
diff --git a/src/test/java/cc/mrbird/febs/ProfitTest.java b/src/test/java/cc/mrbird/febs/ProfitTest.java
index b279e38..6f0000d 100644
--- a/src/test/java/cc/mrbird/febs/ProfitTest.java
+++ b/src/test/java/cc/mrbird/febs/ProfitTest.java
@@ -33,7 +33,7 @@
@Test
public void dynamicProfit() {
- memberProfitService.dynamicProfit(59L);
+ memberProfitService.dynamicProfit(16L);
}
--
Gitblit v1.9.1