From a8a40896108ac780a55ecc504cecdfd041ab2838 Mon Sep 17 00:00:00 2001
From: Hentua <wangdoubleone@gmail.com>
Date: Wed, 19 Apr 2023 00:25:50 +0800
Subject: [PATCH] fix

---
 src/main/java/cc/mrbird/febs/mall/service/impl/MemberProfitServiceImpl.java | 1060 ++++++++++++++++++++++++++++++++++++++++++++++++++++------
 1 files changed, 943 insertions(+), 117 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 c170ad3..df1062a 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,24 +1,28 @@
 package cc.mrbird.febs.mall.service.impl;
 
-import cc.mrbird.febs.common.enumerates.AgentLevelEnum;
-import cc.mrbird.febs.common.enumerates.DataDictionaryEnum;
-import cc.mrbird.febs.common.enumerates.FlowTypeEnum;
-import cc.mrbird.febs.common.enumerates.MoneyFlowTypeEnum;
+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.IApiMallMemberWalletService;
-import cc.mrbird.febs.mall.service.IMallAchieveService;
-import cc.mrbird.febs.mall.service.IMallMoneyFlowService;
-import cc.mrbird.febs.mall.service.IMemberProfitService;
+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.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 lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
@@ -27,6 +31,7 @@
 import java.math.BigDecimal;
 import java.math.RoundingMode;
 import java.util.*;
+import java.util.stream.Collectors;
 
 /**
  * @author wzy
@@ -45,23 +50,38 @@
     private final IMallMoneyFlowService moneyFlowService;
     private final DataDictionaryCustomMapper dataDictionaryCustomMapper;
     private final MallMoneyFlowMapper mallMoneyFlowMapper;
-    private final IMallAchieveService mallAchieveService;
+    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;
 
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public void staticProfit() {
+    public void staticProfit(Date profitDate) {
         log.info("#####静态分红开始运行:{}#####", new Date());
         List<MallMember> members = mallMemberMapper.selectList(null);
         if (CollUtil.isEmpty(members)) {
             return;
         }
 
-        Date profitDate = DateUtil.offset(new Date(), DateField.DAY_OF_YEAR, -1);
+        /**
+         *
+         */
+        if (profitDate == null) {
+            profitDate = DateUtil.offset(new Date(), DateField.DAY_OF_YEAR, -1);
+        }
         // 套餐业绩
-        BigDecimal tcIncome = mallOrderInfoMapper.selectTotalAmountUnCostForDate(profitDate, null, "D", 2);
+//        BigDecimal tcIncome = mallOrderInfoMapper.selectTotalAmountUnCostForDate(profitDate, null, "D", 2);
         // 普通商品业绩
