From 05c40a68b5664c5ed41dbaa57ba30f0c73757b26 Mon Sep 17 00:00:00 2001
From: Hentua <wangdoubleone@gmail.com>
Date: Tue, 25 Apr 2023 11:10:48 +0800
Subject: [PATCH] fix

---
 src/main/java/cc/mrbird/febs/mall/service/impl/MemberProfitServiceImpl.java |  608 +++++++++++++++++++++----------------------------------
 1 files changed, 232 insertions(+), 376 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 350ebad..55bb1e4 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
@@ -1,28 +1,17 @@
 package cc.mrbird.febs.mall.service.impl;
 
 import cc.mrbird.febs.common.enumerates.*;
-import cc.mrbird.febs.common.utils.AppContants;
-import cc.mrbird.febs.common.utils.MallUtils;
 import cc.mrbird.febs.common.utils.RedisUtils;
-import cc.mrbird.febs.mall.dto.ScorePoorDto;
 import cc.mrbird.febs.mall.entity.*;
 import cc.mrbird.febs.mall.mapper.*;
 import cc.mrbird.febs.mall.service.*;
-import cc.mrbird.febs.mall.vo.AdminTeamEqualsPerkVo;
 import cc.mrbird.febs.rabbit.producter.AgentProducer;
 import cn.hutool.core.collection.CollUtil;
-import cn.hutool.core.date.DateField;
-import cn.hutool.core.date.DateTime;
-import cn.hutool.core.date.DateUnit;
-import cn.hutool.core.date.DateUtil;
-import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.core.util.RandomUtil;
 import cn.hutool.core.util.StrUtil;
-import cn.hutool.json.JSONUtil;
 import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import io.swagger.models.auth.In;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import lombok.Data;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
@@ -31,7 +20,6 @@
 import java.math.BigDecimal;
 import java.math.RoundingMode;
 import java.util.*;
-import java.util.stream.Collectors;
 
 /**
  * @author wzy
@@ -45,118 +33,11 @@
     private final MallMemberMapper mallMemberMapper;
     private final MallOrderInfoMapper mallOrderInfoMapper;
     private final MallOrderItemMapper mallOrderItemMapper;
-    private final MallGoodsMapper mallGoodsMapper;
     private final IApiMallMemberWalletService walletService;
     private final IMallMoneyFlowService moneyFlowService;
     private final DataDictionaryCustomMapper dataDictionaryCustomMapper;
-    private final MallMoneyFlowMapper mallMoneyFlowMapper;
-    private final MallAchieveRecordMapper mallAchieveRecordMapper;
-    private final RedisUtils redisUtils;
-    private final MallMemberWalletMapper mallMemberWalletMapper;
-    private final IAgentService iAgentService;
-    private final IMallMoneyFlowService mallMoneyFlowService;
-    private final MallMqRecordMapper mallMqRecordMapper;
-    private final AgentProducer agentProducer;
-    private final MallScoreRecordMapper mallScoreRecordMapper;
-    private final MallScoreAchieveReleaseMapper mallScoreAchieveReleaseMapper;
-    private final MallScoreVoucherMapper mallScoreVoucherMapper;
 
     private final MallSystemSettingMapper mallSystemSettingMapper;
-
-    @Override
-    @Transactional(rollbackFor = Exception.class)
-    public void staticProfit(Date profitDate) {
-        log.info("#####静态分红开始运行:{}#####", new Date());
-        List<MallMember> members = mallMemberMapper.selectList(null);
-        if (CollUtil.isEmpty(members)) {
-            return;
-        }
-
-        /**
-         *
-         */
-        if (profitDate == null) {
-            profitDate = DateUtil.offset(new Date(), DateField.DAY_OF_YEAR, -1);
-        }
-        // 套餐业绩
-//        BigDecimal tcIncome = mallOrderInfoMapper.selectTotalAmountUnCostForDate(profitDate, null, "D", 2);
-        // 普通商品业绩
-//        BigDecimal normalIncome = mallOrderInfoMapper.selectTotalAmountUnCostForDate(profitDate, null, "D", 1);
-        //今日总业绩
-        BigDecimal totalIncome = mallAchieveRecordMapper.selectAchieveTotal("D", profitDate);
-
-        if (totalIncome.compareTo(BigDecimal.ZERO) == 0) {
-            return;
-        }
-
-        DataDictionaryCustom dic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(DataDictionaryEnum.STATIC_BONUS.getType(), DataDictionaryEnum.STATIC_BONUS.getCode());
-        BigDecimal perProfit = totalIncome.multiply(new BigDecimal(dic.getValue()).divide(BigDecimal.valueOf(100), 2, RoundingMode.HALF_UP));
-
-        Map<Long, List<Map<String, Object>>> map = new HashMap<>();
-        Map<Long, BigDecimal> goodsProp = new HashMap<>();
-        for (MallMember member : members) {
-            List<MallGoods> goodsList = mallGoodsMapper.selectOrderGoodsList(member.getId(), profitDate);
-
-            if (CollUtil.isEmpty(goodsList)) {
-                continue;
-            }
-
-            for (MallGoods goods : goodsList) {
-                if (goods.getIsNormal() == 1) {
-                    continue;
-                }
-
-                List<Map<String, Object>> list = map.get(goods.getId());
-                if (CollUtil.isEmpty(list)) {
-                    list = new ArrayList<>();
-                }
-
-                Map<String, Object> listItem = new HashMap<>();
-                listItem.put("memberId", member.getId());
-                listItem.put("orderNo", goods.getOrderNo());
-                list.add(listItem);
-
-                map.put(goods.getId(), list);
-                goodsProp.put(goods.getId(), goods.getStaticProp());
-            }
-        }
-
-        if (!map.isEmpty()) {
-            for (Map.Entry<Long, List<Map<String, Object>>> entry : map.entrySet()) {
-                List<Map<String, Object>> list = entry.getValue();
-                BigDecimal staticProfit = goodsProp.get(entry.getKey()).divide(new BigDecimal("100"), 2, RoundingMode.HALF_UP).multiply(perProfit);
-                BigDecimal preStaticProfit = staticProfit.divide(new BigDecimal(list.size()), 2, RoundingMode.HALF_UP);
-
-                for (Map<String, Object> item : list) {
-//                    Long memberId = (Long) item.get("memberId");
-                    String orderNo = (String) item.get("orderNo");
-                    changeAllScoreAndCommission(preStaticProfit,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());
-//                    changeScoreAndCommission(memberId, preStaticProfit, MoneyFlowTypeEnum.STATIC_BONUS.getValue(), orderNo);
-                }
-            }
-        }
-    }
-
-    public void changeAllScoreAndCommission(BigDecimal preStaticProfit,String orderNo){
-        List<MallMember> members = mallMemberMapper.selectList(null);
-        for(MallMember mallMember : members){
-            changeScoreAndCommission(mallMember.getId(), preStaticProfit, MoneyFlowTypeEnum.STATIC_BONUS.getValue(), orderNo);
-        }
-    }
-
-    @Override
-    public void dynamicProfit(Long orderId) {
-//        return;
-        dynamicProfit(orderId, 2);
-    }
 
     /**
      * 直推收益
@@ -168,6 +49,7 @@
      * @param orderId
      */
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public void directProfit(Long orderId) {
         log.info("######直推奖励, 订单ID:{}######", orderId);
         MallOrderInfo orderInfo = mallOrderInfoMapper.selectById(orderId);
@@ -175,16 +57,28 @@
             log.info("积分订单无返利");
             return;
         }
