From f61c65658100a64f64cb14c64f27934702d1812e Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Fri, 17 Jun 2022 15:41:40 +0800
Subject: [PATCH] fix 若赠送积分不足，则减去所有赠送积分
---
src/main/java/cc/mrbird/febs/mall/service/impl/MemberProfitServiceImpl.java | 158 +++++++++++++++++++++++++++++-----------------------
1 files changed, 89 insertions(+), 69 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 c2b6583..a9e821c 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
@@ -109,14 +109,15 @@
Long memberId = (Long) item.get("memberId");
String orderNo = (String) item.get("orderNo");
- int reduce = walletService.reduce(preStaticProfit, memberId, "score");
- if (reduce == 2) {
- break;
- }
-
- walletService.add(preStaticProfit, memberId, "commission");
- moneyFlowService.addMoneyFlow(memberId, preStaticProfit, MoneyFlowTypeEnum.STATIC_BONUS.getValue(), orderNo, FlowTypeEnum.COMMISSION.getValue());
- moneyFlowService.addMoneyFlow(memberId, preStaticProfit.negate(), MoneyFlowTypeEnum.STATIC_BONUS.getValue(), orderNo, FlowTypeEnum.SCORE.getValue());
+// int reduce = walletService.reduce(preStaticProfit, memberId, "score");
+// if (reduce == 2) {
+// break;
+// }
+//
+// walletService.add(preStaticProfit, memberId, "commission");
+// moneyFlowService.addMoneyFlow(memberId, preStaticProfit, MoneyFlowTypeEnum.STATIC_BONUS.getValue(), orderNo, FlowTypeEnum.COMMISSION.getValue());
+// moneyFlowService.addMoneyFlow(memberId, preStaticProfit.negate(), MoneyFlowTypeEnum.STATIC_BONUS.getValue(), orderNo, FlowTypeEnum.SCORE.getValue());
+ changeScoreAndCommission(memberId, preStaticProfit, MoneyFlowTypeEnum.STATIC_BONUS.getValue(), orderNo);
}
}
}
@@ -179,15 +180,18 @@
continue;
}
- int reduce = walletService.reduce(dynamicProfit, parent.getId(), "score");
- if (reduce == 2) {
+// int reduce = walletService.reduce(dynamicProfit, parent.getId(), "score");
+// if (reduce == 2) {
+// continue;
+// }
+// walletService.add(dynamicProfit, parent.getId(), "commission");
+// moneyFlowService.addMoneyFlow(parent.getId(), dynamicProfit, MoneyFlowTypeEnum.DYNAMIC_ACHIEVE.getValue(), orderInfo.getOrderNo(), FlowTypeEnum.COMMISSION.getValue());
+// moneyFlowService.addMoneyFlow(parent.getId(), dynamicProfit.negate(), MoneyFlowTypeEnum.DYNAMIC_ACHIEVE.getValue(), orderInfo.getOrderNo(), FlowTypeEnum.SCORE.getValue());
+
+ dynamicProfit = changeScoreAndCommission(parent.getId(), dynamicProfit, MoneyFlowTypeEnum.DYNAMIC_ACHIEVE.getValue(), orderInfo.getOrderNo());
+ if (dynamicProfit.compareTo(BigDecimal.ZERO) < 1) {
continue;
}
-
- walletService.add(dynamicProfit, parent.getId(), "commission");
-
- moneyFlowService.addMoneyFlow(parent.getId(), dynamicProfit, MoneyFlowTypeEnum.DYNAMIC_ACHIEVE.getValue(), orderInfo.getOrderNo(), FlowTypeEnum.COMMISSION.getValue());
- moneyFlowService.addMoneyFlow(parent.getId(), dynamicProfit.negate(), MoneyFlowTypeEnum.DYNAMIC_ACHIEVE.getValue(), orderInfo.getOrderNo(), FlowTypeEnum.SCORE.getValue());
// =======直推返利== end =====
// =======隔代奖== start =====
@@ -211,7 +215,7 @@
Integer directCnt = mallMemberMapper.selectOwnCntByInviteId(parentMember.getInviteId());
List<DataDictionaryCustom> dataDices = dataDictionaryCustomMapper.selectDicByType(DataDictionaryEnum.INDIRECT_BONUS_SETTING.getType());
- directCnt = directCnt == null ? 0 :directCnt;
+ directCnt = directCnt == null ? 0 : directCnt;
// 隔代比例
BigDecimal indrectDicProp = BigDecimal.ZERO;
@@ -229,15 +233,15 @@
if (direct.compareTo(BigDecimal.ONE) < 1) {
break;
}
-
- int reduceResult = walletService.reduce(direct, parentMember.getId(), "score");
- if (reduceResult == 2) {
- continue;
- }
-
- walletService.add(direct, parentMember.getId(), "commission");
- moneyFlowService.addMoneyFlow(parentMember.getId(), direct, MoneyFlowTypeEnum.RECOMMEND_BONUS.getValue(), orderInfo.getOrderNo(), FlowTypeEnum.COMMISSION.getValue());
- moneyFlowService.addMoneyFlow(parentMember.getId(), direct.negate(), MoneyFlowTypeEnum.RECOMMEND_BONUS.getValue(), orderInfo.getOrderNo(), FlowTypeEnum.SCORE.getValue());
+// int reduceResult = walletService.reduce(direct, parentMember.getId(), "score");
+// if (reduceResult == 2) {
+// continue;
+// }
+//
+// walletService.add(direct, parentMember.getId(), "commission");
+// moneyFlowService.addMoneyFlow(parentMember.getId(), direct, MoneyFlowTypeEnum.RECOMMEND_BONUS.getValue(), orderInfo.getOrderNo(), FlowTypeEnum.COMMISSION.getValue());
+// moneyFlowService.addMoneyFlow(parentMember.getId(), direct.negate(), MoneyFlowTypeEnum.RECOMMEND_BONUS.getValue(), orderInfo.getOrderNo(), FlowTypeEnum.SCORE.getValue());
+ changeScoreAndCommission(parentMember.getId(), direct, MoneyFlowTypeEnum.RECOMMEND_BONUS.getValue(), orderInfo.getOrderNo());
}
// =======隔代奖== end =====
}
@@ -277,18 +281,35 @@
BigDecimal income = profit.multiply(profitProp).divide(BigDecimal.valueOf(agentMemberList.size()), 2, RoundingMode.HALF_UP);
for (MallMember agentMember : agentMemberList) {
- int reduce = walletService.reduce(income, agentMember.getId(), "score");
- if (reduce == 2) {
- continue;
- }
-
- walletService.add(income, agentMember.getId(), "commission");
-
- moneyFlowService.addMoneyFlow(agentMember.getId(), income, MoneyFlowTypeEnum.AGENT_BONUS.getValue(), null, FlowTypeEnum.COMMISSION.getValue());
- moneyFlowService.addMoneyFlow(agentMember.getId(), income.negate(), MoneyFlowTypeEnum.AGENT_BONUS.getValue(), null, FlowTypeEnum.SCORE.getValue());
+// int reduce = walletService.reduce(income, agentMember.getId(), "score");
+// if (reduce == 2) {
+// continue;
+// }
+//
+// walletService.add(income, agentMember.getId(), "commission");
+//
+// moneyFlowService.addMoneyFlow(agentMember.getId(), income, MoneyFlowTypeEnum.AGENT_BONUS.getValue(), null, FlowTypeEnum.COMMISSION.getValue());
+// moneyFlowService.addMoneyFlow(agentMember.getId(), income.negate(), MoneyFlowTypeEnum.AGENT_BONUS.getValue(), null, FlowTypeEnum.SCORE.getValue());
+ changeScoreAndCommission(agentMember.getId(), income, MoneyFlowTypeEnum.AGENT_BONUS.getValue(), null);
}
}
log.info("#####==代理分红==end==#####");
+ }
+
+ private BigDecimal changeScoreAndCommission(Long memberId, BigDecimal income, Integer type, String orderNo) {
+ Map<String, BigDecimal> map = new HashMap<>();
+ map.put("amount", income);
+
+ int reduce = walletService.reduce(income, memberId, "score", map);
+ if (reduce == 2) {
+ return BigDecimal.ZERO;
+ }
+
+ income = map.get("amount");
+ walletService.add(income, memberId, "commission");
+ moneyFlowService.addMoneyFlow(memberId, income, type, orderNo, FlowTypeEnum.COMMISSION.getValue());
+ moneyFlowService.addMoneyFlow(memberId, income.negate(), type, orderNo, FlowTypeEnum.SCORE.getValue());
+ return income;
}
@Override
@@ -317,22 +338,22 @@
BigDecimal rankBonusTotal = totalIncome.multiply(new BigDecimal(dic.getValue()).divide(new BigDecimal("100"), 2, RoundingMode.HALF_UP));
- BigDecimal preBonus = rankBonusTotal.divide(BigDecimal.valueOf(100),2 , RoundingMode.HALF_UP);
+ BigDecimal preBonus = rankBonusTotal.divide(BigDecimal.valueOf(100), 2, RoundingMode.HALF_UP);
int i = 0;
for (MallMember member : rankList) {
DataDictionaryCustom rank = rankAward.get(i);
i++;
BigDecimal bonus = preBonus.multiply(new BigDecimal(rank.getValue()));
- int reduce = walletService.reduce(bonus, member.getId(), "score");
- if (reduce == 2) {
- continue;
- }
+// int reduce = walletService.reduce(bonus, member.getId(), "score");
+// if (reduce == 2) {
+// continue;
+// }
+// walletService.add(bonus, member.getId(), "commission");
+// moneyFlowService.addMoneyFlow(member.getId(), bonus, MoneyFlowTypeEnum.RANK_BONUS.getValue(), null, FlowTypeEnum.COMMISSION.getValue());
+// moneyFlowService.addMoneyFlow(member.getId(), bonus.negate(), MoneyFlowTypeEnum.RANK_BONUS.getValue(), null, FlowTypeEnum.SCORE.getValue());
- walletService.add(bonus, member.getId(), "commission");
-
- moneyFlowService.addMoneyFlow(member.getId(), bonus, MoneyFlowTypeEnum.RANK_BONUS.getValue(), null, FlowTypeEnum.COMMISSION.getValue());
- moneyFlowService.addMoneyFlow(member.getId(), bonus.negate(), MoneyFlowTypeEnum.RANK_BONUS.getValue(), null, FlowTypeEnum.SCORE.getValue());
+ changeScoreAndCommission(member.getId(), bonus, MoneyFlowTypeEnum.RANK_BONUS.getValue(), null);
}
}
@@ -368,22 +389,22 @@
if (reduce == 2) {
continue;
}
-
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, child.getId(), "score");
- if (reduce1 == 2) {
- continue;
- }
-
- walletService.add(preProfit, child.getId(), "commission");
- moneyFlowService.addMoneyFlow(child.getId(), preProfit, MoneyFlowTypeEnum.THANKFUL.getValue(), null, mallMember.getId(), FlowTypeEnum.COMMISSION.getValue());
- moneyFlowService.addMoneyFlow(child.getId(), preProfit.negate(), MoneyFlowTypeEnum.THANKFUL.getValue(), null, mallMember.getId(), FlowTypeEnum.SCORE.getValue());
+// int reduce1 = walletService.reduce(preProfit, child.getId(), "score");
+// if (reduce1 == 2) {
+// continue;
+// }
+// walletService.add(preProfit, child.getId(), "commission");
+// moneyFlowService.addMoneyFlow(child.getId(), preProfit, MoneyFlowTypeEnum.THANKFUL.getValue(), null, mallMember.getId(), FlowTypeEnum.COMMISSION.getValue());
+// moneyFlowService.addMoneyFlow(child.getId(), preProfit.negate(), MoneyFlowTypeEnum.THANKFUL.getValue(), null, mallMember.getId(), FlowTypeEnum.SCORE.getValue());
+ changeScoreAndCommission(child.getId(), preProfit, MoneyFlowTypeEnum.THANKFUL.getValue(), null);
}
}
log.info("######==感恩奖==end==####");
@@ -413,14 +434,14 @@
continue;
}
- int reduce = walletService.reduce(pre, director.getId(), "score");
- if (reduce == 2) {
- continue;
- }
-
- walletService.add(pre, director.getId(), "commission");
- moneyFlowService.addMoneyFlow(director.getId(), pre, MoneyFlowTypeEnum.DIRECTOR_BONUS.getValue(), null, FlowTypeEnum.COMMISSION.getValue());
- moneyFlowService.addMoneyFlow(director.getId(), pre.negate(), MoneyFlowTypeEnum.DIRECTOR_BONUS.getValue(), null, FlowTypeEnum.SCORE.getValue());
+// int reduce = walletService.reduce(pre, director.getId(), "score");
+// if (reduce == 2) {
+// continue;
+// }
+// walletService.add(pre, director.getId(), "commission");
+// moneyFlowService.addMoneyFlow(director.getId(), pre, MoneyFlowTypeEnum.DIRECTOR_BONUS.getValue(), null, FlowTypeEnum.COMMISSION.getValue());
+// moneyFlowService.addMoneyFlow(director.getId(), pre.negate(), MoneyFlowTypeEnum.DIRECTOR_BONUS.getValue(), null, FlowTypeEnum.SCORE.getValue());
+ changeScoreAndCommission(director.getId(), pre, MoneyFlowTypeEnum.DIRECTOR_BONUS.getValue(), null);
}
}
@@ -436,17 +457,16 @@
continue;
}
- int reduce = walletService.reduce(pre, storeMaster.getId(), "score");
- if (reduce == 2) {
- continue;
- }
-
- walletService.add(pre, storeMaster.getId(), "commission");
- moneyFlowService.addMoneyFlow(storeMaster.getId(), pre, MoneyFlowTypeEnum.COMMUNITY_BONUS.getValue(), null, FlowTypeEnum.COMMISSION.getValue());
- moneyFlowService.addMoneyFlow(storeMaster.getId(), pre.negate(), MoneyFlowTypeEnum.COMMUNITY_BONUS.getValue(), null, FlowTypeEnum.SCORE.getValue());
+// int reduce = walletService.reduce(pre, storeMaster.getId(), "score");
+// if (reduce == 2) {
+// continue;
+// }
+// walletService.add(pre, storeMaster.getId(), "commission");
+// moneyFlowService.addMoneyFlow(storeMaster.getId(), pre, MoneyFlowTypeEnum.COMMUNITY_BONUS.getValue(), null, FlowTypeEnum.COMMISSION.getValue());
+// moneyFlowService.addMoneyFlow(storeMaster.getId(), pre.negate(), MoneyFlowTypeEnum.COMMUNITY_BONUS.getValue(), null, FlowTypeEnum.SCORE.getValue());
+ changeScoreAndCommission(storeMaster.getId(), pre, MoneyFlowTypeEnum.COMMUNITY_BONUS.getValue(), null);
}
}
-
log.info("#####==店补/董事==end==######");
}
}
--
Gitblit v1.9.1