设置默认值

master
wjt 1 year ago
parent 068477946f
commit 1c05a45d5e

@ -83,19 +83,19 @@ public class ChannelCustom implements Serializable {
@ApiModelProperty(value = "创建代理商账号数量")
@Column(name = "channel_limit_num")
private Integer channelLimitNum;
private Integer channelLimitNum = 1;
@ApiModelProperty(value = "创建直客账号数量")
@Column(name = "custom_limit_num")
private Integer customLimitNum;
private Integer customLimitNum = 100;
@ApiModelProperty(value = "总话费")
@Column(name = "total_phone_bill")
private Integer totalPhoneBill;
private Integer totalPhoneBill = 0;
@ApiModelProperty(value = "剩余话费")
@Column(name = "surplus_phone_bill")
private Integer surplusPhoneBill;
private Integer surplusPhoneBill = 0;
@ApiModelProperty(value = "子账号")
@Transient

@ -120,26 +120,7 @@ public class CustomManageServiceImpl implements CustomManageService {
//这里如果是代理商 直接同步
if (channelCustom.getType() == DefaultNumberConstants.ONE_NUMBER) {
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);
channelCustom.setChannelLimitNum(1);
channelCustom.setCustomLimitNum(100);
addChannelCustom(channelCustom);
}
channelCustom.setCreateTime(DateUtil.date());
channelCustom.setCustomLimitNum(100);
@ -162,6 +143,28 @@ public class CustomManageServiceImpl implements CustomManageService {
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
@Transactional(rollbackFor = Exception.class)
public CommonResponse<Object> assignNum(Long customId, Integer assignNum, Integer assignBill) {

Loading…
Cancel
Save