From bcffc7b5e9ece6061192c815af12e3981ff2dbb2 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Sat, 28 May 2022 20:09:43 +0800
Subject: [PATCH] add yunfei

---
 src/main/java/cc/mrbird/febs/mall/service/impl/MemberProfitServiceImpl.java |   67 +++++++++++++++++++++------------
 1 files changed, 42 insertions(+), 25 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..42b04dd 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,39 +107,68 @@
         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());
+        // 直接父级
+        MallMember parent = mallMemberMapper.selectInfoByInviteId(member.getReferrerId());
 
-        String parent = 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;
+            }
 
+            // =======直推返利== 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());
+            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);
+
+            // direct 收益小于1,则跳出
+            if (direct.compareTo(BigDecimal.ONE) < 1) {
+                continue;
+            }
+
             for (MallMember parentMember : members) {
-                if (parent.equals(parentMember.getInviteId())) {
+                if (parent.getInviteId().equals(parentMember.getInviteId())) {
                     continue;
                 }
 
-                if (direct.compareTo(BigDecimal.ONE) < 1) {
-                    break;
-                }
-
-                int reduce =  walletService.reduce(direct, parentMember.getId(), "score");
-                if (reduce == 2) {
+                int reduceResult =  walletService.reduce(direct, parentMember.getId(), "score");
+                if (reduceResult == 2) {
                     continue;
                 }
 
@@ -149,24 +178,12 @@
 
                 direct = direct.divide(indrectDicProp, 2, RoundingMode.HALF_UP);
             }
-
-            if (dynamicProfit.compareTo(BigDecimal.ZERO) < 1) {
-                continue;
-            }
-
-            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