feature(*): 申述后的薪资计算

- 申述后的薪资计算和薪酬确认待办推送（50%）

feature(*): 申述后的薪资计算
- 申述后的薪资计算和薪酬确认待办推送（50%）
张志伟
1 parent 3d4edc47
Showing 8 changed files with 188 additions and 76 deletions
fw-morax-common/src/main/java/cn/fw/morax/common/pojo/event/KpiStarAdjustmentEvent.java
fw-morax-common/src/main/java/cn/fw/morax/common/pojo/event/PaySalaryEvent.java
fw-morax-server/src/main/java/cn/fw/morax/server/task/GenericTask.java
fw-morax-server/src/main/java/cn/fw/morax/server/task/PayoffTask.java
fw-morax-server/src/main/java/cn/fw/morax/server/task/SalaryCalcTask.java
fw-morax-service/src/main/java/cn/fw/morax/service/biz/salary/PayoffBizService.java
fw-morax-service/src/main/java/cn/fw/morax/service/biz/salary/SalaryCalcService.java
fw-morax-service/src/main/java/cn/fw/morax/service/biz/salary/SalaryConfirmBizService.java
@@ -12,16 +12,12 @@ import java.time.YearMonth;
 @AllArgsConstructor
 @NoArgsConstructor
 public class KpiStarAdjustmentEvent {
-
     /**
      * 用户id
      */
     private Long userId;
-
-
     /**
      * 调整月份
      */
     private YearMonth yearMonth;
-
 }
@@ -5,7 +5,6 @@ import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
  
-import java.math.BigDecimal;
 import java.time.YearMonth;
  
 @Data
@@ -2,6 +2,7 @@ package cn.fw.morax.server.task;
  
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
+import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Component;
  
 /**
@@ -17,4 +18,11 @@ import org.springframework.stereotype.Component;
 @Slf4j
 @ConditionalOnProperty(prefix = "task", name = "switch", havingValue = "on")
 public class GenericTask {
+    /**
+     * 固定绩效数据
+     */
+    @Scheduled(cron = "0 0 5 * * ?")
+    public void persistence() {
+
+    }
 }
@@ -57,16 +57,16 @@ public class PayoffTask {
     }
  
     /**
-     * 发放工资
+     * 发放工资 [工资单数据推送财务系统]
      * [暂时不对接财务]
      */
 //    @Scheduled(initialDelay = 1000L * 20, fixedRate = 1000L * 20)
     public void go2pay() {
-      //  payoffBizService.go2payoff();
+        //  payoffBizService.go2payoff();
     }
  
     /**
-     * 生成工资单
+     * 生成工资单[工资发放记录]
      * 每两个小时执行
      */
     @Scheduled(cron = "0 0 0/2 * * ?")
@@ -96,9 +96,9 @@ public class PayoffTask {
     }
  
     /**
-     * 每隔两小时检查待办推送
+     * 每5分钟检查待办推送
      */
-    @Scheduled(cron = "0 0/10 * * * ?")
+    @Scheduled(cron = "0 0/5 * * * ?")
     public void pushTodo() {
         salaryConfirmBizService.pushConfirm();
     }
@@ -62,9 +62,9 @@ public class SalaryCalcTask {
     }
  
     /**
-     * 星级申请变更后重新计算用户工资 每180秒执行一次
+     * 星级申请变更后重新计算用户工资 每300秒执行一次
      */
