|
@@ -47,6 +47,9 @@ public class UserApiController extends AbstractApiController {
|
|
|
@Resource
|
|
|
private AuthService authService;
|
|
|
|
|
|
+ @Resource
|
|
|
+ private SequenceService sequenceService;
|
|
|
+
|
|
|
|
|
|
@Resource
|
|
|
private RedEnvelopeService redEnvelopeService;
|
|
@@ -205,9 +208,10 @@ public class UserApiController extends AbstractApiController {
|
|
|
return ResultGenerator.genFailResult(ResultCode.INTERNAL_SERVER_ERROR);
|
|
|
}
|
|
|
User parent = userService.findBy("invitedCode", params.getCode());
|
|
|
+ String userNo = sequenceService.genSerialNumber("register_rule",null);
|
|
|
User user = User.builder().createTime(DateUtil.date()).invitedCode(code)
|
|
|
- .name(params.getName())
|
|
|
- .status((byte)1) .phoneNo(params.getPhone()).pwd(pwd2).salt(salt).build();
|
|
|
+ .name(params.getName()).userNo(userNo).isDelete((byte)1).createUser("sys")
|
|
|
+ .status((byte)1).phoneNo(params.getPhone()).pwd(pwd2).salt(salt).build();
|
|
|
if (parent != null){
|
|
|
user.setPid(parent.getId());
|
|
|
if (parent.getPid() != null){
|
|
@@ -215,7 +219,7 @@ public class UserApiController extends AbstractApiController {
|
|
|
}
|
|
|
}
|
|
|
user.setVipLevel(1);
|
|
|
- userService.saveUseGeneratedKeys(user);
|
|
|
+ userService.add(user);
|
|
|
user.setPwd("***");
|
|
|
user.setSalt("***");
|
|
|
return ResultGenerator.genSuccessResult(user);
|
|
@@ -226,7 +230,7 @@ public class UserApiController extends AbstractApiController {
|
|
|
return null;
|
|
|
}
|
|
|
String s = RandomUtil.randomString(8);
|
|
|
- User inviteCode = userService.findBy("inviteCode", s);
|
|
|
+ User inviteCode = userService.findBy("invitedCode", s);
|
|
|
if (inviteCode == null){
|
|
|
return s;
|
|
|
}
|