Merge remote-tracking branch 'origin/master'

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

@@ -254,7 +254,11 @@ public class UserServiceImpl implements UserService {
         task.setTaskName(username);
         task.setIsEncryption(DefaultNumberConstants.ZERO_NUMBER);
         //设置默认值
-        task.setIsDistribution(DefaultNumberConstants.ZERO_NUMBER);
+        if (isForm == DefaultNumberConstants.SIX_NUMBER || isForm == DefaultNumberConstants.SEVEN_NUMBER) {
+            task.setIsDistribution(DefaultNumberConstants.ONE_NUMBER);
+        } else {
+            task.setIsDistribution(DefaultNumberConstants.ZERO_NUMBER);
+        }
         task.setTaskType(DefaultNumberConstants.ONE_NUMBER);
         task.setIsForm(isForm);
         task.setCreateBy(id);

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

@@ -835,6 +835,7 @@ public class ClueServiceImpl implements ClueService {
         clueMiddle.setTaskId(crmTaskId);
         clueMiddle.setSourceLabel(null);
         clueMiddle.setClueType(crmClueType);
+        clueMiddle.setMemberStatus(DefaultNumberConstants.TWO_NUMBER);
         clueMiddle.setOptimisticVersion(DefaultNumberConstants.ZERO_NUMBER);
         clueMiddleRepository.save(clueMiddle);
         //todo 改变两个任务的总数量

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

@@ -209,23 +209,21 @@ public class ReportTokerServiceImpl implements ReportTokerService {
     public CommonResponse<Map<String, HomePageReportDTO>> getReportHomePage(Long userId) {
         Map<String, HomePageReportDTO> map = new HashMap<>(2);
         List<ClueMiddle> clueMiddles = clueMiddleRepository.findClueMiddleByCreateBy(userId);
+        HomePageReportDTO crmReport = new HomePageReportDTO().init();
+        HomePageReportDTO talkReport = new HomePageReportDTO().init();
         if (CollUtil.isNotEmpty(clueMiddles)) {
-            HomePageReportDTO crmReport = new HomePageReportDTO().init();
-            HomePageReportDTO talkReport = new HomePageReportDTO().init();
             for (ClueMiddle clueMiddle : clueMiddles) {
                 //crm
                 if (Arrays.asList(ClueTypeConstants.SCREEN_TYPE).contains(clueMiddle.getClueType())) {
                     dealData(clueMiddle, crmReport, 1);
-
                 } else if (Arrays.asList(ClueTypeConstants.TOKER_TYPE).contains(clueMiddle.getClueType())) {
                     //拓客投流
                     dealData(clueMiddle, talkReport, 2);
                 }
             }
-
-            map.put("crm", rate(crmReport));
-            map.put("talk", rate(talkReport));
         }
+        map.put("crm", rate(crmReport));
+        map.put("talk", rate(talkReport));
         return CommonResponse.createBySuccess(map);
     }