线索阶段搜索字段添加

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

@@ -71,7 +71,6 @@ import java.util.*;
 public class UserServiceImpl implements UserService {
 
 
-
     private final UserMapper userMapper;
     private final RedisUtils redisUtils;
     private final RoleRepository repository;
@@ -177,13 +176,6 @@ public class UserServiceImpl implements UserService {
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void createUserOrFile(CreateUserDTO userDTO) {
-        if (userDTO.getCompanyId() != null){
-            Integer sonUserNum = companyService.findCompanyInfo(userDTO.getCompanyId()).getSonUserNum();
-            int size = userRepository.findByCompanyId(userDTO.getCompanyId()).size() - DefaultNumberConstants.ONE_NUMBER;
-            if (sonUserNum < size){
-                throw new BadRequestException("子账号超过上限,请联系管理员");
-            }
-        }
         Long companyId = null;
         User user = new User();
         boolean flag = Boolean.FALSE;
@@ -209,6 +201,12 @@ public class UserServiceImpl implements UserService {
         companyId = companyId != null ? companyId :
                 SecurityUtils.getCompanyId();
         userDTO.setPassword(passwordEncoder.encode("123456"));
+        // 验证子账号
+        Integer sonUserNum = companyService.findCompanyInfo(companyId).getSonUserNum();
+        int size = userRepository.findByCompanyId(companyId).size();
+        if (sonUserNum < size) {
+            throw new BadRequestException("子账号超过上限，请联系管理员");
+        }
         BeanUtil.copyProperties(userDTO, user);
         user.setCompanyId(companyId);
         user.setUsername(flag ||

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

@@ -790,11 +790,16 @@ public class ClueServiceImpl implements ClueService {
     @Transactional(rollbackFor = Exception.class)
     public void clueBackFlow(Long taskId, Long clueId, Long userId, Integer clueType) {
         ClueMiddle clueMiddle = clueMiddleRepository.findById(clueId).orElseGet(ClueMiddle::new);
-        Integer userCount = turnCrmLogRepository.findByUserIdCount(clueMiddle.getMemberId());
+        Integer userCount = turnCrmLogRepository.findByUserIdCount(clueMiddle.getMemberId()) + DefaultNumberConstants.ONE_NUMBER;
         UserDto userInfo = userClient.findUserInfo(clueMiddle.getMemberId());
         if (userCount != null && userCount > userInfo.getTurnCrmNum()){
-            throw new BadRequestException("回流失败, 每天上限" + userInfo.getTurnCrmNum() +"条,请联系管理员");
+            throw new BadRequestException("回流失败，每天上限" + userInfo.getTurnCrmNum() +"条，请联系管理员");
         }
+        // 记录转crm日志
+        TurnCrmLog turnCrmLog = new TurnCrmLog();
+        turnCrmLog.setClueId(clueId);
+        turnCrmLog.setUserId(clueMiddle.getMemberId());
+        turnCrmLogRepository.save(turnCrmLog);
         // 初始化线索加密字段
         Clue clue = clueRepository.findById(clueId).orElseGet(Clue::new);
         clue.setIsEncryption(DefaultNumberConstants.ZERO_NUMBER);
@@ -836,12 +841,6 @@ public class ClueServiceImpl implements ClueService {
         task.setId(taskId);
         task.setTotalNumber(taskNum);
         taskClient.updateTask(task);
-
-        // 记录转crm日志
-        TurnCrmLog turnCrmLog = new TurnCrmLog();
-        turnCrmLog.setClueId(clueId);
-        turnCrmLog.setUserId(userId);
-        turnCrmLogRepository.save(turnCrmLog);
     }
 
     @Override

services/ad-platform-source/src/main/java/com/baiye/task/FileTask.java

@@ -3,6 +3,7 @@ package com.baiye.task;
 import cn.hutool.core.date.DateTime;
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.io.FileUtil;
+import com.baiye.module.dao.TurnCrmLogRepository;
 import com.baiye.util.FileZipUtil;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
@@ -22,6 +23,8 @@ public class FileTask {
     @Value(value = "${storage.url}")
     private String URL;
 
+    private final TurnCrmLogRepository turnCrmLogRepository;
+
     /**
      * 压缩前一天文件夹(每天3点)
      */
@@ -37,4 +40,13 @@ public class FileTask {
         }
         log.info("-----------------------------压缩文件夹开始时间{}-----------------------------", DateUtil.now());
     }
+
+    /**
+     * 清空日志
+     */
+    @Scheduled(cron = "0 0 1 * * ? ")
+    @Transactional(rollbackFor = Exception.class)
+    public void emptyLog(){
+        turnCrmLogRepository.deleteAll();
+    }
 }