解决保有客档案未全部分配就完成待办的问题

张志伟
1 parent a5d82028
Showing 3 changed files with 30 additions and 7 deletions
fw-valhalla-domain/src/main/java/cn/fw/valhalla/domain/db/LeaveNeedDo.java
fw-valhalla-server/src/main/java/cn/fw/valhalla/controller/task/RoleChangeTask.java
fw-valhalla-service/src/main/java/cn/fw/valhalla/service/bus/LeaveNeedDoBizService.java
@@ -47,4 +47,8 @@ public class LeaveNeedDo extends BaseAuditableTimeEntity&lt;LeaveNeedDo, Long&gt; {
      * 是否已完成处理
      */
     private Boolean done;
+    /**
+     * 待办处理人
+     */
+    private Long todoUser;
 }
@@ -117,7 +117,9 @@ public class RoleChangeTask {
                 continue;
             }
             try {
-                leaveNeedDoBizService.fwgwChanged(Long.valueOf(idStr));
+                Long leaveId = Long.valueOf(idStr);
+                leaveNeedDoBizService.fwgwChanged(leaveId);
+                leaveNeedDoBizService.checkAllcotaion(leaveId);
             } catch (Exception e) {
                 if (StringUtils.isValid(idStr)) {
                     failList.add(idStr);
@@ -124,6 +124,8 @@ public class LeaveNeedDoBizService {
         if (count <= 0) {
             return;
         }
+        Long todoUser = postUserDTOS.get(0).getUserId();
+        leaveNeedDo.setTodoUser(todoUser);
         leaveNeedDoService.save(leaveNeedDo);
         Map<String, String> map = new HashMap<>();
         map.put("id", String.valueOf(leaveNeedDo.getId()));
@@ -131,7 +133,7 @@ public class LeaveNeedDoBizService {
         map.put("userName", leaveNeedDo.getUserName());
         map.put("customerNum", String.valueOf(count));
         map.put("leaveTime", DateUtil.getFullDateString(leaveNeedDo.getEffectiveTime(), "-"));
-        push2Todo(leaveNeedDo.getId(), postUserDTOS.get(0).getUserId(), shopId, map);
+        push2Todo(leaveNeedDo.getId(), todoUser, shopId, map);
     }
     public AppPage<LeaveNeedDoVO> getList(LoginAuthBean currentUser, LeaveQueryVO queryVO) {
@@ -173,6 +175,26 @@ public class LeaveNeedDoBizService {
         }
     }
+    @Transactional(rollbackFor = Exception.class)
+    public void checkAllcotaion(Long leaveId) {
+        LeaveNeedDo needDo = leaveNeedDoService.getById(leaveId);
+        int i = customerService.count(Wrappers.<Customer>lambdaQuery()
+                .eq(Customer::getAdviserId, needDo.getUserId())
+                .eq(Customer::getYn, Boolean.TRUE)
+        );
+        if (i > 0) {
+            return;
+        }
+        needDo.setDone(Boolean.TRUE);
+        leaveNeedDoService.updateById(needDo);
+
+        Long todoUser = needDo.getTodoUser();
+        if (Objects.nonNull(todoUser)) {
+            BackLogItemDTO backLogItemDTO = new BackLogItemDTO(todoUser, getLeave2doCode(), String.valueOf(leaveId), new Date(), null);
+            todoRpcService.complete(backLogItemDTO);
+        }
+    }
+
     /**
      * 服务顾问角色变动跟进处理
      *
@@ -192,7 +214,6 @@ public class LeaveNeedDoBizService {
         if (CollectionUtils.isEmpty(list)) {
             return;
         }
-
         for (ClueTask task : list) {
             followBizService.roleChangeEndTask(task);
         }
@@ -320,7 +341,6 @@ public class LeaveNeedDoBizService {
     }
     private void finish(LoginAuthBean user, Long leaveId, String key) {
-        leaveNeedDoService.dealById(leaveId);
         List<UserInfo> list = getAllFromCache(key);
         for (UserInfo info : list) {
             try {
@@ -334,9 +354,6 @@ public class LeaveNeedDoBizService {
             }
         }
         clearKey(key);
-        BackLogItemDTO backLogItemDTO = new BackLogItemDTO(user.getUserId(), getLeave2doCode(), String.valueOf(leaveId), new Date(), null);
-        todoRpcService.complete(backLogItemDTO);
-
         BoundListOperations<String, String> listOps = redisTemplate.boundListOps(getNeedDealTaskKey());
         listOps.rightPush(String.valueOf(leaveId));
     }