From ec97abaae5a0d93e9b4d5f3f82de7b97f2b586b0 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Sat, 11 Jun 2022 20:22:15 +0800
Subject: [PATCH] fix some problem and add update referer and add member
---
src/main/java/cc/mrbird/febs/mall/service/impl/MemberProfitServiceImpl.java | 14 ++++++++------
1 files changed, 8 insertions(+), 6 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 b2e2e65..80e5a8b 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
@@ -308,17 +308,19 @@
continue;
}
- BigDecimal preProfit = income.multiply(prop).divide(BigDecimal.valueOf(children.size()), 2, RoundingMode.HALF_DOWN);
-
-
- int reduce = walletService.reduce(preProfit.negate(), mallMember.getId(), "commission");
+ BigDecimal reduceProfit = income.multiply(prop);
+ int reduce = walletService.reduce(reduceProfit.negate(), mallMember.getId(), "commission");
if (reduce == 2) {
continue;
}
- moneyFlowService.addMoneyFlow(mallMember.getId(), income.negate(), MoneyFlowTypeEnum.THANKFUL.getValue(), null, FlowTypeEnum.COMMISSION.getValue());
-
+ moneyFlowService.addMoneyFlow(mallMember.getId(), reduceProfit.negate(), MoneyFlowTypeEnum.THANKFUL.getValue(), null, FlowTypeEnum.COMMISSION.getValue());
for (MallMember child : children) {
+ BigDecimal preProfit = income.multiply(prop).divide(BigDecimal.valueOf(children.size()), 2, RoundingMode.HALF_DOWN);
+ if (preProfit.compareTo(BigDecimal.ZERO) < 1) {
+ continue;
+ }
+
int reduce1 = walletService.reduce(preProfit.negate(), child.getId(), "score");
if (reduce1 == 2) {
continue;
--
Gitblit v1.9.1