-        BigDecimal indirectPer = BigDecimal.valueOf(0.2);
-        BigDecimal indirectPer2 = BigDecimal.valueOf(0.15);
 
         MallMember member = mallMemberMapper.selectById(orderInfo.getMemberId());
 
         // 父级会员
         MallMember parentMember = mallMemberMapper.selectInfoByInviteId(member.getReferrerId());
+        if (parentMember == null) {
+            return;
+        }
+
+        if (parentMember.getAccountLevel() == 0 || MemberLevelEnum.ZERO_LEVEL.getType().equals(parentMember.getLevel())) {
+            log.info("上级:{}未购买会员套餐,无返利", parentMember.getInviteId());
+            return;
+        }
+
+        // 非代理推代理,非代理上级拿的收益比例
+        DataDictionaryCustom indirectPerDic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(DataDictionaryEnum.UNAGENT_TO_AGENT_PARENT.getType(), DataDictionaryEnum.UNAGENT_TO_AGENT_PARENT.getCode());
+
+        // 非代理推代理,非代理的直推收益比例
+        DataDictionaryCustom unAgentDirectDic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(DataDictionaryEnum.UNAGENT_TO_AGENT.getType(), DataDictionaryEnum.UNAGENT_TO_AGENT.getCode());
 
         // 父级会员直推人数
-        Integer directCnt = mallMemberMapper.selectOwnCntByInviteId(parentMember.getInviteId());
+        Integer directCnt = mallMemberMapper.selectOwnCntByInviteIdAndAccountLevel(parentMember.getInviteId(), parentMember.getAccountLevel());
         List<DataDictionaryCustom> dataDices = dataDictionaryCustomMapper.selectDicByType(DataDictionaryEnum.DIRECT_BONUS_SETTING.getType());
 
         directCnt = directCnt == null ? 0 : directCnt;
@@ -194,6 +88,9 @@
             return;
         }
 