-        BigDecimal normalIncome = mallOrderInfoMapper.selectTotalAmountUnCostForDate(profitDate, null, "D", 1);
-        BigDecimal totalIncome = tcIncome.add(normalIncome);
+//        BigDecimal normalIncome = mallOrderInfoMapper.selectTotalAmountUnCostForDate(profitDate, null, "D", 1);
+        //今日总业绩
+        BigDecimal totalIncome = mallAchieveRecordMapper.selectAchieveTotal("D", profitDate);
 
         if (totalIncome.compareTo(BigDecimal.ZERO) == 0) {
             return;
@@ -106,25 +126,138 @@
                 BigDecimal preStaticProfit = staticProfit.divide(new BigDecimal(list.size()), 2, RoundingMode.HALF_UP);
 
                 for (Map<String, Object> item : list) {
-                    Long memberId = (Long) item.get("memberId");
+//                    Long memberId = (Long) item.get("memberId");
                     String orderNo = (String) item.get("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());
+                    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);
+    }
+
+    /**
+     * 直推收益
+     *
+     * 1、直推收益 1:20;2:30;3:40 返利,隔代奖拿直推收益20%
+     * 2、若非代理推代理,只拿10%,往上找代理给15%,再往上找代理给15%,往上找连续两层。股东套餐同理
+     * 3、代理推代理按照第1点结算
+     *
+     * @param orderId
+     */
+    @Override
+    public void directProfit(Long orderId) {
+        log.info("######直推奖励, 订单ID:{}######", orderId);
+        MallOrderInfo orderInfo = mallOrderInfoMapper.selectById(orderId);
+        if (orderInfo.getOrderType() == 2) {
+            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());
+
+        // 父级会员直推人数
+        Integer directCnt = mallMemberMapper.selectOwnCntByInviteId(parentMember.getInviteId());
+        List<DataDictionaryCustom> dataDices = dataDictionaryCustomMapper.selectDicByType(DataDictionaryEnum.DIRECT_BONUS_SETTING.getType());
+
+        directCnt = directCnt == null ? 0 : directCnt;
+        List<MallOrderItem> items = mallOrderInfoMapper.getMallOrderItemByOrderId(orderId);
+
+        if (CollUtil.isEmpty(items)) {
+            return;
+        }
+
+        for (MallOrderItem item : items) {
+            // 减去成本后算收益
+            BigDecimal amount = item.getPrice().subtract(item.getCostPrice()).multiply(BigDecimal.valueOf(item.getCnt()));
+            if (amount.compareTo(BigDecimal.ZERO) < 1) {
+                continue;
+            }
+
+            // 直推返利比例
+            BigDecimal profitPer = BigDecimal.ZERO;
+            int isSameLevel = 0;
+            // 普通商品 -- 直推上级可拿百分比直推奖励
+            if (item.getIsNormal() == 1) {
+                profitPer = new BigDecimal(item.getNormalPer());
+
+                // 套餐商品
+            } else {
+
+                // 判断上级是否与自己购买的套餐符合,若符合则走3级直推逻辑,若不符合则另外一个
+                if (parentMember.getAccountLevel().equals(item.getGoodsLevel()) || AccountLevelEnums.VIP.getLevel().equals(parentMember.getAccountLevel())) {
+
+                    for (DataDictionaryCustom dataDic : dataDices) {
+                        JSONObject jsonObject = JSONObject.parseObject(dataDic.getValue());
+                        if (directCnt >= jsonObject.getInteger("pushCnt")) {
+                            profitPer = jsonObject.getBigDecimal("prop");
+                        }
+                    }
+                    isSameLevel = 1;
+                    // 非代理推代理/非股东推股东
+                } else {
+                    profitPer = BigDecimal.valueOf(0.1);
+                    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());
+            }
+
+            // 非代理推代理
+            if (isSameLevel == 2) {
+                List<MallMember> mallMembers = mallMemberMapper.selectParentMemberList(StrUtil.split(parentMember.getReferrerIds(), ','), parentMember.getReferrerId(), 2);
+                if (CollUtil.isEmpty(mallMembers)) {
+                    continue;
+                }
+
+                for (MallMember mallMember : mallMembers) {
+                    if (!item.getGoodsLevel().equals(mallMember.getAccountLevel())) {
+                        break;
+                    }
+
+                    BigDecimal doubleParentProfit = profit.multiply(indirectPer2);
+                    changeScoreAndCommission(mallMember.getId(), doubleParentProfit, MoneyFlowTypeEnum.RECOMMEND_BONUS.getValue(), orderInfo.getOrderNo());
+                }
+            }
+        }
     }
 
     /**
@@ -136,7 +269,6 @@
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void dynamicProfit(Long orderId, Integer isNormal) {
-        log.info("######直推奖励, 订单ID:{}######", orderId);
         MallOrderInfo orderInfo = mallOrderInfoMapper.selectById(orderId);
         if (orderInfo.getOrderType() == 2) {
             log.info("积分订单无返利");
@@ -157,6 +289,9 @@
 
         List<MallOrderItem> items = mallOrderInfoMapper.getMallOrderItemByOrderId(orderId);
         for (MallOrderItem item : items) {
+            item.setHasSettle(1);
+            mallOrderItemMapper.updateById(item);
+
             // 减去成本后算收益
             BigDecimal amount = item.getPrice().subtract(item.getCostPrice()).multiply(BigDecimal.valueOf(item.getCnt()));
             if (amount.compareTo(BigDecimal.ZERO) < 1) {
@@ -164,9 +299,9 @@
             }
 
             // 判断套餐或者普通商品,结算对应商品的动态分红
-            if (!Objects.equals(item.getIsNormal(), isNormal)) {
-                continue;
-            }
+//            if (!Objects.equals(item.getIsNormal(), isNormal)) {
+//                continue;
+//            }
 
             // =======直推返利== start =====
             // 直接奖励收益
@@ -176,15 +311,18 @@
                 continue;
             }
 
-            int reduce = walletService.reduce(dynamicProfit, parent.getId(), "score");
-            if (reduce == 2) {
+//            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());
+
+            dynamicProfit = changeScoreAndCommission(parent.getId(), dynamicProfit, MoneyFlowTypeEnum.DYNAMIC_ACHIEVE.getValue(), orderInfo.getOrderNo());
+            if (dynamicProfit.compareTo(BigDecimal.ZERO) < 1) {
                 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 =====
@@ -205,10 +343,10 @@
                 }
 
                 // 直推数量
-                Integer directCnt = mallMemberMapper.selectOwnCntByInviteId(member.getReferrerId());
+                Integer directCnt = mallMemberMapper.selectOwnCntByInviteId(parentMember.getInviteId());
                 List<DataDictionaryCustom> dataDices = dataDictionaryCustomMapper.selectDicByType(DataDictionaryEnum.INDIRECT_BONUS_SETTING.getType());
 
-                directCnt = directCnt == null ? 0 :directCnt;
+                directCnt = directCnt == null ? 0 : directCnt;
 
                 // 隔代比例
                 BigDecimal indrectDicProp = BigDecimal.ZERO;
@@ -220,26 +358,23 @@
                 }
 
                 // 隔代推荐奖 收益
-                direct = direct.divide(indrectDicProp, 2, RoundingMode.HALF_UP);
+                direct = direct.multiply(indrectDicProp.divide(new BigDecimal("100"), 2, RoundingMode.HALF_UP));
 
                 // direct 收益小于1,则跳出
                 if (direct.compareTo(BigDecimal.ONE) < 1) {
-                    continue;
+                    break;
                 }
-
-                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.negate(), MoneyFlowTypeEnum.RECOMMEND_BONUS.getValue(), orderInfo.getOrderNo(), FlowTypeEnum.SCORE.getValue());
+//                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.negate(), MoneyFlowTypeEnum.RECOMMEND_BONUS.getValue(), orderInfo.getOrderNo(), FlowTypeEnum.SCORE.getValue());
+                changeScoreAndCommission(parentMember.getId(), direct, MoneyFlowTypeEnum.RECOMMEND_BONUS.getValue(), orderInfo.getOrderNo());
             }
             // =======隔代奖== end =====
-
-            item.setHasSettle(1);
-            mallOrderItemMapper.updateById(item);
         }
     }
 
@@ -247,47 +382,62 @@
     @Transactional(rollbackFor = Exception.class)
     public void agentProfit(Date profitDate) {
         log.info("#####==代理分红==start==#####");
-        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 = tcIncome.add(normalIncome);
+
+        BigDecimal totalIncome = mallAchieveRecordMapper.selectAchieveTotal("D", profitDate);
 
         DataDictionaryCustom dic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(DataDictionaryEnum.AGENT_BONUS.getType(), DataDictionaryEnum.AGENT_BONUS.getCode());
-        BigDecimal profit = totalIncome.divide(new BigDecimal(dic.getValue()), 2, RoundingMode.HALF_UP);
-        BigDecimal preProfit = profit.divide(BigDecimal.valueOf(100), 2, RoundingMode.HALF_UP);
+        BigDecimal profit = totalIncome.multiply(new BigDecimal(dic.getValue()).divide(new BigDecimal("100"), 2, RoundingMode.HALF_UP));
 
-        List<MallMember> agentMembers = mallMemberMapper.selectByIdAndNoLevel(null, AgentLevelEnum.FIRST_LEVEL.name());
+        List<MallMember> agentMembers = mallMemberMapper.selectByIdAndNoLevel(null, AgentLevelEnum.SECOND_LEVEL.name());
         if (CollUtil.isEmpty(agentMembers)) {
             return;
         }
 
-        for (MallMember agentMember : agentMembers) {
-            DataDictionaryCustom agentDic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(AppContants.AGENT_LEVEL_REQUIRE, agentMember.getLevel());
-
-            if (agentDic == null) {
-                continue;
-            }
-
+        List<DataDictionaryCustom> dics = dataDictionaryCustomMapper.selectDicByType(AppContants.AGENT_LEVEL_REQUIRE);
+        for (DataDictionaryCustom agentDic : dics) {
             JSONObject jsonObject = JSONObject.parseObject(agentDic.getValue());
-            BigDecimal profitProp = jsonObject.getBigDecimal("profitProp");
-            BigDecimal income = preProfit.multiply(profitProp);
+            BigDecimal profitProp = jsonObject.getBigDecimal("profitProp").divide(new BigDecimal("100"), 2, RoundingMode.HALF_UP);
 
-            int reduce = walletService.reduce(income, agentMember.getId(), "score");
-            if (reduce == 2) {
+            List<MallMember> agentMemberList = mallMemberMapper.selectMemberWithLevel(agentDic.getCode());
+            if (CollUtil.isEmpty(agentMemberList)) {
                 continue;
             }
 
-            walletService.add(income, agentMember.getId(), "commission");
+            BigDecimal income = profit.multiply(profitProp).divide(BigDecimal.valueOf(agentMemberList.size()), 2, RoundingMode.HALF_UP);
+            if (income.compareTo(BigDecimal.ZERO) < 1) {
+                continue;
+            }
 
-            moneyFlowService.addMoneyFlow(agentMember.getId(), income, MoneyFlowTypeEnum.AGENT_BONUS.getValue(), null, FlowTypeEnum.COMMISSION.getValue());
-            moneyFlowService.addMoneyFlow(agentMember.getId(), income.negate(), MoneyFlowTypeEnum.AGENT_BONUS.getValue(), null, FlowTypeEnum.SCORE.getValue());
+            for (MallMember agentMember : agentMemberList) {
+//                int reduce = walletService.reduce(income, agentMember.getId(), "score");
+//                if (reduce == 2) {
+//                    continue;
+//                }
+//
+//                walletService.add(income, agentMember.getId(), "commission");
+//
+//                moneyFlowService.addMoneyFlow(agentMember.getId(), income, MoneyFlowTypeEnum.AGENT_BONUS.getValue(), null, FlowTypeEnum.COMMISSION.getValue());
+//                moneyFlowService.addMoneyFlow(agentMember.getId(), income.negate(), MoneyFlowTypeEnum.AGENT_BONUS.getValue(), null, FlowTypeEnum.SCORE.getValue());
+                changeScoreAndCommission(agentMember.getId(), income, MoneyFlowTypeEnum.AGENT_BONUS.getValue(), null);
+            }
+        }
+        log.info("#####==代理分红==end==#####");
+    }
+
+    private BigDecimal changeScoreAndCommission(Long memberId, BigDecimal income, Integer type, String orderNo) {
+        Map<String, BigDecimal> map = new HashMap<>();
+        map.put("amount", income);
+
+        int reduce = walletService.reduce(income, memberId, "score", map);
+        if (reduce == 2) {
+            return BigDecimal.ZERO;
         }
 
-        log.info("#####==代理分红==end==#####");
+        income = map.get("amount");
+        walletService.add(income, memberId, "commission");
+        moneyFlowService.addMoneyFlow(memberId, income, type, orderNo, FlowTypeEnum.COMMISSION.getValue());
+        moneyFlowService.addMoneyFlow(memberId, income.negate(), type, orderNo, FlowTypeEnum.SCORE.getValue());
+        return income;
     }
 
     @Override
@@ -296,6 +446,7 @@
         Page<MallMember> page = new Page<>(1, 5);
         MallMember query = new MallMember();
         query.setQuery("2");
+
         Date profitDate = DateUtil.offset(new Date(), DateField.DAY_OF_YEAR, -1);
         query.setCreatedTime(profitDate);
         IPage<MallMember> rankListInPage = mallMemberMapper.selectRankListInPage(page, query);
@@ -306,32 +457,32 @@
         }
 
         // 套餐业绩
-        BigDecimal tcIncome = mallOrderInfoMapper.selectTotalAmountUnCostForDate(profitDate, null, "M", 2);
+//        BigDecimal tcIncome = mallOrderInfoMapper.selectTotalAmountUnCostForDate(profitDate, null, "M", 2);
         // 普通商品业绩
-        BigDecimal normalIncome = mallOrderInfoMapper.selectTotalAmountUnCostForDate(profitDate, null, "M", 1);
-        BigDecimal totalIncome = tcIncome.add(normalIncome);
+//        BigDecimal normalIncome = mallOrderInfoMapper.selectTotalAmountUnCostForDate(profitDate, null, "M", 1);
+        BigDecimal totalIncome = mallAchieveRecordMapper.selectAchieveTotal("M", profitDate);
 
         List<DataDictionaryCustom> rankAward = dataDictionaryCustomMapper.selectDicByType("RANK_AWARD");
         DataDictionaryCustom dic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(DataDictionaryEnum.RANK_BONUS.getType(), DataDictionaryEnum.RANK_BONUS.getCode());
 
 
         BigDecimal rankBonusTotal = totalIncome.multiply(new BigDecimal(dic.getValue()).divide(new BigDecimal("100"), 2, RoundingMode.HALF_UP));
-        BigDecimal preBonus = rankBonusTotal.divide(BigDecimal.valueOf(100),2 , RoundingMode.HALF_UP);
+        BigDecimal preBonus = rankBonusTotal.divide(BigDecimal.valueOf(100), 2, RoundingMode.HALF_UP);
 
         int i = 0;
         for (MallMember member : rankList) {
             DataDictionaryCustom rank = rankAward.get(i);
             i++;
             BigDecimal bonus = preBonus.multiply(new BigDecimal(rank.getValue()));
-            int reduce = walletService.reduce(bonus, member.getId(), "score");
-            if (reduce == 2) {
-                continue;
-            }
+//            int reduce = walletService.reduce(bonus, member.getId(), "score");
+//            if (reduce == 2) {
+//                continue;
+//            }
+//            walletService.add(bonus, member.getId(), "commission");
+//            moneyFlowService.addMoneyFlow(member.getId(), bonus, MoneyFlowTypeEnum.RANK_BONUS.getValue(), null, FlowTypeEnum.COMMISSION.getValue());
+//            moneyFlowService.addMoneyFlow(member.getId(), bonus.negate(), MoneyFlowTypeEnum.RANK_BONUS.getValue(), null, FlowTypeEnum.SCORE.getValue());
 
-            walletService.add(bonus, member.getId(), "commission");
-
-            moneyFlowService.addMoneyFlow(member.getId(), bonus, MoneyFlowTypeEnum.RANK_BONUS.getValue(), null, FlowTypeEnum.COMMISSION.getValue());
-            moneyFlowService.addMoneyFlow(member.getId(), bonus.negate(), MoneyFlowTypeEnum.RANK_BONUS.getValue(), null, FlowTypeEnum.SCORE.getValue());
+            changeScoreAndCommission(member.getId(), bonus, MoneyFlowTypeEnum.RANK_BONUS.getValue(), null);
         }
     }
 
@@ -339,18 +490,20 @@
      * 拿推荐人的收益(代理,直推,排名)的10%加权平分给下面直推
      */
     @Override
-    public void thankfulProfit() {
+    public void thankfulProfit(Date date) {
         log.info("######==感恩奖==start==####");
         List<MallMember> mallMembers = mallMemberMapper.selectMemberListHasChild();
         if (CollUtil.isEmpty(mallMembers)) {
             return;
+        }
+        if (date == null) {
+            date = DateUtil.offset(new Date(), DateField.DAY_OF_YEAR, -1);
         }
 
         DataDictionaryCustom dic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(DataDictionaryEnum.THANKFUL_BONUS.getType(), DataDictionaryEnum.THANKFUL_BONUS.getCode());
         // 感恩奖比例
         BigDecimal prop = new BigDecimal(dic.getValue()).divide(BigDecimal.valueOf(100), 2, RoundingMode.HALF_UP);
 
-        Date date = DateUtil.offset(new Date(), DateField.DAY_OF_YEAR, -1);
         for (MallMember mallMember : mallMembers) {
             BigDecimal income = mallMoneyFlowMapper.selectThankfulCommission(date, mallMember.getId());
             List<MallMember> children = mallMemberMapper.selectMemberDirectForHasLevel(mallMember.getInviteId());
@@ -367,22 +520,22 @@
             if (reduce == 2) {
                 continue;
             }
-
             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, child.getId(), "score");
-                if (reduce1 == 2) {
-                    continue;
-                }
-
-                walletService.add(preProfit, child.getId(), "commission");
-                moneyFlowService.addMoneyFlow(child.getId(), preProfit, MoneyFlowTypeEnum.THANKFUL.getValue(), null, mallMember.getId(), FlowTypeEnum.COMMISSION.getValue());
-                moneyFlowService.addMoneyFlow(child.getId(), preProfit.negate(), MoneyFlowTypeEnum.THANKFUL.getValue(), null, mallMember.getId(), FlowTypeEnum.SCORE.getValue());
+//                int reduce1 = walletService.reduce(preProfit, child.getId(), "score");
+//                if (reduce1 == 2) {
+//                    continue;
+//                }
+//                walletService.add(preProfit, child.getId(), "commission");
+//                moneyFlowService.addMoneyFlow(child.getId(), preProfit, MoneyFlowTypeEnum.THANKFUL.getValue(), null, mallMember.getId(), FlowTypeEnum.COMMISSION.getValue());
+//                moneyFlowService.addMoneyFlow(child.getId(), preProfit.negate(), MoneyFlowTypeEnum.THANKFUL.getValue(), null, mallMember.getId(), FlowTypeEnum.SCORE.getValue());
+                changeScoreAndCommission(child.getId(), preProfit, MoneyFlowTypeEnum.THANKFUL.getValue(), null);
             }
         }
         log.info("######==感恩奖==end==####");
@@ -395,10 +548,10 @@
             profitDate = DateUtil.offset(new Date(), DateField.DAY_OF_YEAR, -1);
         }
         // 套餐业绩
