diff --git a/ad-platform-manage/ad-platform-management/src/main/java/com/baiye/modules/agent/service/impl/ChannelManageServiceImpl.java b/ad-platform-manage/ad-platform-management/src/main/java/com/baiye/modules/agent/service/impl/ChannelManageServiceImpl.java index f7732c24..43f7e5f7 100644 --- a/ad-platform-manage/ad-platform-management/src/main/java/com/baiye/modules/agent/service/impl/ChannelManageServiceImpl.java +++ b/ad-platform-manage/ad-platform-management/src/main/java/com/baiye/modules/agent/service/impl/ChannelManageServiceImpl.java @@ -119,6 +119,7 @@ public class ChannelManageServiceImpl implements ChannelManageService { } else { //同步到系统用户 CreateUserDTO createUserDTO = new CreateUserDTO().addCreateUserDTO(channelName, phone); + createUserDTO.setIsChannelActive(true); List userOrFile = userService.createUserOrFile(createUserDTO); Long userId = userOrFile.get(0); channelCustom.setUserId(userId); diff --git a/ad-platform-manage/ad-platform-management/src/main/java/com/baiye/modules/agent/service/impl/CustomManageServiceImpl.java b/ad-platform-manage/ad-platform-management/src/main/java/com/baiye/modules/agent/service/impl/CustomManageServiceImpl.java index 1be8194c..305005bf 100644 --- a/ad-platform-manage/ad-platform-management/src/main/java/com/baiye/modules/agent/service/impl/CustomManageServiceImpl.java +++ b/ad-platform-manage/ad-platform-management/src/main/java/com/baiye/modules/agent/service/impl/CustomManageServiceImpl.java @@ -76,6 +76,9 @@ public class CustomManageServiceImpl implements CustomManageService { if (!MobileUtil.checkPhone(channelCustom.getPhone())) { return CommonResponse.createByErrorMessage(ResponseCode.PHONE_NUMBER_IS_INCORRECT.getDesc()); } + //验证号码重复 + userServiceImpl.verifyPhone(channelCustom.getPhone()); + //新建账号状态为2 待开通 channelCustom.setStatus(DefaultNumberConstants.TWO_NUMBER); //获取父账号的总量 diff --git a/ad-platform-manage/ad-platform-management/src/main/java/com/baiye/modules/platform/service/dto/CreateUserDTO.java b/ad-platform-manage/ad-platform-management/src/main/java/com/baiye/modules/platform/service/dto/CreateUserDTO.java index 3ce9098f..07739da0 100644 --- a/ad-platform-manage/ad-platform-management/src/main/java/com/baiye/modules/platform/service/dto/CreateUserDTO.java +++ b/ad-platform-manage/ad-platform-management/src/main/java/com/baiye/modules/platform/service/dto/CreateUserDTO.java @@ -86,6 +86,9 @@ public class CreateUserDTO { @ApiModelProperty(value = "用户每天最大转crm条数") private Integer turnCrmNum; + @ApiModelProperty(value = "是否是渠道商系统激活过来的调用") + private Boolean isChannelActive; + @Override public int hashCode() { return Objects.hash(id, username); diff --git a/ad-platform-manage/ad-platform-management/src/main/java/com/baiye/modules/system/service/impl/UserServiceImpl.java b/ad-platform-manage/ad-platform-management/src/main/java/com/baiye/modules/system/service/impl/UserServiceImpl.java index 71721454..f9192c35 100644 --- a/ad-platform-manage/ad-platform-management/src/main/java/com/baiye/modules/system/service/impl/UserServiceImpl.java +++ b/ad-platform-manage/ad-platform-management/src/main/java/com/baiye/modules/system/service/impl/UserServiceImpl.java @@ -297,8 +297,10 @@ public class UserServiceImpl implements UserService { createTask(userCreateResult.getId(), "拓客模块-投流回流池", DefaultNumberConstants.SEVEN_NUMBER); createTask(userCreateResult.getId(), "拓客模块-拓客回流池", DefaultNumberConstants.SIX_NUMBER); //同步直客 - ChannelCustom byUserId = channelCustomRepository.findByUserId(userId); - channelCustomRepository.save(new ChannelCustom().addCustom(userDTO.getUsername(), userDTO.getPhone(), user.getId(), byUserId.getId())); + if (userDTO.getIsChannelActive() == null || !userDTO.getIsChannelActive()) { + ChannelCustom byUserId = channelCustomRepository.findByUserId(userId); + channelCustomRepository.save(new ChannelCustom().addCustom(userDTO.getUsername(), userDTO.getPhone(), user.getId(), byUserId.getId())); + } } MultipartFile file = userDTO.getFile(); @@ -484,6 +486,12 @@ public class UserServiceImpl implements UserService { return userRepository.save(resources); } + public Boolean verifyPhone(String phone) { + if (userRepository.findByPhone(phone) != null) { + throw new EntityExistException(User.class, "phone", phone); + } + return true; + } @Override @Transactional(rollbackFor = Exception.class) @@ -577,6 +585,7 @@ public class UserServiceImpl implements UserService { delCaches(user.getId(), user.getUsername()); } + @Override @Transactional(rollbackFor = Exception.class) public void updateCenter(User resources) {