From 9b58253767ba7f90313a46bdd93f28fef137cb7e Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Fri, 16 Sep 2022 11:51:15 +0800
Subject: [PATCH] 20220902

---
 src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallOrderInfoServiceImpl.java |   34 ++++++++++++++++++----------------
 1 files changed, 18 insertions(+), 16 deletions(-)

diff --git a/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallOrderInfoServiceImpl.java b/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallOrderInfoServiceImpl.java
index f9b0dc0..f152ab7 100644
--- a/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallOrderInfoServiceImpl.java
+++ b/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallOrderInfoServiceImpl.java
@@ -545,23 +545,25 @@
         if(CollUtil.isNotEmpty(mallOrderItemList)){
 
             MallTeamLeader mallTeamLeader = mallTeamLeaderMapper.selectLeaderByUniqueCode(orderInfo.getTakeUniqueCode());
+            Integer profitSwitch = mallTeamLeader.getProfitSwitch()==null?2:mallTeamLeader.getProfitSwitch();
             BigDecimal bonusPercent =new BigDecimal(mallTeamLeader.getBonusPercent()==null?"0":mallTeamLeader.getBonusPercent());
-//            DataDictionaryCustom dicBonusPercent = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(DataDictionaryEnum.BONUS_PERCENT.getType(), DataDictionaryEnum.BONUS_PERCENT.getCode());
-//            BigDecimal bonusPercent = new BigDecimal(dicBonusPercent.getValue()).setScale(2,BigDecimal.ROUND_DOWN);
-            for(MallOrderItem mallOrderItem : mallOrderItemList){
-                Integer state = mallOrderItem.getState() == null ? 1 : mallOrderItem.getState();
-                if(1 == state){
-                    MallLeaderAchieve mallLeaderAchieve = new MallLeaderAchieve();
-                    mallLeaderAchieve.setMemberId(orderInfo.getMemberId());
-                    mallLeaderAchieve.setOrderNo(orderInfo.getOrderNo());
-                    mallLeaderAchieve.setOrderItemId(mallOrderItem.getId());
-                    BigDecimal itemAmount = mallOrderItem.getAmount();
-                    mallLeaderAchieve.setAmount(itemAmount);
-                    BigDecimal bigDecimal = bonusPercent.multiply(itemAmount).setScale(2, BigDecimal.ROUND_DOWN);
-                    mallLeaderAchieve.setProfitAmount(bigDecimal);
-                    mallLeaderAchieve.setUniqueCode(orderInfo.getTakeUniqueCode());
-                    mallLeaderAchieve.setState(MallLeaderAchieve.STATE_ONE);
-                    mallLeaderAchieveMapper.insert(mallLeaderAchieve);
+
+            if(1 == profitSwitch){
+                for(MallOrderItem mallOrderItem : mallOrderItemList){
+                    Integer state = mallOrderItem.getState() == null ? 1 : mallOrderItem.getState();
+                    if(1 == state){
+                        MallLeaderAchieve mallLeaderAchieve = new MallLeaderAchieve();
+                        mallLeaderAchieve.setMemberId(orderInfo.getMemberId());
+                        mallLeaderAchieve.setOrderNo(orderInfo.getOrderNo());
+                        mallLeaderAchieve.setOrderItemId(mallOrderItem.getId());
+                        BigDecimal itemAmount = mallOrderItem.getAmount();
+                        mallLeaderAchieve.setAmount(itemAmount);
+                        BigDecimal bigDecimal = bonusPercent.multiply(itemAmount).setScale(2, BigDecimal.ROUND_DOWN);
+                        mallLeaderAchieve.setProfitAmount(bigDecimal);
+                        mallLeaderAchieve.setUniqueCode(orderInfo.getTakeUniqueCode());
+                        mallLeaderAchieve.setState(MallLeaderAchieve.STATE_ONE);
+                        mallLeaderAchieveMapper.insert(mallLeaderAchieve);
+                    }
                 }
             }
         }

--
Gitblit v1.9.1