From 55810dbe3aa36eb2bbcc4113eb2c85fc3b11b48d Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Thu, 02 Jun 2022 16:05:38 +0800
Subject: [PATCH] fix
---
src/main/java/cc/mrbird/febs/mall/service/impl/MemberProfitServiceImpl.java | 97 ++++++++++++++++++++++++++++++++++--------------
1 files changed, 68 insertions(+), 29 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 7fab9d0..b2e2e65 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,62 +107,101 @@
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()));
+ if (amount.compareTo(BigDecimal.ZERO) < 1) {
+ continue;
+ }
+ Integer isReturn = null;
+ if (item.getIsNormal() == 1) {
+ isReturn = 2;
+ }
+
+ // =======直推返利== start =====
+ // 直接奖励收益
BigDecimal dynamicProfit = amount.divide(new BigDecimal(dic.getValue()), 2, RoundingMode.HALF_UP);
- List<String> parents = StrUtil.split(member.getReferrerIds(), ',');
+ if (dynamicProfit.compareTo(BigDecimal.ZERO) < 1) {
+ continue;
+ }
+
+ 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(), 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 indrectDicProp = new BigDecimal(indrectDic.getValue());
-
- // 隔代推荐奖
- BigDecimal direct = dynamicProfit.divide(indrectDicProp, 2, RoundingMode.HALF_UP);
+ BigDecimal direct = dynamicProfit;
for (MallMember parentMember : members) {
- if (parent.equals(parentMember.getInviteId())) {
+ if (parent.getInviteId().equals(parentMember.getInviteId())) {
continue;
}
- int reduce = walletService.reduce(direct, parentMember.getId(), "score");
- if (reduce == 2) {
+ // 直推数量
+ Integer directCnt = mallMemberMapper.selectOwnCntByInviteId(member.getReferrerId());
+ List<DataDictionaryCustom> dataDices = dataDictionaryCustomMapper.selectDicByType(DataDictionaryEnum.INDIRECT_BONUS_SETTING.getType());
+
+ directCnt = directCnt == null ? 0 :directCnt;
+ // 隔代字典
+ DataDictionaryCustom indrectDic = new DataDictionaryCustom();
+ for (DataDictionaryCustom dataDic : dataDices) {
+ if (directCnt > Integer.parseInt(dataDic.getValue())) {
+ indrectDic = dataDic;
+ }
+ }
+
+ // 隔代比例
+ BigDecimal indrectDicProp = new BigDecimal(indrectDic.getValue());
+
+ // 隔代推荐奖 收益
+ 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());
+ 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());
-
- if (direct.compareTo(BigDecimal.ONE) < 1) {
- break;
- }
- direct = direct.divide(indrectDicProp, 2, RoundingMode.HALF_UP);
}
-
- int reduce = walletService.reduce(dynamicProfit, member.getId(), "score");
- if (reduce == 2) {
- continue;
- }
-
- walletService.add(dynamicProfit, member.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());
+ // =======隔代奖== end =====
}
}
@Override
+ @Transactional(rollbackFor = Exception.class)
public void agentProfit(Date profitDate) {
log.info("#####==代理分红==start==#####");
if (profitDate == null) {
--
Gitblit v1.9.1