From 6216249c6b7483d0e3f56cad3f1d066de59970de Mon Sep 17 00:00:00 2001
From: jiangchao <jiangchao@feewee.cn>
Date: Mon, 22 May 2023 14:57:20 +0800
Subject: [PATCH] feature(*): 修改bug

---
 fw-morax-dao/src/main/resources/mapper/eval/EvalGroupMapper.xml                          |   6 ++++--
 fw-morax-server/src/main/java/cn/fw/morax/server/task/EvalGroupUserTask.java             |   2 +-
 fw-morax-service/src/main/java/cn/fw/morax/service/biz/eval/EvalCalculateService.java    |   9 +++++----
 fw-morax-service/src/main/java/cn/fw/morax/service/biz/eval/EvalGroupUserBizService.java |  17 ++---------------
 fw-morax-service/src/main/java/cn/fw/morax/service/biz/eval/EvalPoolCommonService.java   |  36 ++++++++++++++++++------------------
 fw-morax-service/src/main/java/cn/fw/morax/service/biz/eval/EvalRewardService.java       | 220 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-------------------------------------------------------------------------------------------
 6 files changed, 159 insertions(+), 131 deletions(-)

diff --git a/fw-morax-dao/src/main/resources/mapper/eval/EvalGroupMapper.xml b/fw-morax-dao/src/main/resources/mapper/eval/EvalGroupMapper.xml
index c6893e8..69a4c18 100644
--- a/fw-morax-dao/src/main/resources/mapper/eval/EvalGroupMapper.xml
+++ b/fw-morax-dao/src/main/resources/mapper/eval/EvalGroupMapper.xml
@@ -72,13 +72,15 @@
             t3.id
         FROM
             eval_group_rank t1
