修复tag值为空和投流拓客统计

manage/ad-platform-management/src/main/java/com/baiye/modules/system/service/impl/TaskServiceImpl.java

@@ -115,6 +115,7 @@ public class TaskServiceImpl implements TaskService {
         Task task = taskRepository.findById(taskId).orElseGet(Task::new);
         TaskTagDto taskTagDto = new TaskTagDto();
         BeanUtil.copyProperties(task, taskTagDto);
+        taskTagDto.setTagStr(new ArrayList<>());
         TaskTag taskTagByTaskId = taskTagRepository.findTaskTagByTaskId(taskId);
         if (ObjectUtil.isNotEmpty(taskTagByTaskId)) {
             taskTagDto.setTagStr(taskTagByTaskId.getTag());

services/ad-platform-source/src/main/java/com/baiye/module/service/impl/ReportTokerServiceImpl.java

@@ -255,10 +255,10 @@ public class ReportTokerServiceImpl implements ReportTokerService {
                 report.setTalkNum(report.getTalkNum() + 1);
             }
         } else {
-            //投流来源
-            if (clueType == DefaultNumberConstants.FIVE_NUMBER) {
+            //拓客来源
+            if (clueType == DefaultNumberConstants.FOUR_NUMBER) {
                 report.setDeliveryNum(report.getDeliveryNum() + 1);
-            } else if (clueType == DefaultNumberConstants.FOUR_NUMBER) {
+            } else if (clueType == DefaultNumberConstants.FIVE_NUMBER) {
                 report.setTalkNum(report.getTalkNum() + 1);
             }
         }
@@ -273,9 +273,9 @@ public class ReportTokerServiceImpl implements ReportTokerService {
                     report.setAddTalkNum(report.getAddTalkNum() + 1);
                 }
             } else {
-                if (clueType == DefaultNumberConstants.FIVE_NUMBER) {
+                if (clueType == DefaultNumberConstants.FOUR_NUMBER) {
                     report.setAddDeliveryNum(report.getAddDeliveryNum() + 1);
-                } else if (clueType == DefaultNumberConstants.FOUR_NUMBER) {
+                } else if (clueType == DefaultNumberConstants.FIVE_NUMBER) {
                     report.setAddTalkNum(report.getAddTalkNum() + 1);
                 }
             }