+        // 推荐奖比例
+        DataDictionaryCustom indrectDicPropDic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(DataDictionaryEnum.RECOMMEND_BONUS.getType(), DataDictionaryEnum.RECOMMEND_BONUS.getCode());
+
         for (MallOrderItem item : items) {
             // 减去成本后算收益
             BigDecimal amount = item.getPrice().subtract(item.getCostPrice()).multiply(BigDecimal.valueOf(item.getCnt()));
@@ -201,6 +98,7 @@
                 continue;
             }
 
+            // ----- 直推奖 start -------
             // 直推返利比例
             BigDecimal profitPer = BigDecimal.ZERO;
             int isSameLevel = 0;
@@ -223,28 +121,21 @@
                     isSameLevel = 1;
                     // 非代理推代理/非股东推股东
                 } else {
-                    profitPer = BigDecimal.valueOf(0.1);
+                    profitPer = new BigDecimal(unAgentDirectDic.getValue());
                     isSameLevel = 2;
                 }
             }
 
             // 直推奖
             BigDecimal profit = amount.multiply(profitPer.divide(new BigDecimal(100), 2, RoundingMode.HALF_UP));
-            changeScoreAndCommission(parentMember.getId(), profit, MoneyFlowTypeEnum.DYNAMIC_ACHIEVE.getValue(), orderInfo.getOrderNo());
-
-            // 代理推代理
-            if (isSameLevel == 1) {
-                MallMember doubleParentMember = mallMemberMapper.selectInfoByInviteId(parentMember.getReferrerId());
-                if (doubleParentMember == null) {
-                    continue;
-                }
-
-                BigDecimal doubleParentProfit = profit.multiply(indirectPer);
-                changeScoreAndCommission(doubleParentMember.getId(), doubleParentProfit, MoneyFlowTypeEnum.RECOMMEND_BONUS.getValue(), orderInfo.getOrderNo());
-            }
+            changeScoreAndCommission(parentMember.getId(), profit, MoneyFlowTypeEnum.DIRECT_BONUS.getValue(), orderInfo.getOrderNo());
 
             // 非代理推代理
             if (isSameLevel == 2) {
+                if (StrUtil.isBlank(parentMember.getReferrerIds())) {
+                    continue;
+                }
+
                 List<MallMember> mallMembers = mallMemberMapper.selectParentMemberList(StrUtil.split(parentMember.getReferrerIds(), ','), parentMember.getReferrerId(), 2);
                 if (CollUtil.isEmpty(mallMembers)) {
                     continue;
@@ -255,10 +146,48 @@
                         break;
                     }
 
-                    BigDecimal doubleParentProfit = profit.multiply(indirectPer2);
-                    changeScoreAndCommission(mallMember.getId(), doubleParentProfit, MoneyFlowTypeEnum.RECOMMEND_BONUS.getValue(), orderInfo.getOrderNo());
+                    BigDecimal doubleParentProfit = profit.multiply(new BigDecimal(indirectPerDic.getValue()));
+                    changeScoreAndCommission(mallMember.getId(), doubleParentProfit, MoneyFlowTypeEnum.DIRECT_BONUS.getValue(), orderInfo.getOrderNo());
                 }
             }
+            // ----- 直推奖 end -------
+
+            // =======隔代奖== start =====
+            if (StrUtil.isBlank(parentMember.getReferrerId())) {
+                continue;
+            }
+
+            List<String> parents = StrUtil.split(parentMember.getReferrerIds(), ',');
+            List<MallMember> members = mallMemberMapper.selectByInviteIds(parents);
+            if (CollUtil.isEmpty(members)) {
+                return;
+            }
+
+            BigDecimal direct = profit;
+            for (MallMember parent : members) {
+                if (parent.getInviteId().equals(parentMember.getInviteId())) {
+                    continue;
+                }
+
+                BigDecimal indrectDicProp = new BigDecimal(indrectDicPropDic.getValue());
+
+                // 隔代推荐奖 收益
+                direct = direct.multiply(indrectDicProp.divide(new BigDecimal("100"), 2, RoundingMode.HALF_UP));
+
+                // direct 收益小于1,则跳出
+                if (direct.compareTo(BigDecimal.valueOf(0.01)) < 1) {
+                    break;
+                }
+                int reduceResult = walletService.reduce(direct, parent.getId(), "score");
+                if (reduceResult == 2) {
+                    continue;
+                }
+
+                walletService.add(direct, parent.getId(), "commission");
+                moneyFlowService.addMoneyFlow(parent.getId(), direct, MoneyFlowTypeEnum.RECOMMEND_BONUS.getValue(), orderInfo.getOrderNo(), FlowTypeEnum.COMMISSION.getValue());
+                moneyFlowService.addMoneyFlow(parent.getId(), direct.negate(), MoneyFlowTypeEnum.RECOMMEND_BONUS.getValue(), orderInfo.getOrderNo(), FlowTypeEnum.SCORE.getValue());
+            }
+            // =======隔代奖== end =====
         }
     }
 