-    @Scheduled(initialDelay = 1000L * 5, fixedRate = 1000L * 180)
+    @Scheduled(initialDelay = 1000L * 5, fixedRate = 1000L * 300)
     @Async
     public void kpiChangeRetryCalcSalary() {
         salaryCalcService.retryCalcSalary();
@@ -120,29 +120,30 @@ public class PayoffBizService {
                         .eq(SalaryGeneralSettin::getYn, Boolean.TRUE)
                         .eq(SalaryGeneralSettin::getGroupId, groupId)
                 , Boolean.FALSE);
-        int payoffDate = Optional.ofNullable(settin.getPayoffDate()).orElse(10);
+        int payoffDate = Optional.ofNullable(settin.getPayoffDate()).orElse(15);
         int dayOfMonth = LocalDate.now().getDayOfMonth();
-        if (dayOfMonth >= payoffDate) {
-            List<SalaryPool> salaryPoolList = salaryPoolService.list(Wrappers.<SalaryPool>lambdaQuery()
-                    .eq(SalaryPool::getMonthly, YearMonth.now().minusMonths(1))
-                    .eq(SalaryPool::getPaid, Boolean.FALSE)
-                    .eq(SalaryPool::getRegular, Boolean.TRUE)
-                    .eq(SalaryPool::getYn, Boolean.TRUE)
-            );
-            if (CollectionUtils.isEmpty(salaryPoolList)) {
-                return;
-            }
-            for (SalaryPool salaryPool : salaryPoolList) {
-                try {
-                    autoConfirmTodoNotice(salaryPool.getId());
-                    createSalarySheet(salaryPool, BigDecimal.valueOf(settin.getPayoffLimit()));
-                    salaryPool.setPaid(Boolean.TRUE);
-                } catch (Exception e) {
-                    log.error("生产工资发放记录失败 -> pooId: [{}]", salaryPool.getId(), e);
-                }
+        if (dayOfMonth != payoffDate) {
+            return;
+        }
+        List<SalaryPool> salaryPoolList = salaryPoolService.list(Wrappers.<SalaryPool>lambdaQuery()
+                .eq(SalaryPool::getMonthly, YearMonth.now().minusMonths(1))
+                .eq(SalaryPool::getPaid, Boolean.FALSE)
+                .eq(SalaryPool::getYn, Boolean.TRUE)
+        );
+        if (CollectionUtils.isEmpty(salaryPoolList)) {
+            return;
+        }
+        for (SalaryPool salaryPool : salaryPoolList) {
+            try {
+                autoConfirmTodoNotice(salaryPool.getId());
+                createSalarySheet(salaryPool, BigDecimal.valueOf(settin.getPayoffLimit()));
+                salaryPool.setRegular(Boolean.TRUE);
+                salaryPool.setPaid(Boolean.TRUE);
+            } catch (Exception e) {
+                log.error("生产工资发放记录失败 -> pooId: [{}]", salaryPool.getId(), e);
             }
-            salaryPoolService.updateBatchById(salaryPoolList);
         }
+        salaryPoolService.updateBatchById(salaryPoolList);
     }
  
  
@@ -164,7 +165,6 @@ public class PayoffBizService {
         if (maxAmount.compareTo(BigDecimal.ZERO) > 0 && reward.compareTo(maxAmount) > 0) {
             corporateRecord.setAmount(maxAmount);
             list.add(corporateRecord);
-
             PayrollRecord record = new PayrollRecord();
             BeanUtils.copyProperties(corporateRecord, record);
             record.setCorporate(Boolean.FALSE);
@@ -47,6 +47,7 @@ import static cn.fw.common.businessvalidator.Validator.BV;
 @Slf4j
 @Service
 public class SalaryCalcService {
+    private final SalaryGeneralSettinService salaryGeneralSettinService;
     private final SalaryGroupService salaryGroupService;
     private final SalaryGroupUserService salaryGroupUserService;
     private final SalaryPoolService salaryPoolService;
@@ -56,6 +57,7 @@ public class SalaryCalcService {
     private final SalaryPoolDetailService salaryPoolDetailService;
     private final SalaryPoolCommonService salaryPoolCommonService;
     private final KpiPoolCommonService kpiPoolCommonService;
+    private final SalaryConfirmBizService salaryConfirmBizService;
     private static final List<ExtraSalaryTypeEnum> EXTRA_SALARY_TYPE_ENUM_LIST = ListUtil.toList(ExtraSalaryTypeEnum.AWARD, ExtraSalaryTypeEnum.PENALTY,
             ExtraSalaryTypeEnum.NECESSARY, ExtraSalaryTypeEnum.SUBSIDY, ExtraSalaryTypeEnum.PERSON_TAX);
     @Value("${spring.cache.custom.global-prefix}:calculable:salary-group")
@@ -70,7 +72,8 @@ public class SalaryCalcService {
     private final Map<SalaryCalMethodEnum, SalaryBaseCalculator> calculatorMap;
  
     @Autowired
-    public SalaryCalcService(final SalaryGroupService salaryGroupService,
+    public SalaryCalcService(final SalaryGeneralSettinService salaryGeneralSettinService,
+                             final SalaryGroupService salaryGroupService,
                              final SalaryGroupUserService salaryGroupUserService,
                              final SalaryPoolService salaryPoolService,
                              final SalaryPoolDetailService salaryPoolDetailService,
@@ -78,7 +81,9 @@ public class SalaryCalcService {
                              final SalaryPoolCommonService salaryPoolCommonService,
                              final KpiPoolCommonService kpiPoolCommonService,
                              final StringRedisTemplate stringRedisTemplate, EhrRpcService ehrRpcService,
+                             final SalaryConfirmBizService salaryConfirmBizService,
                              final List<SalaryBaseCalculator> salaryCalculatorList) {
+        this.salaryGeneralSettinService = salaryGeneralSettinService;
         this.salaryGroupService = salaryGroupService;
         this.salaryGroupUserService = salaryGroupUserService;
         this.salaryPoolService = salaryPoolService;
@@ -88,6 +93,7 @@ public class SalaryCalcService {
         this.kpiPoolCommonService = kpiPoolCommonService;
         this.stringRedisTemplate = stringRedisTemplate;
         this.ehrRpcService = ehrRpcService;
+        this.salaryConfirmBizService = salaryConfirmBizService;
         this.calculatorMap = salaryCalculatorList.stream().collect(Collectors.toMap(SalaryBaseCalculator::getCalMethod, v -> v));
     }
  
@@ -187,7 +193,7 @@ public class SalaryCalcService {
         while ((str = setOps.pop()) != null) {
             try {
                 if (StringUtils.isNumber(str)) {
-                    calcUserSalary(Long.valueOf(str), true);
+                    retryCalcUserSalary(Long.valueOf(str));
                 }
             } catch (Exception ex) {
                 log.error("重新计算薪资数据失败：[{}]", str, ex);
@@ -202,7 +208,7 @@ public class SalaryCalcService {
     }
  
     /**
-     * 计算人员薪资
+     * 手动 计算人员薪资
      *
      * @param salaryGroupUserId
      * @param calcTotal
@@ -216,16 +222,67 @@ public class SalaryCalcService {
     }
  
     /**
+     * 申述后重新计算人员薪资
+     *
+     * @param salaryGroupUserId
+     */
+    public void retryCalcUserSalary(Long salaryGroupUserId) {
+        SalaryGroupUser user = salaryGroupUserService.getById(salaryGroupUserId);
+        if (Objects.isNull(user) || !Boolean.TRUE.equals(user.getYn())) {
+            return;
+        }
+        final Long groupId = user.getGroupId();
+        SalaryGeneralSettin settin = salaryGeneralSettinService.getOne(Wrappers.<SalaryGeneralSettin>lambdaQuery()
+                        .eq(SalaryGeneralSettin::getYn, Boolean.TRUE)
+                        .eq(SalaryGeneralSettin::getGroupId, groupId)
+                , Boolean.FALSE);
+        if (Objects.isNull(settin)) {
+            settin = salaryGeneralSettinService.initData(groupId);
+        }
+        String datesOfAppeal = Optional.ofNullable(settin.getDatesOfAppeal()).orElse("3,5");
+        int payoffDay = Optional.ofNullable(settin.getPayoffDate()).orElse(15);
+        int dayOfMonth = LocalDate.now().getDayOfMonth();
+        if (dayOfMonth >= payoffDay) {
+            log.error("绩效组人员[{}]_已经超过工资发放时间，无法重新计算", user.getId());
+            return;
+        }
+        String[] daysArr = datesOfAppeal.split(",");
+        int startDay = Integer.parseInt(daysArr[0]);
+        int endDay = Integer.parseInt(daysArr[1]);
+        if (dayOfMonth < startDay || dayOfMonth > endDay) {
+            log.error("绩效组人员[{}]_已经超过申述时间，无法重新计算", user.getId());
+            return;
+        }
+        SalaryPool pool = salaryPoolCommonService.inspectionPool(user);
+        if (Boolean.TRUE.equals(pool.getRegular()) || Boolean.TRUE.equals(pool.getPaid())) {
+            log.error("绩效组人员[{}] 已确认工资明细或工资已经发放，无法计算", user.getId());
+            return;
+        }
+        calcUserSalary(pool, user, true);
+        salaryConfirmBizService.retryCreateSalaryConfirmTodo(user);
+    }
+
+    /**
      * 计算用户薪资
      *
      * @param user
      */
-    @Transactional(rollbackFor = Exception.class)
     public void calcUserSalary(SalaryGroupUser user, boolean calcTotal) {
         SalaryPool pool = salaryPoolCommonService.inspectionPool(user);
         if (Boolean.TRUE.equals(pool.getRegular()) || Boolean.TRUE.equals(pool.getPaid())) {
+            log.error("绩效组人员[{}] 已确认工资明细或工资已经发放，无法计算", user.getId());
             return;
         }
+        calcUserSalary(pool, user, calcTotal);
+    }
+
+    /**
+     * 计算用户薪资
+     *
+     * @param user
+     */
+    @Transactional(rollbackFor = Exception.class)
+    public void calcUserSalary(SalaryPool pool, SalaryGroupUser user, boolean calcTotal) {
         final Long salaryGroupId = user.getSalaryGroupId();
         final LocalDate dataDate = user.getDataDate();
         List<SalaryGroupProject> salaryProjectList = salaryGroupProjectService.list(Wrappers.<SalaryGroupProject>lambdaQuery()
@@ -8,6 +8,7 @@ import cn.fw.morax.common.utils.EventBusUtil;
 import cn.fw.morax.common.utils.PublicUtil;
 import cn.fw.morax.domain.db.salary.SalaryConfirm;
 import cn.fw.morax.domain.db.salary.SalaryGeneralSettin;
+import cn.fw.morax.domain.db.salary.SalaryGroupUser;
 import cn.fw.morax.domain.db.salary.SalaryPool;
 import cn.fw.morax.domain.enums.SalaryConfirmStatusEnum;
 import cn.fw.morax.rpc.backlog.TodoRpcService;
@@ -19,16 +20,15 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import lombok.Getter;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-import org.redisson.api.RLock;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
  
+import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.time.YearMonth;
 import java.util.*;
-import java.util.concurrent.locks.Lock;
  
 import static cn.fw.common.businessvalidator.Validator.BV;
  
@@ -80,6 +80,7 @@ public class SalaryConfirmBizService {
         confirm.setConfirmTime(LocalDateTime.now());
         confirm.setConfirmedStatus(SalaryConfirmStatusEnum.CONFIRMED);
         confirm.setSelfConfirm(Boolean.TRUE);
+        pool.setRegular(Boolean.TRUE);
         pool.setSignatureFile(fid);
         BackLogItemDTO dto = new BackLogItemDTO(pool.getUserId(), confirm.getTodoCode(), String.valueOf(confirm.getId()), new Date(), pool.getShopId());
         boolean complete = todoRpcService.complete(dto);
@@ -87,6 +88,7 @@ public class SalaryConfirmBizService {
         salaryConfirmService.updateById(confirm);
         salaryPoolService.updateById(pool);
  
+        // fixme 这下面的逻辑不太对
         EventBusUtil.asyncPost(PaySalaryEvent.builder()
                 .monthly(pool.getMonthly())
                 .groupId(pool.getGroupId())
@@ -101,30 +103,63 @@ public class SalaryConfirmBizService {
      *
      * @param groupId
      */
+    @Transactional(rollbackFor = Exception.class)
     public void createSalaryConfirmTodo(Long groupId) {
-        String key = String.format("%s:%s", ":create-salary-confirm-todo", groupId);
-        Lock lock = distributedLocker.lock(key);
-        if (!((RLock) lock).isLocked()) {
+//        cancelSalaryConfirmTodo();
+//        SalaryGeneralSettin settin = salaryGeneralSettinService.getOne(Wrappers.<SalaryGeneralSettin>lambdaQuery()
+//                        .eq(SalaryGeneralSettin::getYn, Boolean.TRUE)
+//                        .eq(SalaryGeneralSettin::getGroupId, groupId)
+//                , Boolean.FALSE);
+//        if (Objects.isNull(settin)) {
+//            settin = salaryGeneralSettinService.initData(groupId);
+//        }
+//        String datesOfAppeal = Optional.ofNullable(settin.getDatesOfAppeal()).orElse("3,5");
+//        int payoffDay = Optional.ofNullable(settin.getPayoffDate()).orElse(15);
+//        int dayOfMonth = LocalDate.now().getDayOfMonth();
+//        if (dayOfMonth >= payoffDay) {
+//            return;
+//        }
+//        String[] daysArr = datesOfAppeal.split(",");
+//        int startDay = Integer.parseInt(daysArr[0]);
+//        if (dayOfMonth < startDay) {
+//            return;
+//        }
+//        final LocalDateTime planTime = YearMonth.now().atDay(startDay).atTime(9, 0, 0);
+//        final LocalDateTime deadline = YearMonth.now().atDay(payoffDay).minusDays(1L).atTime(23, 59, 59);
+//        createConfirms(planTime, deadline, groupId);
+    }
+
+    /**
+     * 申述后重新生成薪资确认待办（申述成功后）
+     *
+     * @param user 薪酬组用户信息
+     */
+    @Transactional(rollbackFor = Exception.class)
+    public void retryCreateSalaryConfirmTodo(SalaryGroupUser user) {
+        final Long groupId = user.getGroupId();
+        SalaryGeneralSettin settin = salaryGeneralSettinService.getOne(Wrappers.<SalaryGeneralSettin>lambdaQuery()
+                        .eq(SalaryGeneralSettin::getYn, Boolean.TRUE)
+                        .eq(SalaryGeneralSettin::getGroupId, groupId)
+                , Boolean.FALSE);
+        if (Objects.isNull(settin)) {
+            settin = salaryGeneralSettinService.initData(groupId);
+        }
+        String datesOfAppeal = Optional.ofNullable(settin.getDatesOfAppeal()).orElse("3,5");
+        int payoffDay = Optional.ofNullable(settin.getPayoffDate()).orElse(15);
+        int dayOfMonth = LocalDate.now().getDayOfMonth();
+        if (dayOfMonth >= payoffDay) {
             return;
         }
-        try {
-            SalaryGeneralSettin settin = salaryGeneralSettinService.getOne(Wrappers.<SalaryGeneralSettin>lambdaQuery()
-                            .eq(SalaryGeneralSettin::getYn, Boolean.TRUE)
-                            .eq(SalaryGeneralSettin::getGroupId, groupId)
-                    , Boolean.FALSE);
-            if (Objects.isNull(settin)) {
-                settin = salaryGeneralSettinService.initData(groupId);
-            }
-            String datesOfAppeal = Optional.ofNullable(settin.getDatesOfAppeal()).orElse("3,5");
-            String[] daysArr = datesOfAppeal.split(",");
-            int day = Integer.parseInt(daysArr[0]);
-            final LocalDateTime planTime = YearMonth.now().atDay(day).atTime(9, 0,0);
-            int endDay = Integer.parseInt(daysArr[1]);
-            final LocalDateTime deadline = YearMonth.now().atDay(endDay).atTime(23, 59, 59);
-            createConfirms(planTime, deadline, groupId);
-        } finally {
-            lock.unlock();
+        String[] daysArr = datesOfAppeal.split(",");
+        int startDay = Integer.parseInt(daysArr[0]);
+        int endDay = Integer.parseInt(daysArr[1]);
+        if (dayOfMonth < startDay || dayOfMonth > endDay) {
+            log.error("超过申述时间");
+            return;
         }
+        final LocalDateTime planTime = YearMonth.now().atDay(startDay).atTime(9, 0, 0);
+        final LocalDateTime deadline = YearMonth.now().atDay(payoffDay).minusDays(1L).atTime(23, 59, 59);
+        createConfirms(planTime, deadline, groupId);
     }
  
     /**
@@ -136,7 +171,7 @@ public class SalaryConfirmBizService {
                 .gt(SalaryConfirm::getDeadline, LocalDateTime.now().plusHours(2L))
                 .eq(SalaryConfirm::getPushedTodo, Boolean.FALSE)
                 .eq(SalaryConfirm::getYn, Boolean.TRUE)
-                .last(" limit 500 ")
+                .last(" limit 1500 ")
         );
         if (CollectionUtils.isEmpty(list)) {
             return;
@@ -147,12 +182,20 @@ public class SalaryConfirmBizService {
         salaryConfirmService.updateBatchById(list);
     }
  
+    /**
+     * 取消存在的待办 todo
+     *
+     * @param user
+     */
+    private void cancelSalaryConfirmTodo(SalaryGroupUser user) {
+
+    }
+
     private void createConfirms(final LocalDateTime planTime, final LocalDateTime deadline, final Long groupId) {
         List<SalaryPool> list = salaryPoolService.list(Wrappers.<SalaryPool>lambdaQuery()
                 .eq(SalaryPool::getMonthly, YearMonth.now().minusMonths(1L))
                 .eq(SalaryPool::getGroupId, groupId)
                 .eq(SalaryPool::getPaid, Boolean.FALSE)
-                .eq(SalaryPool::getRegular, Boolean.TRUE)
                 .eq(SalaryPool::getYn, Boolean.TRUE)
         );
         if (CollectionUtils.isEmpty(list)) {
@@ -160,23 +203,10 @@ public class SalaryConfirmBizService {
         }
         List<SalaryConfirm> confirmList = new ArrayList<>();
         for (SalaryPool pool : list) {
-            int count = salaryConfirmService.count(Wrappers.<SalaryConfirm>lambdaQuery()
-                    .eq(SalaryConfirm::getSalaryPoolId, pool.getId())
-                    .eq(SalaryConfirm::getYn, Boolean.TRUE)
-            );
-            if (count > 0) {
+            SalaryConfirm confirm = createConfirm(pool, planTime, deadline);
+            if (Objects.isNull(confirm)) {
                 continue;
             }
-            SalaryConfirm confirm = new SalaryConfirm();
-            confirm.setSalaryPoolId(pool.getId());
-            confirm.setPlanTime(planTime);
-            confirm.setPushedTodo(Boolean.FALSE);
-            confirm.setDeadline(deadline);
-            confirm.setConfirmedStatus(SalaryConfirmStatusEnum.NEED_CONFIRM);
-            confirm.setSelfConfirm(Boolean.FALSE);
-            confirm.setGroupId(groupId);
-            confirm.setYn(Boolean.TRUE);
-            confirm.setTodoCode(getTodoCode());
             confirmList.add(confirm);
         }
         if (PublicUtil.isNotEmpty(confirmList)) {
@@ -184,6 +214,28 @@ public class SalaryConfirmBizService {
         }
     }
  
+    private SalaryConfirm createConfirm(SalaryPool pool, final LocalDateTime planTime, final LocalDateTime deadline) {
+        int count = salaryConfirmService.count(Wrappers.<SalaryConfirm>lambdaQuery()
+                .eq(SalaryConfirm::getSalaryPoolId, pool.getId())
+                .eq(SalaryConfirm::getConfirmedStatus, SalaryConfirmStatusEnum.NEED_CONFIRM)
+                .eq(SalaryConfirm::getYn, Boolean.TRUE)
+        );
+        if (count > 0) {
+            return null;
+        }
+        SalaryConfirm confirm = new SalaryConfirm();
+        confirm.setSalaryPoolId(pool.getId());
+        confirm.setPlanTime(planTime);
+        confirm.setPushedTodo(Boolean.FALSE);
+        confirm.setDeadline(deadline);
+        confirm.setConfirmedStatus(SalaryConfirmStatusEnum.NEED_CONFIRM);
+        confirm.setSelfConfirm(Boolean.FALSE);
+        confirm.setGroupId(pool.getGroupId());
+        confirm.setYn(Boolean.TRUE);
+        confirm.setTodoCode(getTodoCode());
+        return confirm;
+    }
+
     private void executeSendTodo(SalaryConfirm confirm) {
         SalaryPool salaryPool = salaryPoolService.getById(confirm.getSalaryPoolId());
         if (Objects.isNull(salaryPool)) {