添加渠道商代码

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

@@ -145,8 +145,9 @@ public interface UserService {
 
     /**
      * 创建用户
+     * @return List<Long>
      */
-    void fileCreateUser(List<UserFavorOfExcel> file, Long companyId, UserDto userDto);
+    List<Long> fileCreateUser(List<UserFavorOfExcel> file, Long companyId, UserDto userDto);
 
     /**
      * 查询用户树状图
@@ -168,7 +169,7 @@ public interface UserService {
      *
      * @param userDTO
      */
-    void createUserOrFile(CreateUserDTO userDTO);
+    List<Long> createUserOrFile(CreateUserDTO userDTO);
 
     /**
      * 批量开通用户过期时间

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

@@ -22,7 +22,9 @@ import cn.hutool.core.date.DateTime;
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.text.CharSequenceUtil;
 import cn.hutool.core.text.StrPool;
-import cn.hutool.core.util.*;
+import cn.hutool.core.util.IdUtil;
+import cn.hutool.core.util.NumberUtil;
+import cn.hutool.core.util.ObjectUtil;
 import com.baiye.config.BusinessConfig;
 import com.baiye.config.properties.FileProperties;
 import com.baiye.constant.DefaultNumberConstants;
@@ -51,10 +53,8 @@ import com.baiye.modules.system.repository.UserRepository;
 import com.baiye.modules.system.service.UserService;
 import com.baiye.modules.telemarkting.service.ExtensionNumberService;
 import com.baiye.util.*;
-import com.baiye.util.PageUtil;
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.Lists;
-import com.google.common.collect.Maps;
 import com.google.common.collect.Sets;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
@@ -136,7 +136,8 @@ public class UserServiceImpl implements UserService {
 
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public void fileCreateUser(List<UserFavorOfExcel> excels, Long companyId, UserDto userDto) {
+    public List<Long> fileCreateUser(List<UserFavorOfExcel> excels, Long companyId, UserDto userDto) {
+        List<Long> list = Lists.newArrayList();
         Company byId = companyService.findById(companyId);
         if (CollUtil.isNotEmpty(excels) && byId != null) {
             User copyUser;
@@ -166,8 +167,10 @@ public class UserServiceImpl implements UserService {
                 copyUser.setEnabled(Boolean.FALSE);
                 copyUser.setTurnCrmNum(50);
                 userRepository.save(copyUser);
+                list.add(copyUser.getId());
             }
         }
+        return list;
     }
 
     @Override
@@ -218,11 +221,14 @@ public class UserServiceImpl implements UserService {
 
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public void createUserOrFile(CreateUserDTO userDTO) {
+    public List<Long> createUserOrFile(CreateUserDTO userDTO) {
         Long companyId = null;
         User user = new User();
         boolean flag = Boolean.FALSE;
         Long userId = SecurityUtils.getCurrentUserId();
+        userDTO.setPassword(passwordEncoder.encode
+                (StringUtils.isNotBlank(userDTO.getPassword())
+                        ? userDTO.getPassword() : "123456"));
         Set<Role> roles = userDTO.getRoles();
         if (CollUtil.isNotEmpty(roles)) {
             for (Role role : roles) {
@@ -230,6 +236,15 @@ public class UserServiceImpl implements UserService {
                     flag = Boolean.TRUE;
                     break;
                 }
+                // TODO 创建渠道商
+                if (role.getId() == DefaultNumberConstants.ELEVEN_NUMBER) {
+                    BeanUtil.copyProperties(userDTO, user);
+                    user.setUsername(user.getUsername().trim());
+                    user.setWhichUserId(userId);
+                    user.setIsReview(Boolean.FALSE);
+                    create(user);
+                    return Collections.singletonList(user.getId());
+                }
             }
         }
         if (flag) {
@@ -240,10 +255,7 @@ public class UserServiceImpl implements UserService {
             companyDto.setStatus(DefaultNumberConstants.ZERO_NUMBER);
             companyId = companyService.createCompany(companyDto).getId();
         }
-
+        companyId = companyId != null ? companyId : SecurityUtils.getCompanyId();
-        companyId = companyId != null ? companyId :
-                SecurityUtils.getCompanyId();
-        userDTO.setPassword(passwordEncoder.encode(StringUtils.isNotBlank(userDTO.getPassword()) ? userDTO.getPassword() : "123456"));
         // 验证子账号
         Integer sonUserNum = companyService.findCompanyInfo(companyId).getSonUserNum();
         int size = userRepository.findByCompanyId(companyId).size();
@@ -259,6 +271,7 @@ public class UserServiceImpl implements UserService {
         user.setIsReview(Boolean.FALSE);
         user.setTurnCrmNum(50);
         User userCreateResult = create(user);
+
         //todo  如果是管理员 则创建任务
         if (flag) {
             if (userDTO.getCompanyType() != null && userDTO.getCompanyType() == 1) {
@@ -280,9 +293,10 @@ public class UserServiceImpl implements UserService {
             CompanyDto dto = new CompanyDto();
             dto.setUserId(userCreateResult.getId());
             List<UserFavorOfExcel> userFavorOfExcels = ReadExcelUtils.readExcelByClass(file, UserFavorOfExcel.class);
-            fileCreateUser(userFavorOfExcels,
+            return fileCreateUser(userFavorOfExcels,
                     companyId, Convert.convert(UserDto.class, userCreateResult));
         }
+        return Collections.singletonList(user.getId());
     }
 
     /**