@@ -321,7 +250,7 @@
 //            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());
+//            dynamicProfit = changeScoreAndCommission(parent.getId(), dynamicProfit, MoneyFlowTypeEnum.DYNAMIC_ACHIEVE.getValue(), orderInfo.getOrderNo());
             if (dynamicProfit.compareTo(BigDecimal.ZERO) < 1) {
                 continue;
             }
@@ -374,7 +303,7 @@
 //                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());
+//                changeScoreAndCommission(parentMember.getId(), direct, MoneyFlowTypeEnum.RECOMMEND_BONUS.getValue(), orderInfo.getOrderNo());
             }
             // =======隔代奖== end =====
         }
@@ -382,10 +311,48 @@
 
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public void agentProfit() {
-        log.info("#####==代理分红==start==#####");
+    public void agentProfit(Integer type) {
+        log.info("#####==代理分红--{}==start==#####", type);
+        if (type == null) {
+            return;
+        }
+        
+        MallSystemSetting systemSetting = mallSystemSettingMapper.selectById(1L);
+        if (systemSetting == null) {
+            log.info("没有系统配置");
+            return;
+        }
 
-        log.info("#####==代理分红==end==#####");
+        BigDecimal hundred = BigDecimal.valueOf(100);
+        DataDictionaryCustom dic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(DataDictionaryEnum.AGENT_BONUS_RELEASE.getType(), DataDictionaryEnum.AGENT_BONUS_RELEASE.getCode());
+        if (dic == null || StrUtil.isBlank(dic.getValue()) || Integer.parseInt(dic.getValue()) == 0) {
+            log.info("不进行代理分红");
+            return;
+        }
+
+        // 代理
+        BigDecimal waitToBonus = systemSetting.getAgentBonus().multiply(new BigDecimal(dic.getValue()).divide(hundred, 2, RoundingMode.HALF_UP));
+
+        // 代理
+        List<MallMember> mallMembers = mallMemberMapper.selectAgentOrPartnetMemberList(type);
+        if (CollUtil.isEmpty(mallMembers) || waitToBonus.compareTo(BigDecimal.ZERO) < 1) {
+            log.info("待分红金额不足或会员不足");
+            return;
+        }
+
+        BigDecimal perBonus = waitToBonus.divide(new BigDecimal(mallMembers.size()), 2, RoundingMode.HALF_UP);
+        mallMembers.forEach(item -> {
+            changeScoreAndCommission(item.getId(), perBonus, type.equals(AccountLevelEnums.VVIP.getLevel()) ? MoneyFlowTypeEnum.AGENT_BONUS.getValue() : MoneyFlowTypeEnum.PARTNER_BONUS.getValue(), null);
+        });
+
+        if (type.equals(AccountLevelEnums.VVIP.getLevel())) {
+            changeSystemBonus(null, waitToBonus,null);
+        } else {
+            changeSystemBonus(null, null, waitToBonus);
+        }
+
+        bonusRecord(waitToBonus, type, null, null);
+        log.info("#####==代理分红 -- {}==end==#####", type);
     }
 
     private BigDecimal changeScoreAndCommission(Long memberId, BigDecimal income, Integer type, String orderNo) {
@@ -402,232 +369,6 @@
         moneyFlowService.addMoneyFlow(memberId, income, type, orderNo, FlowTypeEnum.COMMISSION.getValue());
         moneyFlowService.addMoneyFlow(memberId, income.negate(), type, orderNo, FlowTypeEnum.SCORE.getValue());
         return income;
-    }
-
-    @Override
-    public void scorePool() {
-        log.info("#####==积分池==start==######");
-
-        String redisKey = "scorePool";
-//        List<MallOrderInfo> mallOrderInfos = mallOrderInfoMapper.selectList(new QueryWrapper<>());
-//        if(CollUtil.isEmpty(mallOrderInfos)){
-//            redisUtils.set(redisKey,0,0L);
-//            return;
-//        }
-        /**
-         * 后一天2点,结算前一天的所有消费
-         * 积分池增加每日消费的10%
-         * 每天释放1%,给全体用户
-         */
-        //前一天的所有消费的10%
-        DataDictionaryCustom dic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(DataDictionaryEnum.SCORE_POOR_RADIO.getType(), DataDictionaryEnum.SCORE_POOR_RADIO.getCode());
-        if(ObjectUtil.isEmpty(dic)){
-            return;
-        }
-        ScorePoorDto scorePoorDto = JSONUtil.toBean(dic.getValue(), ScorePoorDto.class);
-        BigDecimal everydayRatio = scorePoorDto.getEverydayRatio().multiply(new BigDecimal(0.01));
-        BigDecimal dividEquallyRatio = scorePoorDto.getDividEquallyRatio().multiply(new BigDecimal(0.01));
-
-        Date date = DateUtil.offsetDay(new Date(), -1);
-        BigDecimal totalAmount = mallOrderInfoMapper.selectTotalAmountByPayDoneAndDataString(1, date);
-        BigDecimal multiplyTotalAmount = totalAmount.multiply(everydayRatio);
-        String scorePoolRedis = redisUtils.getString(redisKey);
-        if(StrUtil.isBlank(scorePoolRedis)){
-            redisUtils.set(redisKey,0,0L);
-        }
-
-        BigDecimal scorePoolOld = new BigDecimal(redisUtils.getString(redisKey));
-        BigDecimal scorePoolNew = scorePoolOld.add(multiplyTotalAmount);
-
-        //每天释放1%给全体用户
-        BigDecimal scorePoolToDay = scorePoolNew.multiply(dividEquallyRatio);
-
-        redisUtils.set(redisKey,scorePoolNew.subtract(scorePoolToDay).intValue(),0L);
-
-        QueryWrapper<MallMember> formalMember = new QueryWrapper<>();
-        formalMember.ne("level", AgentLevelEnum.ZERO_LEVEL.name());
-        List<MallMember> mallMembers = mallMemberMapper.selectList(formalMember);
-        int cnt = 0;
-        if(CollUtil.isNotEmpty(mallMembers)){
-            BigDecimal income = new BigDecimal(scorePoolToDay.divide(new BigDecimal(mallMembers.size()), 2, RoundingMode.HALF_UP).intValue());
-            if(income.compareTo(BigDecimal.ZERO) < 1){
-                return;
-            }
-            for(MallMember mallMember : mallMembers){
-                /*
-                平分成佣金,一比一减少赠送积分
-                如果没有赠送积分,则平分0
-                 */
-                BigDecimal outCome = BigDecimal.ZERO;
-                MallMemberWallet mallMemberWallet = mallMemberWalletMapper.selectWalletByMemberId(mallMember.getId());
-                if(mallMemberWallet.getScore().compareTo(BigDecimal.ZERO) < 1){
-                    continue;
-                }
-                if(mallMemberWallet.getScore().compareTo(income) < 0){
-                    outCome = new BigDecimal(mallMemberWallet.getScore().intValue());
-                }else{
-                    outCome = income;
-                }
-                walletService.add(outCome, mallMember.getId(), "commission");
-                walletService.reduce(outCome, mallMember.getId(), "score");
-                moneyFlowService.addMoneyFlow(mallMember.getId(), outCome, MoneyFlowTypeEnum.SCORE_POOL.getValue(), null, FlowTypeEnum.COMMISSION.getValue());
-                moneyFlowService.addMoneyFlow(mallMember.getId(), outCome.negate(), MoneyFlowTypeEnum.SCORE_POOL.getValue(), null, FlowTypeEnum.SCORE.getValue());
-                cnt ++;
-            }
-        }
-        log.info("#####==积分池==end==######;" +
-                "今日新增积分:" + multiplyTotalAmount.setScale(2, RoundingMode.HALF_UP)
-                +";平分积分数量:"+scorePoolToDay.setScale(2, RoundingMode.HALF_UP)
-                +";人数:"+cnt);
-    }
-
-    @Override
-    @Transactional(rollbackFor = Exception.class)
-    public void selaHalfVoucher(String price) {
-        /**
-         * 获取所有凭证大于0的用户
-         * 当前价格卖出账户的一半凭证
-         */
-        BigDecimal scorePrice = new BigDecimal(price == null ? "0" : price);
-        if(scorePrice.compareTo(BigDecimal.ZERO) <= 0){
-            return;
-        }
-        List<MallMemberWallet> mallMemberWallets = mallMemberWalletMapper.selectList(null);
-        if(CollUtil.isNotEmpty(mallMemberWallets)){
-            List<MallMemberWallet> wallets = mallMemberWallets
-                    .stream()
-                    .filter(mallMemberWallet -> mallMemberWallet.getVoucherCnt().compareTo(BigDecimal.ZERO) > 0)
-                    .collect(Collectors.toList());
-            if(CollUtil.isNotEmpty(wallets)){
-                BigDecimal scorePoolCntAdd = BigDecimal.ZERO;
-                //绿色积分剩余数量
-                for(MallMemberWallet mallMemberWallet : wallets){
-                    //增加账户的凭证金额,减少当前的一半的凭证数量
-                    BigDecimal voucherCnt = mallMemberWallet.getVoucherCnt().divide(new BigDecimal(2), 2, BigDecimal.ROUND_DOWN)
-                            .setScale(2,BigDecimal.ROUND_DOWN);
-                    BigDecimal voucherAmountAdd = scorePrice.multiply(voucherCnt)
-                            .setScale(2,BigDecimal.ROUND_DOWN);
-                    mallMemberWalletMapper.addVorCherAmountAndCntById(voucherAmountAdd,voucherCnt,mallMemberWallet.getId());
-
-                    scorePoolCntAdd = scorePoolCntAdd.add(voucherCnt);
-
-                    DataDictionaryCustom surplusCntDic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(
-                            GreenScoreEnum.SURPLUS_CNT.getType(),
-                            GreenScoreEnum.SURPLUS_CNT.getCode()
-                    );
-                    //增加绿色积分剩余数量
-                    BigDecimal surplusCnt = new BigDecimal(surplusCntDic.getValue() == null ? "0" : surplusCntDic.getValue());
-                    BigDecimal voucherCntAdd = surplusCnt.add(voucherCnt).setScale(2,BigDecimal.ROUND_DOWN);
-                    surplusCntDic.setValue(voucherCntAdd.toString());
-                    dataDictionaryCustomMapper.updateById(surplusCntDic);
-
-                    /**
-                     * 生成一条卖出记录
-                     */
-                    String voucherNo = MallUtils.getOrderNum("VS");
-                    MallScoreVoucher mallScoreVoucher = new MallScoreVoucher();
-                    mallScoreVoucher.setVoucherNo(voucherNo);
-                    mallScoreVoucher.setMemberId(mallMemberWallet.getMemberId());
-                    mallScoreVoucher.setVoucherCnt(voucherCnt);
-                    mallScoreVoucher.setPrice(scorePrice);
-                    mallScoreVoucher.setVoucherAmount(voucherAmountAdd);
-                    mallScoreVoucher.setType("S");
-                    mallScoreVoucherMapper.insert(mallScoreVoucher);
-
-                    //产生一条流水记录
-                    mallMoneyFlowService.addMoneyFlow(
-                            mallMemberWallet.getMemberId(),
-                            voucherAmountAdd,
-                            MoneyFlowTypeEnum.VOUCHER_SALE.getValue(),
-                            voucherNo,
-                            FlowTypeEnum.BALANCE.getValue());
-                }
-
-                //增加积分凭证池的凭证数量
-                DataDictionaryCustom scorePoolCntDic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(
-                        GreenScoreEnum.SCORE_POOL_CNT.getType(),
-                        GreenScoreEnum.SCORE_POOL_CNT.getCode()
-                );
-                //增加绿色积分剩余数量
-                BigDecimal scorePoolCnt = new BigDecimal(scorePoolCntDic.getValue() == null ? "0" : scorePoolCntDic.getValue());
-                scorePoolCnt = scorePoolCnt.add(scorePoolCntAdd);
-                scorePoolCntDic.setValue(scorePoolCnt.toString());
-                dataDictionaryCustomMapper.updateById(scorePoolCntDic);
-            }
-        }
-    }
-
-    /**
-     * 给用户的增加凭证数据,并且增加流水
-     * @param memberAchieveRelease 释放数量
-     * @param memberId 用户ID
-     * @param Type 流水类型
-     * @param flowNo 流水编号
-     */
-    private void releaseToMemberAndAddFlow(BigDecimal memberAchieveRelease,Long memberId,int Type,String flowNo){
-        //释放到用户的账户
-        mallMemberWalletMapper.addVorCherCntByMemberId(memberAchieveRelease,memberId);
-        //产生一条流水记录 TODO 需要去掉注释
-        mallMoneyFlowService.addMoneyFlow(
-                memberId,
-                memberAchieveRelease,
-                Type,
-                flowNo,
-                FlowTypeEnum.VOUCHER_CNT.getValue());
-    }
-
-    /**
-     *  根据星级等级和占比,给该星级的用户释放凭证
-     * @param levelAchieveRelease
-     * @param level
-     * @param percent
-     * @return
-     */
-    private BigDecimal releaseByLevel(BigDecimal levelAchieveRelease,String level,BigDecimal percent,String scoreNo){
-        //实际支付的凭证数量
-        BigDecimal levelReleaseReal = BigDecimal.ZERO;
-        //当前星级的人数
-        List<MallMember> levelMembers = mallMemberMapper.selectMemberWithLevel(level);
-        if(CollUtil.isNotEmpty(levelMembers)){
-            //这个星级该获得的凭证数量 = 总数 * 比例
-            BigDecimal levelReleaseCnt = levelAchieveRelease.multiply(percent).setScale(2, BigDecimal.ROUND_DOWN);
-            if(levelReleaseCnt.compareTo(BigDecimal.ZERO) > 0){
-                //每个人获得的数量
-                BigDecimal levelRelease = levelReleaseCnt.divide(new BigDecimal(levelMembers.size()), 2, BigDecimal.ROUND_DOWN);
-                if(levelRelease.compareTo(BigDecimal.ZERO) > 0){
-                    for(MallMember mallMember : levelMembers){
-                        releaseToMemberAndAddFlow(levelRelease,mallMember.getId(),MoneyFlowTypeEnum.ACHIEVE_RELEASE_SCORE_XJ.getValue(),scoreNo);
-                        levelReleaseReal.add(levelRelease);
-                    }
-                }
-            }
-        }
-        return levelReleaseReal;
-    }
-
-    /**
-     * 获取每日最大产生的凭证数量
-     * @return
-     */
-    private BigDecimal getAchieveDailyRelease(){
-        DataDictionaryCustom achieveReleasePercentDic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(
-                GreenScoreEnum.ACHIEVE_RELEASE_PERCENT.getType(),
-                GreenScoreEnum.ACHIEVE_RELEASE_PERCENT.getCode()
-        );
-        BigDecimal achieveReleasePercent = new BigDecimal(achieveReleasePercentDic.getValue() == null ? "0" : achieveReleasePercentDic.getValue())
-                .multiply(new BigDecimal(0.0001));
-
-
-        DataDictionaryCustom totalCntDic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(
-                GreenScoreEnum.TOTAL_CNT.getType(),
-                GreenScoreEnum.TOTAL_CNT.getCode()
-        );
-        //总凭证数量
-        BigDecimal totalCnt = new BigDecimal(totalCntDic.getValue() == null ? "0" : totalCntDic.getValue()).multiply(new BigDecimal(0.9));
-
-        //获取每日最大产生的凭证数量
-        BigDecimal achieveRelease = totalCnt.multiply(achieveReleasePercent);
-        return achieveRelease;
     }
 
     @Override
@@ -648,7 +389,7 @@
 
         // 全网分红
         BigDecimal waitToBonus = systemSetting.getAllBonus().multiply(new BigDecimal(dic.getValue()).divide(hundred, 2, RoundingMode.HALF_UP));
-        List<MallMember> mallMembers = mallMemberMapper.selectMemberAfterLevelList(MemberLevelEnums.FIRST_LEVEL_Y.getCode());
+        List<MallMember> mallMembers = mallMemberMapper.selectMemberAfterLevelList(MemberLevelEnum.FIRST_LEVEL.getType());
         if (CollUtil.isEmpty(mallMembers) || waitToBonus.compareTo(BigDecimal.ZERO) < 1) {
             log.info("待分红金额不足或会员不足");
             return;
@@ -668,7 +409,14 @@
         Map<String, List<MallMember>> levelMemberMap = new HashMap<>();
         // TODO 并发处理
         mallMembers.forEach(item -> {
-            List<MallMember> memberList = levelMemberMap.get(item.getLevel());
+            String level = item.getLevel();
+
+            // 全网分红 -- 代理和股东当作是女王殿下级别
+            if (MemberLevelEnum.getLevelCode(level) > MemberLevelEnum.FOUR_LEVEL.getCode()) {
+                level = MemberLevelEnum.FOUR_LEVEL.getType();
+            }
+
+            List<MallMember> memberList = levelMemberMap.get(level);
             if (CollUtil.isEmpty(memberList)) {
                 memberList = new ArrayList<>();
             }
@@ -681,21 +429,129 @@
             return;
         }
 
+        BigDecimal totalBonus = BigDecimal.ZERO;
         for (Map.Entry<String, List<MallMember>> entry : levelMemberMap.entrySet()) {
             BigDecimal levelBonus = levelBonusMap.get(entry.getKey());
             List<MallMember> memberList = entry.getValue();
-            
+
             if (CollUtil.isEmpty(memberList) || levelBonus.compareTo(BigDecimal.ZERO) < 1) {
                 continue;
             }
 
             BigDecimal perBonus = levelBonus.divide(BigDecimal.valueOf(memberList.size()), 2, RoundingMode.HALF_UP);
             memberList.forEach(item -> {
-                changeScoreAndCommission(item.getId(), perBonus, 2, null);
+                changeScoreAndCommission(item.getId(), perBonus, MoneyFlowTypeEnum.ALL_INTERNET_BONUS.getValue(), null);
             });
+
+            totalBonus = totalBonus.add(levelBonus);
+        }
+
+        changeSystemBonus(totalBonus, null, null);
+        log.info("###全网分红执行--end--###");
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void orderBonus(Long orderId) {
+        log.info("###订单分红消息开始执行###");
+        MallOrderInfo orderInfo = mallOrderInfoMapper.selectById(orderId);
+        if (orderInfo.getOrderType() == 2) {
+            log.info("积分订单无返利");
+            return;
+        }
+
+        List<MallOrderItem> items = mallOrderInfoMapper.getMallOrderItemByOrderId(orderId);
+
+        if (CollUtil.isEmpty(items)) {
+            return;
         }
 
 
-        log.info("###全网分红执行--end--###");
+        DataDictionaryCustom allInternetBonusDic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(DataDictionaryEnum.ALL_INTERNET_BONUS.getType(), DataDictionaryEnum.ALL_INTERNET_BONUS.getCode());
+        DataDictionaryCustom agentBonusDic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(DataDictionaryEnum.AGENT_ALL_BONUS.getType(), DataDictionaryEnum.AGENT_ALL_BONUS.getCode());
+        DataDictionaryCustom partnerBonusDic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(DataDictionaryEnum.PARNER_ALL_BONUS.getType(), DataDictionaryEnum.PARNER_ALL_BONUS.getCode());
+
+        String id = RandomUtil.randomNumbers(16);
+
+        // 全网分红
+        BigDecimal totalBonus = BigDecimal.ZERO;
+
+        // 代理分红
+        BigDecimal agentTotalBonus = BigDecimal.ZERO;
+        // 股东分红
+        BigDecimal partnerTotalBonus = BigDecimal.ZERO;
+        BigDecimal hundred = new BigDecimal(100);
+        for (MallOrderItem item : items) {
+            // 减去成本后算收益
+            BigDecimal amount = item.getPrice().subtract(item.getCostPrice()).multiply(BigDecimal.valueOf(item.getCnt()));
+            if (amount.compareTo(BigDecimal.ZERO) < 1) {
+                continue;
+            }
+
+            if (item.getIsNormal() == 1) {
+                BigDecimal bonus = amount.multiply(BigDecimal.valueOf(item.getNormalBonus()).divide(hundred, 2, RoundingMode.HALF_UP));
+                log.info("{}-普通商品分红:{}, 明细ID:{}", id, bonus, item.getId());
+
+                bonusRecord(bonus, 1, item.getOrderId(), item.getId());
+                totalBonus = totalBonus.add(bonus);
+            } else {
+                BigDecimal bonus = amount.multiply(new BigDecimal(allInternetBonusDic.getValue()).divide(hundred, 2, RoundingMode.HALF_UP));
+                bonusRecord(bonus, 1, item.getOrderId(), item.getId());
+                log.info("{}-套餐全网分红:{}, 明细ID:{}", id,  bonus, item.getId());
+
+                totalBonus = totalBonus.add(bonus);
+
+                BigDecimal agentBonus = amount.multiply(new BigDecimal(agentBonusDic.getValue()).divide(hundred, 2, RoundingMode.HALF_UP));
+                bonusRecord(agentBonus, 2, item.getOrderId(), item.getId());
+                log.info("{}-套餐代理分红:{}, 明细ID:{}", id,  agentBonus, item.getId());
+
+                BigDecimal partnerBonus = amount.multiply(new BigDecimal(partnerBonusDic.getValue()).divide(hundred, 2, RoundingMode.HALF_UP));
+                bonusRecord(partnerBonus, 3, item.getOrderId(), item.getId());
+                log.info("{}-套餐股东分红:{}, 明细ID:{}", id,  partnerBonus, item.getId());
+
+                agentTotalBonus = agentTotalBonus.add(agentBonus);
+                partnerTotalBonus = partnerTotalBonus.add(partnerBonus);
+            }
+        }
+
+        changeSystemBonus(totalBonus, agentTotalBonus, partnerTotalBonus);
+        log.info("###订单分红消息结束执行###");
+    }
+
+    private void changeSystemBonus(BigDecimal totalBonus, BigDecimal agentTotalBonus, BigDecimal partnerBonus) {
+        boolean flag = false;
+        int index = 0;
+        while (!flag) {
+            MallSystemSetting setting = mallSystemSettingMapper.selectById(1L);
+            if (setting == null) {
+                return;
+            }
+
+            LambdaQueryWrapper<MallSystemSetting> update = new LambdaQueryWrapper<>();
+            update.eq(MallSystemSetting::getId, setting.getId())
+                    .eq(MallSystemSetting::getRevision, setting.getRevision());
+
+            setting.setAllBonus(setting.getAllBonus().add(totalBonus == null ? BigDecimal.ZERO : totalBonus));
+            setting.setAgentBonus(setting.getAgentBonus().add(agentTotalBonus == null ? BigDecimal.ZERO : agentTotalBonus));
+            setting.setPartnerBonus(setting.getPartnerBonus().add(partnerBonus == null ? BigDecimal.ZERO : partnerBonus));
+            setting.setRevision(setting.getRevision() + 1);
+            int i = mallSystemSettingMapper.update(setting, update);
+            if (i > 0 || index > 2) {
+                flag = true;
+            }
+            index++;
+        }
+    }
+
+    private final MallBonusRecordMapper mallBonusRecordMapper;
+
+    private void bonusRecord(BigDecimal amount, Integer type, Long orderId, Long orderItemId) {
+        MallBonusRecord record = new MallBonusRecord();
+        record.setAmount(amount);
+        record.setCreateTime(new Date());
+        record.setType(type);
+        record.setOrderId(orderId);
+        record.setOrderItemId(orderItemId);
+        mallBonusRecordMapper.insert(record);
     }
 }

--
Gitblit v1.9.1