|
|
@ -120,26 +120,7 @@ public class CustomManageServiceImpl implements CustomManageService {
|
|
|
|
|
|
|
|
|
|
|
|
//这里如果是代理商 直接同步
|
|
|
|
//这里如果是代理商 直接同步
|
|
|
|
if (channelCustom.getType() == DefaultNumberConstants.ONE_NUMBER) {
|
|
|
|
if (channelCustom.getType() == DefaultNumberConstants.ONE_NUMBER) {
|
|
|
|
CreateUserDTO createUserDTO = new CreateUserDTO().addCreateUserDTO(channelCustom.getChannelName(), channelCustom.getPhone());
|
|
|
|
addChannelCustom(channelCustom);
|
|
|
|
createUserDTO.setPassword(passwordEncoder.encode
|
|
|
|
|
|
|
|
(StringUtils.isNotBlank(createUserDTO.getPassword())
|
|
|
|
|
|
|
|
? createUserDTO.getPassword() : "123456"));
|
|
|
|
|
|
|
|
User user = new User();
|
|
|
|
|
|
|
|
BeanUtil.copyProperties(createUserDTO, user);
|
|
|
|
|
|
|
|
user.setUsername(user.getUsername().trim());
|
|
|
|
|
|
|
|
//这个地方注意,代理商的创建人为admin。这whichUserId属性会在之前的逻辑里面用到,这里写死了
|
|
|
|
|
|
|
|
user.setWhichUserId(1L);
|
|
|
|
|
|
|
|
user.setIsReview(Boolean.FALSE);
|
|
|
|
|
|
|
|
Set<Role> roles = new HashSet<>();
|
|
|
|
|
|
|
|
Role role = new Role();
|
|
|
|
|
|
|
|
role.setId(channelId);
|
|
|
|
|
|
|
|
roles.add(role);
|
|
|
|
|
|
|
|
user.setRoles(roles);
|
|
|
|
|
|
|
|
Long userId = create(user).getId();
|
|
|
|
|
|
|
|
channelCustom.setUserId(userId);
|
|
|
|
|
|
|
|
channelCustom.setStatus(1);
|
|
|
|
|
|
|
|
channelCustom.setChannelLimitNum(1);
|
|
|
|
|
|
|
|
channelCustom.setCustomLimitNum(100);
|
|
|
|
|
|
|
|
}
|
|
|
|
}
|
|
|
|
channelCustom.setCreateTime(DateUtil.date());
|
|
|
|
channelCustom.setCreateTime(DateUtil.date());
|
|
|
|
channelCustom.setCustomLimitNum(100);
|
|
|
|
channelCustom.setCustomLimitNum(100);
|
|
|
@ -162,6 +143,28 @@ public class CustomManageServiceImpl implements CustomManageService {
|
|
|
|
return CommonResponse.createBySuccess();
|
|
|
|
return CommonResponse.createBySuccess();
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
private void addChannelCustom(ChannelCustom channelCustom) {
|
|
|
|
|
|
|
|
CreateUserDTO createUserDTO = new CreateUserDTO().addCreateUserDTO(channelCustom.getChannelName(), channelCustom.getPhone());
|
|
|
|
|
|
|
|
createUserDTO.setPassword(passwordEncoder.encode
|
|
|
|
|
|
|
|
(StringUtils.isNotBlank(createUserDTO.getPassword())
|
|
|
|
|
|
|
|
? createUserDTO.getPassword() : "123456"));
|
|
|
|
|
|
|
|
User user = new User();
|
|
|
|
|
|
|
|
BeanUtil.copyProperties(createUserDTO, user);
|
|
|
|
|
|
|
|
user.setUsername(user.getUsername().trim());
|
|
|
|
|
|
|
|
//这个地方注意,代理商的创建人为admin。这whichUserId属性会在之前的逻辑里面用到,这里写死了
|
|
|
|
|
|
|
|
user.setWhichUserId(1L);
|
|
|
|
|
|
|
|
user.setIsReview(Boolean.FALSE);
|
|
|
|
|
|
|
|
Set<Role> roles = new HashSet<>();
|
|
|
|
|
|
|
|
Role role = new Role();
|
|
|
|
|
|
|
|
role.setId(channelId);
|
|
|
|
|
|
|
|
roles.add(role);
|
|
|
|
|
|
|
|
user.setRoles(roles);
|
|
|
|
|
|
|
|
Long userId = create(user).getId();
|
|
|
|
|
|
|
|
channelCustom.setUserId(userId);
|
|
|
|
|
|
|
|
channelCustom.setStatus(1);
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
@Override
|
|
|
|
@Override
|
|
|
|
@Transactional(rollbackFor = Exception.class)
|
|
|
|
@Transactional(rollbackFor = Exception.class)
|
|
|
|
public CommonResponse<Object> assignNum(Long customId, Integer assignNum, Integer assignBill) {
|
|
|
|
public CommonResponse<Object> assignNum(Long customId, Integer assignNum, Integer assignBill) {
|
|
|
|