From 7e96543ae18f8625abefcddc875ef8010d35b28a Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Sat, 11 Jun 2022 21:22:33 +0800
Subject: [PATCH] fix
---
src/main/java/cc/mrbird/febs/mall/service/impl/MemberProfitServiceImpl.java | 124 ++++++++++++++++++++++++++--------------
1 files changed, 80 insertions(+), 44 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 d9ca15a..f460d01 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
@@ -107,66 +107,100 @@
if (StrUtil.isBlank(member.getReferrerId())) {
return;
}
- DataDictionaryCustom dic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(DataDictionaryEnum.DYNAMIC_BONUS.getType(), DataDictionaryEnum.DYNAMIC_BONUS.getCode());
- DataDictionaryCustom indrectDic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(DataDictionaryEnum.INDRECT_BONUS.getType(), DataDictionaryEnum.INDRECT_BONUS.getCode());
- String parent = member.getReferrerId();
+ // 直推奖励字典
+ DataDictionaryCustom dic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(DataDictionaryEnum.DYNAMIC_BONUS.getType(), DataDictionaryEnum.DYNAMIC_BONUS.getCode());
+
+ // 直接父级
+ MallMember parent = mallMemberMapper.selectInfoByInviteId(member.getReferrerId());
+
List<MallOrderItem> items = mallOrderInfoMapper.getMallOrderItemByOrderId(orderId);
for (MallOrderItem item : items) {
// 减去成本后算收益
BigDecimal amount = item.getPrice().subtract(item.getCostPrice()).multiply(BigDecimal.valueOf(item.getCnt()));
-
- BigDecimal dynamicProfit = amount.divide(new BigDecimal(dic.getValue()), 2, RoundingMode.HALF_UP);
-
- List<String> parents = StrUtil.split(member.getReferrerIds(), ',');
- List<MallMember> members = mallMemberMapper.selectByInviteIds(parents);
- if (CollUtil.isEmpty(members)) {
- return;
+ if (amount.compareTo(BigDecimal.ZERO) < 1) {
+ continue;
}
- // 隔代比例
- BigDecimal indrectDicProp = new BigDecimal(indrectDic.getValue());
-
- // 隔代推荐奖
- BigDecimal direct = dynamicProfit.divide(indrectDicProp, 2, RoundingMode.HALF_UP);
- for (MallMember parentMember : members) {
- if (parent.equals(parentMember.getInviteId())) {
- continue;
- }
-
- if (direct.compareTo(BigDecimal.ONE) < 1) {
- break;
- }
-
- int reduce = walletService.reduce(direct, parentMember.getId(), "score");
- if (reduce == 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());
-
- direct = direct.divide(indrectDicProp, 2, RoundingMode.HALF_UP);
+ Integer isReturn = null;
+ if (item.getIsNormal() == 1) {
+ isReturn = 2;
}
+
+ // =======直推返利== start =====
+ // 直接奖励收益
+ BigDecimal dynamicProfit = amount.multiply(new BigDecimal(dic.getValue()).divide(new BigDecimal(100), 2, RoundingMode.HALF_UP));
if (dynamicProfit.compareTo(BigDecimal.ZERO) < 1) {
continue;
}
- int reduce = walletService.reduce(dynamicProfit, member.getId(), "score");
+ int reduce = walletService.reduce(dynamicProfit, parent.getId(), "score");
if (reduce == 2) {
continue;
}
- walletService.add(dynamicProfit, member.getId(), "commission");
+ walletService.add(dynamicProfit, parent.getId(), "commission");
- moneyFlowService.addMoneyFlow(member.getId(), dynamicProfit, MoneyFlowTypeEnum.DYNAMIC_ACHIEVE.getValue(), orderInfo.getOrderNo(), FlowTypeEnum.COMMISSION.getValue());
- moneyFlowService.addMoneyFlow(member.getId(), dynamicProfit.negate(), MoneyFlowTypeEnum.DYNAMIC_ACHIEVE.getValue(), orderInfo.getOrderNo(), FlowTypeEnum.SCORE.getValue());
+ moneyFlowService.addMoneyFlow(parent.getId(), dynamicProfit, MoneyFlowTypeEnum.DYNAMIC_ACHIEVE.getValue(), orderInfo.getOrderNo(), FlowTypeEnum.COMMISSION.getValue(), isReturn);
+ moneyFlowService.addMoneyFlow(parent.getId(), dynamicProfit.negate(), MoneyFlowTypeEnum.DYNAMIC_ACHIEVE.getValue(), orderInfo.getOrderNo(), FlowTypeEnum.SCORE.getValue());
+ // =======直推返利== end =====
+
+ // =======隔代奖== start =====
+ if (StrUtil.isBlank(parent.getReferrerId())) {
+ continue;
+ }
+
+ List<String> parents = StrUtil.split(parent.getReferrerIds(), ',');
+ List<MallMember> members = mallMemberMapper.selectByInviteIds(parents);
+ if (CollUtil.isEmpty(members)) {
+ return;
+ }
+
+ BigDecimal direct = dynamicProfit;
+ for (MallMember parentMember : members) {
+ if (parent.getInviteId().equals(parentMember.getInviteId())) {
+ continue;
+ }
+
+ // 直推数量
+ Integer directCnt = mallMemberMapper.selectOwnCntByInviteId(member.getReferrerId());
+ List<DataDictionaryCustom> dataDices = dataDictionaryCustomMapper.selectDicByType(DataDictionaryEnum.INDIRECT_BONUS_SETTING.getType());
+
+ directCnt = directCnt == null ? 0 :directCnt;
+
+ // 隔代比例
+ BigDecimal indrectDicProp = BigDecimal.ZERO;
+ for (DataDictionaryCustom dataDic : dataDices) {
+ JSONObject jsonObject = JSONObject.parseObject(dataDic.getValue());
+ if (directCnt >= jsonObject.getInteger("pushCnt")) {
+ indrectDicProp = jsonObject.getBigDecimal("prop");
+ }
+ }
+
+ // 隔代推荐奖 收益
+ direct = direct.divide(indrectDicProp, 2, RoundingMode.HALF_UP);
+
+ // direct 收益小于1，则跳出
+ if (direct.compareTo(BigDecimal.ONE) < 1) {
+ continue;
+ }
+
+ 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(), isReturn);
+ moneyFlowService.addMoneyFlow(parentMember.getId(), direct.negate(), MoneyFlowTypeEnum.RECOMMEND_BONUS.getValue(), orderInfo.getOrderNo(), FlowTypeEnum.SCORE.getValue());
+ }
+ // =======隔代奖== end =====
}
}
@Override
+ @Transactional(rollbackFor = Exception.class)
public void agentProfit(Date profitDate) {
log.info("#####==代理分红==start==#####");
if (profitDate == null) {
@@ -273,17 +307,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