-                LEFT JOIN eval_group_rank_stage t2 ON t1.id = t2.eval_group_rank_id AND t2.yn = 1
-                LEFT JOIN eval_group t3 ON t2.id = t3.eval_group_rank_stage_id AND t3.yn = 1
+                INNER JOIN eval_group_rank_stage t2 ON t1.id = t2.eval_group_rank_id AND t2.yn = 1
+                INNER JOIN eval_group t3 ON t2.id = t3.eval_group_rank_stage_id AND t3.yn = 1
+                INNER JOIN eval_group_reward_dim t4 ON t3.id = t4.eval_group_id AND t4.yn = 1
         WHERE
             t1.yn = 1
           AND t1.`status` IN ( 3, 4 )
           and DATE_FORMAT(t2.begin_time, '%Y-%m-%d') &lt;= DATE_FORMAT(#{day}, '%Y-%m-%d')
           and DATE_FORMAT(t2.over_time, '%Y-%m-%d') = DATE_FORMAT(#{day}, '%Y-%m-%d')
+          AND t4.`type` = 2
     </select>
 
     <select id="getEffectsByRankId" resultMap="BaseResultMap">
diff --git a/fw-morax-server/src/main/java/cn/fw/morax/server/task/EvalGroupUserTask.java b/fw-morax-server/src/main/java/cn/fw/morax/server/task/EvalGroupUserTask.java
index 0d53285..92bf172 100644
--- a/fw-morax-server/src/main/java/cn/fw/morax/server/task/EvalGroupUserTask.java
+++ b/fw-morax-server/src/main/java/cn/fw/morax/server/task/EvalGroupUserTask.java
@@ -105,7 +105,7 @@ public class EvalGroupUserTask {
         List<EvalGroupUser> evalGroupUsers = null;
         for (EvalGroup evalGroup : evalGroups) {
             for (Long postId : evalGroup.getPostIds()) {
-                evalGroupUsers = evalGroupUserBizService.fetchBuildKpiUser(postId, evalGroups, yesterday);
+                evalGroupUsers = evalGroupUserBizService.fetchBuildKpiUser(postId, evalGroup, yesterday);
                 evalGroupUsersForSave.addAll(evalGroupUsers);
             }
         }
diff --git a/fw-morax-service/src/main/java/cn/fw/morax/service/biz/eval/EvalCalculateService.java b/fw-morax-service/src/main/java/cn/fw/morax/service/biz/eval/EvalCalculateService.java
index 8604f73..abe5972 100644
--- a/fw-morax-service/src/main/java/cn/fw/morax/service/biz/eval/EvalCalculateService.java
+++ b/fw-morax-service/src/main/java/cn/fw/morax/service/biz/eval/EvalCalculateService.java
@@ -184,7 +184,7 @@ public class EvalCalculateService {
             log.error("考评排名组阶段[{}]不存在，终止计算！", JSON.toJSONString(evalGroup));
             return;
         }
-        List<EvalGroupUserShop> userShops = this.buildEvalGroupObj(evalGroup, evalGroupRankStage.getBeginTime(), localDate, scopeType);
+        List<EvalGroupUserShop> userShops = this.buildEvalGroupObj(evalGroup, evalGroupRankStage, localDate, scopeType);
         if (CollectionUtils.isEmpty(userShops)) {
             log.error("考评组[{}]人员为空，终止计算！", evalGroupId);
             return;
@@ -269,16 +269,17 @@ public class EvalCalculateService {
     }
 
 
-    public List<EvalGroupUserShop> buildEvalGroupObj(EvalGroup evalGroup, LocalDate beginDate, LocalDate localDate, EvalScopeEnum scopeType) {
+    public List<EvalGroupUserShop> buildEvalGroupObj(EvalGroup evalGroup, EvalGroupRankStage evalGroupRankStage, LocalDate localDate, EvalScopeEnum scopeType) {
+        LocalDate beginDate = evalGroupRankStage.getBeginTime();
         List<EvalGroupUserShop> userShops = new ArrayList<>();
         if (EvalScopeEnum.STAFF.equals(scopeType)) {
             List<EvalGroupUser> users = evalGroupUserService.list(Wrappers.<EvalGroupUser>lambdaQuery()
-                    .eq(EvalGroupUser::getEvalGroupId, evalGroup.getId())
+                    .eq(EvalGroupUser::getEvalGroupRankStageId, evalGroupRankStage.getId())
                     .eq(EvalGroupUser::getDataDate, localDate)
                     .eq(EvalGroupUser::getYn, Boolean.TRUE)
             );
 
-            Map<Long, EvalUserPool> userPoolMap = evalPoolCommonService.inspectionUserPoolMap(evalGroup, users, localDate);
+            Map<Long, EvalUserPool> userPoolMap = evalPoolCommonService.inspectionUserPoolMap(evalGroup, evalGroupRankStage, users, localDate);
             for (EvalGroupUser user : users) {
                 if (Boolean.TRUE.equals(user.getIgnored())) {
                     continue;
diff --git a/fw-morax-service/src/main/java/cn/fw/morax/service/biz/eval/EvalGroupUserBizService.java b/fw-morax-service/src/main/java/cn/fw/morax/service/biz/eval/EvalGroupUserBizService.java
index b634500..8dd687f 100644
--- a/fw-morax-service/src/main/java/cn/fw/morax/service/biz/eval/EvalGroupUserBizService.java
+++ b/fw-morax-service/src/main/java/cn/fw/morax/service/biz/eval/EvalGroupUserBizService.java
@@ -69,24 +69,11 @@ public class EvalGroupUserBizService {
      * @return
      */
     @Transactional(rollbackFor = Exception.class)
-    public List<EvalGroupUser> fetchBuildKpiUser(Long postId, List<EvalGroup> evalGroups, LocalDate localDate){
-        Set<Long> shopIds = new HashSet<>();
-        Map<Long, EvalGroup> shopKpiGroupMap = new HashMap<>();
-        for (EvalGroup evalGroup : evalGroups) {
-            shopIds.addAll(evalGroup.getShopIds());
-            for (Long shopId : evalGroup.getShopIds()) {
-                shopKpiGroupMap.put(shopId, evalGroup);
-            }
-        }
-        List<EvalGroupUser> evalGroupUsers = this.fetchPostUsers(postId, new ArrayList<>(shopIds), localDate);
+    public List<EvalGroupUser> fetchBuildKpiUser(Long postId, EvalGroup evalGroup, LocalDate localDate){
+        List<EvalGroupUser> evalGroupUsers = this.fetchPostUsers(postId, evalGroup.getShopIds(), localDate);
 
         //构建考评组信息
         for (EvalGroupUser user : evalGroupUsers) {
-            if (! shopKpiGroupMap.containsKey(user.getShopId())) {
-                log.error("员工门店没有绩效组配置，门店：{}，岗位：{}，员工：{}", user.getShopId(), user.getPostId(), user.getId());
-                continue;
-            }
-            EvalGroup evalGroup = shopKpiGroupMap.get(user.getShopId());
             user.setEvalGroupRankId(evalGroup.getEvalGroupRankId());
             user.setEvalGroupRankStageId(evalGroup.getEvalGroupRankStageId());
             user.setEvalGroupId(evalGroup.getId());
diff --git a/fw-morax-service/src/main/java/cn/fw/morax/service/biz/eval/EvalPoolCommonService.java b/fw-morax-service/src/main/java/cn/fw/morax/service/biz/eval/EvalPoolCommonService.java
index a76f30e..b21b18d 100644
--- a/fw-morax-service/src/main/java/cn/fw/morax/service/biz/eval/EvalPoolCommonService.java
+++ b/fw-morax-service/src/main/java/cn/fw/morax/service/biz/eval/EvalPoolCommonService.java
@@ -46,13 +46,13 @@ public class EvalPoolCommonService {
     private EhrRpcService ehrRpcService;
     private OopRpcService oopRpcService;
 
-    public Map<Long, EvalUserPool> inspectionUserPoolMap(EvalGroup evalGroup, List<EvalGroupUser> users, LocalDate localDate) {
+    public Map<Long, EvalUserPool> inspectionUserPoolMap(EvalGroup evalGroup, EvalGroupRankStage evalGroupRankStage, List<EvalGroupUser> users, LocalDate localDate) {
         if (PublicUtil.isEmpty(users)) {
             return new HashMap<>();
         }
         Set<Long> userIds = users.stream().map(EvalGroupUser::getUserId).collect(Collectors.toSet());
         List<EvalUserPool> pools = evalUserPoolService.list(Wrappers.<EvalUserPool>lambdaQuery()
-                .eq(EvalUserPool::getEvalGroupId, evalGroup.getId())
+                .eq(EvalUserPool::getEvalGroupRankStageId, evalGroupRankStage.getId())
                 .eq(EvalUserPool::getMonthly, YearMonth.from(localDate))
                 .in(EvalUserPool::getUserId, userIds)
                 .eq(EvalUserPool::getYn, Boolean.TRUE)
@@ -157,7 +157,7 @@ public class EvalPoolCommonService {
     @Transactional(rollbackFor = Exception.class)
     public EvalUserPool inspectionUserPool(EvalGroupUser user) {
         EvalUserPool evalUserPool = evalUserPoolService.getOne(Wrappers.<EvalUserPool>lambdaQuery()
-                        .eq(EvalUserPool::getEgc, user.getEgc())
+                        .eq(EvalUserPool::getEvalGroupRankStageId, user.getEvalGroupRankStageId())
                         .eq(EvalUserPool::getUserId, user.getUserId())
                         .eq(EvalUserPool::getMonthly, YearMonth.from(user.getDataDate()))
                         .eq(EvalUserPool::getYn, Boolean.TRUE)
@@ -165,21 +165,21 @@ public class EvalPoolCommonService {
         if (PublicUtil.isNotEmpty(evalUserPool)) {
             return evalUserPool;
         }
-        evalUserPool = evalUserPoolService.getOne(Wrappers.<EvalUserPool>lambdaQuery()
-                        .eq(EvalUserPool::getEgc, user.getEgc())
-                        .eq(EvalUserPool::getUserId, user.getUserId())
-                        .eq(EvalUserPool::getMonthly, YearMonth.from(user.getDataDate()).minusMonths(1))
-                        .eq(EvalUserPool::getYn, Boolean.TRUE)
-                , Boolean.FALSE);
-        if (PublicUtil.isNotEmpty(evalUserPool)) {
-            evalUserPoolService.update(Wrappers.<EvalUserPool>lambdaUpdate()
-                    .eq(EvalUserPool::getId, evalUserPool.getId())
-                    .set(EvalUserPool::getMonthly, YearMonth.from(user.getDataDate()))
-                    .set(EvalUserPool::getUpdateTime, new Date())
-            );
-            evalUserPool.setMonthly(YearMonth.from(user.getDataDate()));
-            return evalUserPool;
-        }
+//        evalUserPool = evalUserPoolService.getOne(Wrappers.<EvalUserPool>lambdaQuery()
+//                        .eq(EvalUserPool::getEvalGroupRankStageId, user.getEvalGroupRankStageId())
+//                        .eq(EvalUserPool::getUserId, user.getUserId())
+//                        .eq(EvalUserPool::getMonthly, YearMonth.from(user.getDataDate()).minusMonths(1))
+//                        .eq(EvalUserPool::getYn, Boolean.TRUE)
+//                , Boolean.FALSE);
+//        if (PublicUtil.isNotEmpty(evalUserPool)) {
+//            evalUserPoolService.update(Wrappers.<EvalUserPool>lambdaUpdate()
+//                    .eq(EvalUserPool::getId, evalUserPool.getId())
+//                    .set(EvalUserPool::getMonthly, YearMonth.from(user.getDataDate()))
+//                    .set(EvalUserPool::getUpdateTime, new Date())
+//            );
+//            evalUserPool.setMonthly(YearMonth.from(user.getDataDate()));
+//            return evalUserPool;
+//        }
         return this.createUserPoolData(user);
     }
 
diff --git a/fw-morax-service/src/main/java/cn/fw/morax/service/biz/eval/EvalRewardService.java b/fw-morax-service/src/main/java/cn/fw/morax/service/biz/eval/EvalRewardService.java
index ff9731f..a65f877 100644
--- a/fw-morax-service/src/main/java/cn/fw/morax/service/biz/eval/EvalRewardService.java
+++ b/fw-morax-service/src/main/java/cn/fw/morax/service/biz/eval/EvalRewardService.java
@@ -1,36 +1,33 @@
 package cn.fw.morax.service.biz.eval;
 
+import cn.fw.backlog.sdk.api.result.FailBacklogItem;
 import cn.fw.common.cache.locker.DistributedLocker;
 import cn.fw.common.exception.BusinessException;
 import cn.fw.common.web.auth.LoginAuthBean;
 import cn.fw.morax.common.config.TodoVal;
 import cn.fw.morax.common.pojo.event.ApprovalResultEvent;
+import cn.fw.morax.common.utils.DateUtil;
 import cn.fw.morax.common.utils.PublicUtil;
 import cn.fw.morax.common.utils.ThreadPoolUtil;
 import cn.fw.morax.domain.bo.eval.EvalGroupRewardDistributionBO;
 import cn.fw.morax.domain.db.ApprovalRecord;
-import cn.fw.morax.domain.db.eval.EvalGroup;
-import cn.fw.morax.domain.db.eval.EvalRewardDist;
-import cn.fw.morax.domain.db.eval.EvalRewardDistDetail;
-import cn.fw.morax.domain.db.eval.EvalShopPool;
+import cn.fw.morax.domain.db.eval.*;
 import cn.fw.morax.domain.dto.eval.EvalRewardDistDTO;
 import cn.fw.morax.domain.dto.eval.EvalRewardDistDetailDTO;
-import cn.fw.morax.domain.enums.ApprovalTypeEnum;
-import cn.fw.morax.domain.enums.EvalRewardDistStatusEnum;
-import cn.fw.morax.domain.enums.EvalRewardPushStatusEnum;
+import cn.fw.morax.domain.enums.*;
 import cn.fw.morax.domain.vo.eval.EvalRewardDistDetailVO;
 import cn.fw.morax.domain.vo.eval.EvalRewardDistVO;
 import cn.fw.morax.domain.vo.eval.EvalShopPoolVO;
 import cn.fw.morax.rpc.backlog.TodoRpcService;
 import cn.fw.morax.rpc.backlog.dto.BackLogItemDTO;
+import cn.fw.morax.rpc.backlog.dto.BacklogBatchPlanItemReqDTO;
+import cn.fw.morax.rpc.backlog.dto.BacklogBatchPlanReqDTO;
 import cn.fw.morax.rpc.erp.ErpRpcService;
 import cn.fw.morax.rpc.erp.dto.RpcUserRoleInfoDTO;
+import cn.fw.morax.rpc.erp.dto.RpcUserRoleShopDTO;
 import cn.fw.morax.service.biz.ApprovalBizService;
 import cn.fw.morax.service.data.ApprovalRecordService;
-import cn.fw.morax.service.data.eval.EvalGroupService;
-import cn.fw.morax.service.data.eval.EvalRewardDistDetailService;
-import cn.fw.morax.service.data.eval.EvalRewardDistService;
-import cn.fw.morax.service.data.eval.EvalShopPoolService;
+import cn.fw.morax.service.data.eval.*;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
@@ -47,11 +44,14 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.math.BigDecimal;
+import java.text.DecimalFormat;
 import java.time.LocalDate;
+import java.time.LocalDateTime;
 import java.util.*;
 import java.util.concurrent.RejectedExecutionException;
 import java.util.concurrent.ThreadPoolExecutor;
 import java.util.concurrent.locks.Lock;
+import java.util.stream.Collectors;
 
 import static cn.fw.common.businessvalidator.Validator.BV;
 
@@ -75,6 +75,9 @@ public class EvalRewardService {
     private final EvalShopPoolService evalShopPoolService;
     private final ApprovalRecordService approvalRecordService;
     private final EvalRewardDistService evalRewardDistService;
+    private final EvalGroupRankService evalGroupRankService;
+    private final EvalGroupRankStageService evalGroupRankStageService;
+    private final EvalGroupRewardDimService evalGroupRewardDimService;
     private final EvalRewardDistDetailService evalRewardDistDetailService;
 
     @Value("${spring.cache.custom.global-prefix}:dist:eval-reward")
@@ -152,14 +155,32 @@ public class EvalRewardService {
         log.info("分配奖惩的考评组：{}", evalGroupId);
         EvalGroup evalGroup = evalGroupService.getById(evalGroupId);
         BV.notNull(evalGroup, "考评组不存在，终止计算！");
+        EvalGroupRank evalGroupRank = evalGroupRankService.getById(evalGroup.getEvalGroupRankId());
+        BV.notNull(evalGroupRank, "考评排名组不存在，终止计算！");
+        EvalGroupRankStage evalGroupRankStage = evalGroupRankStageService.getById(evalGroup.getEvalGroupRankStageId());
+        BV.notNull(evalGroupRankStage, "考评阶段不存在，终止计算！");
+
+
+//        List<EvalShopPool> pools = evalShopPoolService.list(Wrappers.<EvalShopPool>lambdaQuery()
+//                .eq(EvalShopPool::getEvalGroupId, evalGroupId)
+//                .eq(EvalShopPool::getYn, Boolean.TRUE)
+//        );
+//        if (PublicUtil.isEmpty(pools)) {
+//            log.error("考评池不存在，终止计算！");
+//            return;
+//        }
+//        BV.isNotEmpty(pools, "考评池不存在，终止计算！");
 
-        List<EvalShopPool> pools = evalShopPoolService.list(Wrappers.<EvalShopPool>lambdaQuery()
-                .eq(EvalShopPool::getEvalGroupId, evalGroupId)
-                .eq(EvalShopPool::getYn, Boolean.TRUE)
+        List<EvalGroupRewardDim> shopRewardDims = evalGroupRewardDimService.list(Wrappers.<EvalGroupRewardDim>lambdaQuery()
+                .eq(EvalGroupRewardDim::getEvalGroupId, evalGroup.getId())
+                .eq(EvalGroupRewardDim::getType, EvalScopeEnum.SHOP)
+                .eq(EvalGroupRewardDim::getYn, Boolean.TRUE)
         );
-        BV.isNotEmpty(pools, "考评池不存在，终止计算！");
-
-        sendDistRewardTodo(pools, evalGroup );
+        if (PublicUtil.isEmpty(shopRewardDims)) {
+            log.error("考评奖惩没有门店：{}", JSON.toJSONString(evalGroup));
+            return;
+        }
+        sendDistRewardTodo(shopRewardDims, evalGroup, evalGroupRank, evalGroupRankStage);
     }
 
     /**
@@ -168,81 +189,98 @@ public class EvalRewardService {
      * @param
      */
     @Transactional(rollbackFor = Exception.class)
-    public void sendDistRewardTodo(List<EvalShopPool> pools, EvalGroup evalGroup) {
-//        Eval eval = evalService.getById(evalGroup.getEvalGroupRankId());
-//        BV.notNull(eval, "考评配置不存在，请重试");
-//
-//        DecimalFormat decimalFormat = new DecimalFormat("##########.##");
-//        final String roleCode = evalGroup.getRoleCodes().stream().findFirst().get();
-//        final String evalGroupName = evalGroup.getName();
-//        final String evalName = eval.getName();
-//        final EvalTypeEnum evalType = eval.getType();
-//        List<Long> shopIds = evalGroup.getShopIds();
-//
-//        Date expireTime = DateUtil.localDateTime2Date(LocalDateTime.now().plusDays(2L));
-//
-//        List<BacklogBatchPlanItemReqDTO> itemList = new ArrayList<>();
-//        List<RpcUserRoleInfoDTO> users = this.getUserEnableRoleInfos(roleCode, shopIds);
-//        for (RpcUserRoleInfoDTO user : users) {
-//            List<Long> manageShopIds = user.getRangeList().stream()
-//                    .filter(range -> shopIds.contains(range.getShopId()))
-//                    .map(RpcUserRoleShopDTO::getShopId).distinct().collect(Collectors.toList());
-//            if (PublicUtil.isEmpty(manageShopIds)) {
-//                continue;
-//            }
-//
-//            List<Long> poolIds = new ArrayList<>();
-//            BigDecimal reward = BigDecimal.ZERO;
-//            for (EvalShopPool pool : pools) {
-//                if (manageShopIds.contains(pool.getShopId())) {
-//                    poolIds.add(pool.getId());
-//                    reward = reward.add(pool.getReward());
-//                }
-//            }
-//            //奖惩为0不分配
-//            if (BigDecimal.ZERO.compareTo(reward) == 0) {
-//                return;
-//            }
-//
-//            EvalRewardDist rewardDist = transferPo(evalGroup);
-//            rewardDist.setUserId(user.getUserId());
-//            rewardDist.setEvalShopPoolIds(poolIds);
-//            rewardDist.setShopIds(manageShopIds);
-//            rewardDist.setEvalName(evalName);
-//            rewardDist.setEvalType(evalType);
-//            rewardDist.setReward(reward);
-//            evalRewardDistService.save(rewardDist);
-//
-//            BacklogBatchPlanItemReqDTO planItemReq = new BacklogBatchPlanItemReqDTO();
-//            planItemReq.setDataId(rewardDist.getId().toString());
-//            planItemReq.setUserId(user.getUserId());
-//            planItemReq.setPlanTime(new Date());
-//            planItemReq.setExpireTime(expireTime);
-//
-//            Map<String, String> dynamicMap = new HashMap<>(8);
-//            dynamicMap.put("evalGroupName", evalGroupName);
-//            dynamicMap.put("evalName", evalName);
-//            dynamicMap.put("evalType", evalType.getName());
-//            dynamicMap.put("amount", decimalFormat.format(rewardDist.getReward()));
-//            planItemReq.setDynamicMap(dynamicMap);
-//
-//            Map<String, Object> extraData = new HashMap<>();
-//            planItemReq.setExtraData(extraData);
-//            itemList.add(planItemReq);
-//        }
-//
-//
-//        //推送待办
-//        BacklogBatchPlanReqDTO batchPlanReq = new BacklogBatchPlanReqDTO(todoVal.getDistEvalReward(), itemList);
-//        List<FailBacklogItem> failItems = Optional.ofNullable(todoRpcService.batchPush(batchPlanReq)).orElse(new ArrayList<>());
-//        if (PublicUtil.isNotEmpty(failItems)) {
-//            log.error("发送分配考评奖励待办失败，失败人员信息：{}", JSON.toJSONString(failItems));
-//        }
+    public void sendDistRewardTodo(List<EvalGroupRewardDim> shopRewardDims, EvalGroup evalGroup,
+                                   EvalGroupRank evalGroupRank, EvalGroupRankStage evalGroupRankStage) {
+        String evalGroupRankName = evalGroupRank.getName();
+        String evalGroupRankStageName = evalGroupRankStage.getName();
+        DecimalFormat decimalFormat = new DecimalFormat("##########.##");
+        List<BacklogBatchPlanItemReqDTO> itemList = new ArrayList<>();
+
+        List<Long> distPoolIds = new ArrayList<>();
+        final Date expireTime = DateUtil.localDateTime2Date(LocalDateTime.now().plusDays(2L));
+        for (EvalGroupRewardDim rewardDim : shopRewardDims) {
+            final String roleCode = rewardDim.getDistRoleCode();
+            List<EvalShopPool> pools = evalShopPoolService.list(Wrappers.<EvalShopPool>lambdaQuery()
+                .eq(EvalShopPool::getEvalGroupId, evalGroup.getId())
+                .in(EvalShopPool::getShopId, rewardDim.getShopIds())
+                .eq(EvalShopPool::getYn, Boolean.TRUE)
+            );
+            if (PublicUtil.isEmpty(pools)) {
+                log.error("分配奖惩待办，未找到考评池：{}", JSON.toJSONString(rewardDim));
+                continue;
+            }
+            List<Long> distShopIds = pools.stream().filter(pool -> pool.getReward().compareTo(BigDecimal.ZERO) == 0)
+                    .map(EvalShopPool::getShopId).collect(Collectors.toList());
+
+            List<RpcUserRoleInfoDTO> users = this.getUserEnableRoleInfos(roleCode, distShopIds);
+            for (RpcUserRoleInfoDTO user : users) {
+                List<Long> manageShopIds = user.getRangeList().stream()
+                        .filter(range -> distShopIds.contains(range.getShopId()))
+                        .map(RpcUserRoleShopDTO::getShopId).distinct().collect(Collectors.toList());
+                if (PublicUtil.isEmpty(manageShopIds)) {
+                    continue;
+                }
+                List<Long> poolIds = new ArrayList<>();
+                BigDecimal reward = BigDecimal.ZERO;
+                for (EvalShopPool pool : pools) {
+                    if (manageShopIds.contains(pool.getShopId())) {
+                        poolIds.add(pool.getId());
+                        distPoolIds.add(pool.getId());
+                        reward = reward.add(pool.getReward());
+                    }
+                }
+                //奖惩为0不分配
+                if (BigDecimal.ZERO.compareTo(reward) == 0) {
+                    return;
+                }
+
+                EvalRewardDist rewardDist = transferPo(evalGroup);
+                rewardDist.setUserId(user.getUserId());
+                rewardDist.setEvalShopPoolIds(poolIds);
+                rewardDist.setShopIds(manageShopIds);
+                rewardDist.setEvalName(evalGroupRankName);
+//                rewardDist.setEvalType(evalType);
+                rewardDist.setReward(reward);
+                evalRewardDistService.save(rewardDist);
+
+                BacklogBatchPlanItemReqDTO planItemReq = new BacklogBatchPlanItemReqDTO();
+                planItemReq.setDataId(rewardDist.getId().toString());
+                planItemReq.setUserId(user.getUserId());
+                planItemReq.setPlanTime(new Date());
+                planItemReq.setExpireTime(expireTime);
+
+                Map<String, String> dynamicMap = new HashMap<>(8);
+                dynamicMap.put("evalGroupName", evalGroupRankName);
+                dynamicMap.put("evalName", evalGroupRankStageName);
+//                dynamicMap.put("evalType", evalType.getName());
+                dynamicMap.put("amount", decimalFormat.format(rewardDist.getReward()));
+                planItemReq.setDynamicMap(dynamicMap);
+
+                Map<String, Object> extraData = new HashMap<>();
+                planItemReq.setExtraData(extraData);
+                itemList.add(planItemReq);
+            }
 
-//        if (PublicUtil.isEmpty(failItems) || itemList.size() > failItems.size()) {
-//            pool.setStatus(EvalShopPoolStatusEnum.WAIT_DIST_REWARD);
-//            evalShopPoolService.updateById(pool);
-//        }
+        }
+
+
+        //推送待办
+        BacklogBatchPlanReqDTO batchPlanReq = new BacklogBatchPlanReqDTO(todoVal.getDistEvalReward(), itemList);
+        List<FailBacklogItem> failItems = Optional.ofNullable(todoRpcService.batchPush(batchPlanReq)).orElse(new ArrayList<>());
+        if (PublicUtil.isNotEmpty(failItems)) {
+            log.error("发送分配考评奖励待办失败，失败人员信息：{}", JSON.toJSONString(failItems));
+        }
+
+        if (PublicUtil.isEmpty(failItems) || itemList.size() > failItems.size()) {
+            if (PublicUtil.isNotEmpty(distPoolIds)) {
+                evalShopPoolService.update(Wrappers.<EvalShopPool>lambdaUpdate()
+                        .in(EvalShopPool::getId, distPoolIds)
+                        .set(EvalShopPool::getStatus, EvalShopPoolStatusEnum.WAIT_DIST_REWARD)
+                        .set(EvalShopPool::getYn, Boolean.FALSE)
+                        .set(EvalShopPool::getUpdateTime, new Date())
+                );
+            }
+        }
     }
 
     public EvalRewardDist transferPo(EvalGroup evalGroup) {
--
libgit2 0.22.2