-        BigDecimal tcIncome = mallOrderInfoMapper.selectTotalAmountUnCostForDate(profitDate, null, "D", 2);
+//        BigDecimal tcIncome = mallOrderInfoMapper.selectTotalAmountUnCostForDate(profitDate, null, "D", 2);
         // 普通商品业绩
-        BigDecimal normalIncome = mallOrderInfoMapper.selectTotalAmountUnCostForDate(profitDate, null, "D", 1);
-        BigDecimal totalIncome = tcIncome.add(normalIncome);
+//        BigDecimal normalIncome = mallOrderInfoMapper.selectTotalAmountUnCostForDate(profitDate, null, "D", 1);
+        BigDecimal totalIncome = mallAchieveRecordMapper.selectAchieveTotal("D", profitDate);
 
         // 董事
         DataDictionaryCustom dic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(DataDictionaryEnum.DIRECTOR_BONUS.getType(), DataDictionaryEnum.DIRECTOR_BONUS.getCode());
@@ -412,14 +565,14 @@
                     continue;
                 }
 
-                int reduce = walletService.reduce(pre, director.getId(), "score");
-                if (reduce == 2) {
-                    continue;
-                }
-
-                walletService.add(pre, director.getId(), "commission");
-                moneyFlowService.addMoneyFlow(director.getId(), pre, MoneyFlowTypeEnum.DIRECTOR_BONUS.getValue(), null, FlowTypeEnum.COMMISSION.getValue());
-                moneyFlowService.addMoneyFlow(director.getId(), pre.negate(), MoneyFlowTypeEnum.DIRECTOR_BONUS.getValue(), null, FlowTypeEnum.SCORE.getValue());
+//                int reduce = walletService.reduce(pre, director.getId(), "score");
+//                if (reduce == 2) {
+//                    continue;
+//                }
+//                walletService.add(pre, director.getId(), "commission");
+//                moneyFlowService.addMoneyFlow(director.getId(), pre, MoneyFlowTypeEnum.DIRECTOR_BONUS.getValue(), null, FlowTypeEnum.COMMISSION.getValue());
+//                moneyFlowService.addMoneyFlow(director.getId(), pre.negate(), MoneyFlowTypeEnum.DIRECTOR_BONUS.getValue(), null, FlowTypeEnum.SCORE.getValue());
+                changeScoreAndCommission(director.getId(), pre, MoneyFlowTypeEnum.DIRECTOR_BONUS.getValue(), null);
             }
         }
 
