From bbd9e4ba18878d59d6cacb6455119a4b49dc5284 Mon Sep 17 00:00:00 2001
From: wujingtao <wujingtao_t@126.com>
Date: Mon, 20 Feb 2023 17:48:45 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B2=A1=E6=9C=89=E5=9B=9E=E6=B5=81=E4=BB=BB?=
 =?UTF-8?q?=E5=8A=A1=EF=BC=8C=E8=87=AA=E5=8A=A8=E6=96=B0=E5=A2=9E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/TaskServiceImpl.java         |  4 ++-
 .../module/service/impl/ClueServiceImpl.java  | 34 ++++++++++++++++---
 2 files changed, 33 insertions(+), 5 deletions(-)

diff --git a/ad-platform-manage/ad-platform-management/src/main/java/com/baiye/modules/platform/service/impl/TaskServiceImpl.java b/ad-platform-manage/ad-platform-management/src/main/java/com/baiye/modules/platform/service/impl/TaskServiceImpl.java
index 8991b4f1..419f1b08 100644
--- a/ad-platform-manage/ad-platform-management/src/main/java/com/baiye/modules/platform/service/impl/TaskServiceImpl.java
+++ b/ad-platform-manage/ad-platform-management/src/main/java/com/baiye/modules/platform/service/impl/TaskServiceImpl.java
@@ -73,7 +73,9 @@ public class TaskServiceImpl implements TaskService {
     public void saveTask(Task task) {
         if (task.getId() == null) task.setId(IdUtil.getSnowflake(workerId, datacenterId).nextId());
         if (CollUtil.isNotEmpty(task.getOrganizeList())) task.setOrganizeList(task.getOrganizeList());
-        task.setIsDistribution(DefaultNumberConstants.ZERO_NUMBER);
+        if (task.getIsDistribution() == null) {
+            task.setIsDistribution(DefaultNumberConstants.ZERO_NUMBER);
+        }
         taskRepository.save(task);
     }
 
diff --git a/ad-platform-services/ad-platform-source/src/main/java/com/baiye/module/service/impl/ClueServiceImpl.java b/ad-platform-services/ad-platform-source/src/main/java/com/baiye/module/service/impl/ClueServiceImpl.java
index 286bccd1..8a2a0c97 100644
--- a/ad-platform-services/ad-platform-source/src/main/java/com/baiye/module/service/impl/ClueServiceImpl.java
+++ b/ad-platform-services/ad-platform-source/src/main/java/com/baiye/module/service/impl/ClueServiceImpl.java
@@ -2,6 +2,7 @@ package com.baiye.module.service.impl;
 
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.date.DateUtil;
+import cn.hutool.core.util.IdUtil;
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
 import com.baiye.constant.*;
@@ -824,13 +825,14 @@ public class ClueServiceImpl implements ClueService {
         taskQueryCriteria.setCreateBy(clue.getCreateBy());
         List<Task> body = taskClient.query(taskQueryCriteria).getBody();
         Long crmTaskId;
-        Integer crmTotalNumber;
+        int crmTotalNumber = 0;
         if (Objects.requireNonNull(body).size() == 1) {
             crmTaskId = body.get(0).getId();
             crmTotalNumber = body.get(0).getTotalNumber();
         } else {
-            log.error("回流失败的管理员id== {}",clue.getCreateBy());
-            throw new BadRequestException("回流失败");
+            //没有回流任务 重新创建一个
+            crmTaskId = IdUtil.getSnowflake(9, 9).nextId();
+            createTask(crmTaskId, clue.getCreateBy(), clueTalk.getClueType());
         }
         Task crmTask = new Task();
         crmTask.setId(crmTaskId);
@@ -849,10 +851,34 @@ public class ClueServiceImpl implements ClueService {
         clueMiddle.setClueStageTime(new Date());
         clueMiddle.setOptimisticVersion(DefaultNumberConstants.ZERO_NUMBER);
         clueMiddleRepository.save(clueMiddle);
-
         clueTalk.setMemberStatus(DefaultNumberConstants.FOUR_NUMBER);
     }
 
+    private void createTask(Long id, Long createBy, Integer isForm) {
+        Task task = new Task();
+        task.setId(id);
+        int crmClueType = isForm;
+        String username = null;
+        if (isForm == DefaultNumberConstants.FOUR_NUMBER) {
+            crmClueType = DefaultNumberConstants.SEVEN_NUMBER;
+            username = "拓客模块-投流回流池";
+        } else if (isForm == DefaultNumberConstants.FIVE_NUMBER) {
+            crmClueType = DefaultNumberConstants.SIX_NUMBER;
+            username = "拓客模块-拓客回流池";
+        }
+        task.setTaskName(username);
+        task.setIsEncryption(DefaultNumberConstants.ZERO_NUMBER);
+        task.setIsDistribution(DefaultNumberConstants.ONE_NUMBER);
+        task.setTaskType(DefaultNumberConstants.ONE_NUMBER);
+        task.setIsForm(crmClueType);
+        task.setCreateBy(createBy);
+        ResponseEntity<Object> response = taskClient.saveTask(task);
+        if (response.getStatusCode().value() != 200) {
+            log.error("回流失败的管理员id== {}", createBy);
+            throw new BadRequestException("回流失败,请联系管理员");
+        }
+    }
+
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void dynamicTaskDistribution(Long taskId, Integer uploadType) {