@@ -435,17 +588,690 @@
                     continue;
                 }
 
-                int reduce = walletService.reduce(pre, storeMaster.getId(), "score");
-                if (reduce == 2) {
+//                int reduce = walletService.reduce(pre, storeMaster.getId(), "score");
+//                if (reduce == 2) {
+//                    continue;
+//                }
+//                walletService.add(pre, storeMaster.getId(), "commission");
+//                moneyFlowService.addMoneyFlow(storeMaster.getId(), pre, MoneyFlowTypeEnum.COMMUNITY_BONUS.getValue(), null, FlowTypeEnum.COMMISSION.getValue());
+//                moneyFlowService.addMoneyFlow(storeMaster.getId(), pre.negate(), MoneyFlowTypeEnum.COMMUNITY_BONUS.getValue(), null, FlowTypeEnum.SCORE.getValue());
+                changeScoreAndCommission(storeMaster.getId(), pre, MoneyFlowTypeEnum.COMMUNITY_BONUS.getValue(), null);
+            }
+        }
+        log.info("#####==店补/董事==end==######");
+    }
+
+    @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);
+    }
 
-                walletService.add(pre, storeMaster.getId(), "commission");
-                moneyFlowService.addMoneyFlow(storeMaster.getId(), pre, MoneyFlowTypeEnum.COMMUNITY_BONUS.getValue(), null, FlowTypeEnum.COMMISSION.getValue());
-                moneyFlowService.addMoneyFlow(storeMaster.getId(), pre.negate(), MoneyFlowTypeEnum.COMMUNITY_BONUS.getValue(), null, FlowTypeEnum.SCORE.getValue());
+    @Override
+    public void agentPerkJob(Date profitDate) {
+        /**
+         * 代理商补贴
+         *  全体代理商
+         *  前一天全部业绩的百分比用来平分
+         */
+        log.info("######==代理商补贴==start==####");
+
+        List<MallMember> mallMembersAgentPerkList = mallMemberMapper.selectMemberByDirector(1);
+        if (CollUtil.isEmpty(mallMembersAgentPerkList)) {
+            return;
+        }
+        if (profitDate == null) {
+            profitDate = DateUtil.offset(new Date(), DateField.DAY_OF_YEAR, -1);
+        }
+        //前一天的总业绩
+        BigDecimal agentPerkAmountSum = mallAchieveRecordMapper.selectAchieveTotal("D", profitDate);
+        //补贴百分比
+        DataDictionaryCustom agentPerkDic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(
+                DataDictionaryEnum.AGENT_PERK.getType(),
+                DataDictionaryEnum.AGENT_PERK.getCode()
+        );
+        if(ObjectUtil.isEmpty(agentPerkDic)){
+            return;
+        }
+        BigDecimal agentPerk = new BigDecimal(agentPerkDic.getValue()).multiply(new BigDecimal("0.01"));
+        agentPerkAmountSum = agentPerkAmountSum.multiply(agentPerk);
+
+        BigDecimal agentPerkAmount = agentPerkAmountSum.divide(new BigDecimal(mallMembersAgentPerkList.size()), BigDecimal.ROUND_DOWN).setScale(2, BigDecimal.ROUND_DOWN);
+        List<Long> mallMembersAgentPerkIds = mallMembersAgentPerkList.stream().map(MallMember::getId).collect(Collectors.toList());
+        List<MallMemberWallet> mallMemberWallets = mallMemberWalletMapper.selectMemberWalletsByIds(mallMembersAgentPerkIds);
+        iAgentService.flowTotalScoreBalance(
+                mallMemberWallets,
+                agentPerkAmount,
+                MoneyFlowTypeEnum.AGENT_PERK.getValue(),
+                MallUtils.getOrderNum("AP"),
+                1L
+        );
+
+        log.info("#####==代理商补贴==end==######" +
+                "今日总补贴###" + agentPerkAmountSum.setScale(2, RoundingMode.HALF_UP)
+                +"###人均###"+agentPerkAmount.setScale(2, RoundingMode.HALF_UP)
+                +"###人数###"+mallMemberWallets.size());
+
+
+    }
+
+    @Override
+    public void offLinePerkJob(Date profitDate) {
+        /**
+         * 线下服务中心补贴
+         *  全体线下服务商
+         *  前一天团队业绩的百分比用来平分
+         */
+        log.info("######==线下服务中心补贴==start==####");
+
+        List<MallMember> mallMembersOffLinePerkList = mallMemberMapper.selectMemberByStoreMaster(1);
+        if (CollUtil.isEmpty(mallMembersOffLinePerkList)) {
+            return;
+        }
+
+        //补贴百分比
+        DataDictionaryCustom offLinePerkDic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(
+                DataDictionaryEnum.OFFLINE_PERK.getType(),
+                DataDictionaryEnum.OFFLINE_PERK.getCode()
+        );
+        if(ObjectUtil.isEmpty(offLinePerkDic)){
+            return;
+        }
+        BigDecimal offLinePerk = new BigDecimal(offLinePerkDic.getValue()).multiply(new BigDecimal("0.01"));
+
+        if (profitDate == null) {
+            profitDate = DateUtil.offset(new Date(), DateField.DAY_OF_YEAR, -1);
+        }
+        for(MallMember mallMembersOffLinePerk : mallMembersOffLinePerkList){
+            String inviteId = mallMembersOffLinePerk.getInviteId();
+            //获取团队下所有成员
+            List<MallMember> allMallMemberList = mallMemberMapper.selectAllChildAgentListByInviteId(inviteId);
+            //子团队中是否有线下服务商
+            List<MallMember> storeMasterMallMemberList = mallMemberMapper.selectAllChildAgentListByInviteIdAndStoreMaster(inviteId, 1);
+            if(CollUtil.isNotEmpty(storeMasterMallMemberList)){
+                //如果有,该子团队成员不算业绩
+                List<MallMember> storeMasterMallMembers = new ArrayList<>();
+                for(MallMember storeMasterMallMember : storeMasterMallMemberList){
+                    List<MallMember> storeMasterList = mallMemberMapper.selectAllChildAgentListByInviteId(storeMasterMallMember.getInviteId());
+                    storeMasterMallMembers.addAll(storeMasterList);
+                }
+                allMallMemberList.removeAll(storeMasterMallMembers);
+            }
+
+            //团队下所有人的业绩
+            List<Long> mallMembersOffLinePerkIds = allMallMemberList.stream().map(MallMember::getId).collect(Collectors.toList());
+
+            BigDecimal offLinePerkAmountSum = mallAchieveRecordMapper.selectSumAchieveByMemberIds(mallMembersOffLinePerkIds,profitDate);
+            //该团队产生的业绩金额
+            offLinePerkAmountSum = offLinePerkAmountSum.multiply(offLinePerk).setScale(2,BigDecimal.ROUND_DOWN);
+
+            //所有合伙人补贴至消费礼包的三倍额度需要复购一次。
+            MallMemberWallet mallMemberWallet = mallMemberWalletMapper.selectWalletByMemberId(mallMembersOffLinePerk.getId());
+            BigDecimal totalScore = mallMemberWallet.getTotalScore();
+            if(totalScore.compareTo(offLinePerkAmountSum) < 0){
+                offLinePerkAmountSum = totalScore;
+            }
+            if(BigDecimal.ZERO.compareTo(offLinePerkAmountSum) < 0){
+                //减少补贴额度
+                mallMemberWalletMapper.reduceTotalScoreById(offLinePerkAmountSum, mallMemberWallet.getId());
+
+                iAgentService.reduceStar(mallMemberWallet.getMemberId(),offLinePerkAmountSum);
+
+                mallMemberWalletMapper.addBalanceById(offLinePerkAmountSum, mallMemberWallet.getId());
+
+                mallMoneyFlowService.addMoneyFlow(
+                        mallMembersOffLinePerk.getId(),
+                        offLinePerkAmountSum,
+                        MoneyFlowTypeEnum.OFFLINE_PERK.getValue(),
+                        MallUtils.getOrderNum("OLP"),
+                        FlowTypeEnum.BALANCE.getValue());
+            }
+        }
+    }
+
+    @Override
+    public void teamEqualsPerkJob(Date profitDate) {
+        /**
+         * 全体用户
+         *      对象:产生了收益的用户的直属上级
+         *      条件:等级和用户等级一样
+         *      补贴:每日补贴的10%,例如用户当日的补贴总额为100,直属上级拿100*10%=10,
+         *      限制:直推收益除外。
+         */
+        if (profitDate == null) {
+            profitDate = DateUtil.offset(new Date(), DateField.DAY_OF_YEAR, -1);
+        }
+        //平级补贴百分比
+        DataDictionaryCustom teamEqualsPerkDic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(
+                DataDictionaryEnum.TEAM_EQUALS_PERK.getType(),
+                DataDictionaryEnum.TEAM_EQUALS_PERK.getCode());
+        BigDecimal teamEqualsPerkPercent = new BigDecimal(teamEqualsPerkDic.getValue()).abs().multiply(BigDecimal.valueOf(0.01));
+
+        //产生了收益的用户和直属上级
+        List<AdminTeamEqualsPerkVo> adminTeamEqualsPerkVos = mallMoneyFlowMapper.selectTeamEqualsMemberByDate(profitDate);
+        if(CollUtil.isNotEmpty(adminTeamEqualsPerkVos)){
+            for(AdminTeamEqualsPerkVo adminTeamEqualsPerkVo : adminTeamEqualsPerkVos){
+                BigDecimal sumAmount = adminTeamEqualsPerkVo.getSumAmount();
+                //平级补贴
+                BigDecimal teamEqualsPerkAmount = teamEqualsPerkPercent.multiply(sumAmount).setScale(2, BigDecimal.ROUND_DOWN);
+
+                MallMemberWallet mallMemberWallet = mallMemberWalletMapper.selectWalletByMemberId(adminTeamEqualsPerkVo.getRtMemberId());
+                BigDecimal totalScore = mallMemberWallet.getTotalScore();
+                if(totalScore.compareTo(teamEqualsPerkAmount) < 0){
+                    teamEqualsPerkAmount = totalScore;
+                }
+                if(BigDecimal.ZERO.compareTo(teamEqualsPerkAmount) < 0){
+                    //减少补贴额度
+                    mallMemberWalletMapper.reduceTotalScoreById(teamEqualsPerkAmount, mallMemberWallet.getId());
+
+                    iAgentService.reduceStar(mallMemberWallet.getMemberId(),teamEqualsPerkAmount);
+
+                    mallMemberWalletMapper.addBalanceById(teamEqualsPerkAmount, mallMemberWallet.getId());
+//
+//                    mallMoneyFlowService.addMoneyFlow(
+//                            adminTeamEqualsPerkVo.getRtMemberId(),
+//                            teamEqualsPerkAmount,
+//                            MoneyFlowTypeEnum.TEAM_EQUALS_PERK.getValue(),
+//                            MallUtils.getOrderNum("TEP"),
+//                            FlowTypeEnum.BALANCE.getValue());
+
+                    mallMoneyFlowService.addMoneyFlow(
+                            adminTeamEqualsPerkVo.getRtMemberId(),
+                            teamEqualsPerkAmount,
+                            MoneyFlowTypeEnum.TEAM_EQUALS_PERK.getValue(),
+                            MallUtils.getOrderNum("TEP"),
+                            "平级奖励补贴",
+                            "补贴额度:"+mallMemberWallet.getTotalScore(),
+                            adminTeamEqualsPerkVo.getMemberId(),
+                            2,
+                            FlowTypeEnum.BALANCE.getValue(),
+                            1);
+                }
+            }
+        }
+    }
+
+
+    @Override
+    public void mqPerkRetryJob() {
+        /**
+         * 每次拿重试次数大于零
+         * 按ID asc排序的十条数据
+         */
+//        List<MallMqRecord> mallMqRecords = mallMqRecordMapper.selectByStateLimitTen(2);
+//        if(CollUtil.isEmpty(mallMqRecords)){
+//            return;
+//        }
+//        DateTime dateTime = DateUtil.offsetMinute(new Date(), -5);
+//        for(MallMqRecord mallMqRecord : mallMqRecords){
+//            if(DateUtil.compare(dateTime,mallMqRecord.getCreateTime()) <= 0){
+//                continue;
+//            }
+//            Integer retryTimes = mallMqRecord.getRetryTimes();
+//            if(retryTimes <= 0){
+//                continue;
+//            }
+//            retryTimes = retryTimes - 1;
+//            mallMqRecord.setRetryTimes(retryTimes);
+//            mallMqRecordMapper.updateById(mallMqRecord);
+//
+//            Long orderId = mallMqRecord.getOrderId();
+//            if(mallMqRecord.getState() == 2){
+//                agentProducer.sendPerkMoneyMsg(orderId);
+//            }
+//        }
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void scoreRecordReleaseJob() {
+        /**
+         * 每日按照比例释放记录的百分比到用户的绿色凭证账户
+         */
+        //获取全部剩余数量大于零的记录
+        List<MallScoreRecord> mallScoreRecords = mallScoreRecordMapper.selectList();
+        if(CollUtil.isEmpty(mallScoreRecords)){
+            return;
+        }
+
+        DataDictionaryCustom roleReleasePercentDic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(
+                GreenScoreEnum.ROLE_RELEASE_PERCENT.getType(),
+                GreenScoreEnum.ROLE_RELEASE_PERCENT.getCode()
+        );
+        if(ObjectUtil.isEmpty(roleReleasePercentDic)){
+            return;
+        }
+        //释放比例
+        BigDecimal roleReleasePercent = new BigDecimal(roleReleasePercentDic.getValue()).multiply(new BigDecimal(0.001));
+        for(MallScoreRecord mallScoreRecord : mallScoreRecords){
+            Long memberId = mallScoreRecord.getMemberId();
+            //每日释放的绿色凭证数量 = 总数 * 释放比例
+            BigDecimal scoreCnt = mallScoreRecord.getScoreCnt();
+            BigDecimal scoreReleaseCnt = scoreCnt.multiply(roleReleasePercent).setScale(2,BigDecimal.ROUND_DOWN);
+
+            BigDecimal surplusCnt = mallScoreRecord.getSurplusCnt();
+            if(scoreReleaseCnt.compareTo(surplusCnt) >= 0){
+                scoreReleaseCnt = surplusCnt;
+            }
+            if(scoreReleaseCnt.compareTo(BigDecimal.ZERO) > 0){
+                releaseToMemberAndAddFlow(scoreReleaseCnt,memberId,
+                        MoneyFlowTypeEnum.ROLE_RELEASE_SCORE.getValue(),mallScoreRecord.getScoreNo());
+
+                //更新凭证记录的剩余数量
+                surplusCnt = surplusCnt.subtract(scoreReleaseCnt);
+                mallScoreRecord.setSurplusCnt(surplusCnt);
+                mallScoreRecordMapper.updateById(mallScoreRecord);
+            }
+        }
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void achieveReleaseJob() {
+        /**
+         * 业绩产生凭证
+         *      获取每日最大产生的凭证数量
+         *      获取每日总业绩
+         *      获取业绩产生凭证的最大值和最小值
+         *      每条业绩记录占
+         */
+
+        //获取每日总业绩
+        Date profitDate = DateUtil.offset(new Date(), DateField.DAY_OF_YEAR, -1);
+        BigDecimal achieveTotal = mallAchieveRecordMapper.selectAchieveTotal("D", profitDate);
+
+        DataDictionaryCustom achieveMinDic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(
+                GreenScoreEnum.ACHIEVE_MIN.getType(),
+                GreenScoreEnum.ACHIEVE_MIN.getCode()
+        );
+        //业绩的最小值
+        BigDecimal achieveMin = new BigDecimal(achieveMinDic.getValue() == null ? "0" : achieveMinDic.getValue());
+        if(achieveTotal.compareTo(achieveMin) < 0){
+            return;
+        }
+
+        DataDictionaryCustom achieveMaxDic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(
+                GreenScoreEnum.ACHIEVE_MAX.getType(),
+                GreenScoreEnum.ACHIEVE_MAX.getCode()
+        );
+        //业绩的最大值
+        BigDecimal achieveMax = new BigDecimal(achieveMaxDic.getValue() == null ? "0" : achieveMaxDic.getValue());
+
+        /**
+         * 获取每日最大产生的凭证数量
+         *      改成每日产出固定值
+         */
+//        BigDecimal achieveDailyRelease = getAchieveDailyRelease();
+        DataDictionaryCustom achieveReleaseDic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(
+                GreenScoreEnum.ACHIEVE_RELEASE.getType(),
+                GreenScoreEnum.ACHIEVE_RELEASE.getCode()
+        );
+        BigDecimal achieveDailyRelease = new BigDecimal(achieveReleaseDic.getValue() == null ? "0" : achieveReleaseDic.getValue());
+        if(achieveDailyRelease.compareTo(BigDecimal.ZERO) <= 0){
+            return;
+        }
+
+        if(achieveTotal.compareTo(achieveMax) < 0){
+            BigDecimal divide = achieveTotal.divide(achieveMax, 2, BigDecimal.ROUND_DOWN);
+            achieveDailyRelease = achieveDailyRelease.multiply(divide).setScale(2,BigDecimal.ROUND_DOWN);
+        }
+        /**
+         * 实际每日最大产生的凭证数量
+         */
+        BigDecimal achieveDailyReleaseReal = BigDecimal.ZERO;
+        /**
+         * 业务编号
+         */
+        String scoreNo = MallUtils.getOrderNum("ARSX");
+
+        /**
+         * 20%给合伙人、联创
+         *  5% 给联创
+         *  15% 给合伙人
+         */
+        DataDictionaryCustom roleAchievePercentDic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(
+                GreenScoreEnum.ROLE_ACHIEVE_PERCENT.getType(),
+                GreenScoreEnum.ROLE_ACHIEVE_PERCENT.getCode()
+        );
+        //业绩产生凭证给创世的比例
+        BigDecimal roleAchievePercent = new BigDecimal(roleAchievePercentDic.getValue() == null ? "0" : roleAchievePercentDic.getValue())
+                                        .multiply(new BigDecimal(0.01));
+        //创世的凭证数量
+        BigDecimal roleAchieveRelease = achieveDailyRelease.multiply(roleAchievePercent).setScale(2, BigDecimal.ROUND_DOWN);
+        List<MallMember> roleAchieveReleaseMembers = mallMemberMapper.selectByRole(3,1);
+        if(CollUtil.isNotEmpty(roleAchieveReleaseMembers)){
+            //联创拿走0.25
+            BigDecimal multiply = roleAchieveRelease.multiply(new BigDecimal(0.25));
+            BigDecimal memberAchieveRelease = multiply.divide(new BigDecimal(roleAchieveReleaseMembers.size()), 2, BigDecimal.ROUND_DOWN);
+            if(memberAchieveRelease.compareTo(BigDecimal.ZERO) > 0){
+                for(MallMember mallMember : roleAchieveReleaseMembers){
+
+                    releaseToMemberAndAddFlow(memberAchieveRelease,mallMember.getId(),
+                            MoneyFlowTypeEnum.ACHIEVE_RELEASE_SCORE_LC.getValue(),scoreNo);
+
+                    achieveDailyReleaseReal = achieveDailyReleaseReal.add(memberAchieveRelease);
+                }
+            }
+        }
+        //合伙人拿走0.75
+        List<MallMember> roleAchieveReleaseHHR = mallMemberMapper.selectByRole(4,1);
+        if(CollUtil.isNotEmpty(roleAchieveReleaseHHR)){
+            //合伙人拿走0.75
+            BigDecimal multiply = roleAchieveRelease.multiply(new BigDecimal(0.75));
+            BigDecimal memberAchieveReleaseHHR = multiply.divide(new BigDecimal(roleAchieveReleaseHHR.size()), 2, BigDecimal.ROUND_DOWN);
+            if(memberAchieveReleaseHHR.compareTo(BigDecimal.ZERO) > 0){
+                for(MallMember mallMember : roleAchieveReleaseHHR){
+
+                    releaseToMemberAndAddFlow(memberAchieveReleaseHHR,mallMember.getId(),
+                            MoneyFlowTypeEnum.ACHIEVE_RELEASE_SCORE_HHR.getValue(),scoreNo);
+
+                    achieveDailyReleaseReal = achieveDailyReleaseReal.add(memberAchieveReleaseHHR);
+                }
             }
         }
 
-        log.info("#####==店补/董事==end==######");
+        /**
+         * 30%按贡献点分配给所有人
+         */
+        DataDictionaryCustom starAchievePercentDic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(
+                GreenScoreEnum.STAR_ACHIEVE_PERCENT.getType(),
+                GreenScoreEnum.STAR_ACHIEVE_PERCENT.getCode()
+        );
+        //业绩产生凭证给贡献点分配给所有人
+        BigDecimal starAchievePercent = new BigDecimal(starAchievePercentDic.getValue() == null ? "0" : starAchievePercentDic.getValue())
+                .multiply(new BigDecimal(0.01));
+        //贡献点的凭证数量
+        BigDecimal starAchieveRelease = achieveDailyRelease.multiply(starAchievePercent).setScale(2, BigDecimal.ROUND_DOWN);
+        BigDecimal starSumCnt = mallMemberWalletMapper.selectSumStar();
+        if(starSumCnt.compareTo(BigDecimal.ZERO) > 0){
+            //每一个贡献点获取的凭证
+            BigDecimal starAchieveReleaseOne = starAchieveRelease.divide(starSumCnt, 2, BigDecimal.ROUND_DOWN);
+            List<MallMemberWallet> mallMemberWallets = mallMemberWalletMapper.selectStar();
+            if(CollUtil.isNotEmpty(mallMemberWallets) && starAchieveReleaseOne.compareTo(BigDecimal.ZERO) > 0){
+                for(MallMemberWallet mallMemberWallet : mallMemberWallets){
+                    //每个人获取的凭证 = 贡献点 * 每一个贡献点值的凭证
+                    BigDecimal bigDecimal = starAchieveReleaseOne.multiply(new BigDecimal(mallMemberWallet.getStar())).setScale(2, BigDecimal.ROUND_DOWN);
+
+                    releaseToMemberAndAddFlow(bigDecimal,mallMemberWallet.getMemberId(),
+                            MoneyFlowTypeEnum.ACHIEVE_RELEASE_SCORE_GXD.getValue(),scoreNo);
+
+                    achieveDailyReleaseReal = achieveDailyReleaseReal.add(bigDecimal);
+                }
+            }
+        }
+        /**
+         * 50%按按星级分配给所有人
+         * 二星  30%
+         * 三星  25%
+         * 四星  20%
+         * 五星  15%
+         * 六星  10%
+         */
+        DataDictionaryCustom levelAchievePercentDic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(
+                GreenScoreEnum.LEVEL_ACHIEVE_PERCENT.getType(),
+                GreenScoreEnum.LEVEL_ACHIEVE_PERCENT.getCode()
+        );
+        //业绩产生凭证给星级分配给所有人
+        BigDecimal levelAchievePercent = new BigDecimal(levelAchievePercentDic.getValue() == null ? "0" : levelAchievePercentDic.getValue())
+                .multiply(new BigDecimal(0.01));
+        //业绩产生凭证给星级分配给所有人总数
+        BigDecimal levelAchieveRelease = achieveDailyRelease.multiply(levelAchievePercent).setScale(2, BigDecimal.ROUND_DOWN);
+        BigDecimal thirdRelease = releaseByLevel(levelAchieveRelease, AgentLevelEnum.THIRD_LEVEL.getCode(), new BigDecimal(0.3),scoreNo);
+        achieveDailyReleaseReal = achieveDailyReleaseReal.add(thirdRelease);
+
+        BigDecimal fourRelease = releaseByLevel(levelAchieveRelease, AgentLevelEnum.FOUR_LEVEL.getCode(), new BigDecimal(0.25),scoreNo);
+        achieveDailyReleaseReal = achieveDailyReleaseReal.add(fourRelease);
+
+        BigDecimal fiveRelease = releaseByLevel(levelAchieveRelease, AgentLevelEnum.FIFTH_LEVEL.getCode(), new BigDecimal(0.2),scoreNo);
+        achieveDailyReleaseReal = achieveDailyReleaseReal.add(fiveRelease);
+
+        BigDecimal sixRelease = releaseByLevel(levelAchieveRelease, AgentLevelEnum.SIX_LEVEL.getCode(), new BigDecimal(0.15),scoreNo);
+        achieveDailyReleaseReal = achieveDailyReleaseReal.add(sixRelease);
+
+        BigDecimal sevenRelease = releaseByLevel(levelAchieveRelease, AgentLevelEnum.SEVEN_LEVEL.getCode(), new BigDecimal(0.1),scoreNo);
+        achieveDailyReleaseReal = achieveDailyReleaseReal.add(sevenRelease);
+
+        if(achieveDailyReleaseReal.compareTo(BigDecimal.ZERO) > 0){
+            DataDictionaryCustom surplusCntDic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(
+                    GreenScoreEnum.SURPLUS_CNT.getType(),
+                    GreenScoreEnum.SURPLUS_CNT.getCode()
+            );
+            //绿色积分剩余数量
+            BigDecimal surplusCnt = new BigDecimal(surplusCntDic.getValue() == null ? "0" : surplusCntDic.getValue());
+            BigDecimal subtract = surplusCnt.subtract(achieveDailyReleaseReal).setScale(2,BigDecimal.ROUND_DOWN);
+            surplusCntDic.setValue(subtract.toString());
+            dataDictionaryCustomMapper.updateById(surplusCntDic);
+        }
+
+        log.info("昨日实际业绩:{},昨日凭证总共:{},实际产生凭证:{}",
+                achieveTotal,achieveDailyRelease,achieveDailyReleaseReal);
+        MallScoreAchieveRelease mallScoreAchieveRelease = new MallScoreAchieveRelease();
+        mallScoreAchieveRelease.setAchieve(achieveTotal);
+        mallScoreAchieveRelease.setReleaseNo(scoreNo);
+        mallScoreAchieveRelease.setVoucherExpect(achieveDailyRelease);
+        mallScoreAchieveRelease.setVoucherReal(achieveDailyReleaseReal);
+        mallScoreAchieveReleaseMapper.insert(mallScoreAchieveRelease);
+
     }
+
+    @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;
+    }
+
 }

--
Gitblit v1.9.1