|
|
@@ -310,84 +310,90 @@ public class UserApiController extends AbstractApiController {
|
|
|
if (StrUtil.isBlank(params.getPhone()) || StrUtil.isBlank(params.getAreaCode())) {
|
|
|
return ResultGenerator.genFailResult(ResultCode.ACCOUNT_IS_NULL);
|
|
|
}
|
|
|
- Condition condition = new Condition(User.class);
|
|
|
- condition.createCriteria().andEqualTo("phoneNo", params.getPhone())
|
|
|
- .orEqualTo("name", params.getName());
|
|
|
- ;
|
|
|
- List<User> users = userService.findByCondition(condition);
|
|
|
- if (CollUtil.isNotEmpty(users)) {
|
|
|
- return ResultGenerator.genFailResult(ResultCode.USER_IS_EXIST);
|
|
|
- }
|
|
|
- if (!userService.checkCode(params.getPhone(), params.getVerifyCode())) {
|
|
|
- return ResultGenerator.genFailResult(ResultCode.CODE_CHECK_FAIL);
|
|
|
- }
|
|
|
- String salt = RandomUtil.randomString(4);
|
|
|
- String pwd2 = SecureUtil.md5(params.getPwd() + salt).toUpperCase();
|
|
|
- log.error("[密码]" + params.getPhone() + " :" + pwd2);
|
|
|
-
|
|
|
- // String code = getInviteCode(0);
|
|
|
- // if (code == null) {
|
|
|
- // return ResultGenerator.genFailResult(ResultCode.INTERNAL_SERVER_ERROR);
|
|
|
- // }
|
|
|
- // User parent = userService.findBy("userNo", params.getCode());
|
|
|
- // String userNo = sequenceService.genSerialNumber("register_rule", null);
|
|
|
- User user = User.builder()
|
|
|
- .createTime(DateUtil.date())
|
|
|
- // .invitedCode(code)
|
|
|
- .name(params.getName())
|
|
|
- .areaCode(params.getAreaCode())
|
|
|
- // .userNo(userNo)
|
|
|
- .isDelete((byte) 1)
|
|
|
- .createUser("sys")
|
|
|
- .status((byte) 1)
|
|
|
- .hasLogin(1)
|
|
|
- .hasOrder(1)
|
|
|
- .hasWithdraw(1)
|
|
|
- .phoneNo(params.getPhone())
|
|
|
- .pwd(pwd2)
|
|
|
- .salt(salt)
|
|
|
- .build();
|
|
|
- if (StrUtil.isNotBlank(params.getCode())) {
|
|
|
- // User parent = userService.findBy("userNo", params.getCode());
|
|
|
- // if (parent != null) {
|
|
|
- user.setPid(ShareCodeUtils.codeToId(params.getCode()));
|
|
|
- User puser = userService.findById(ShareCodeUtils.codeToId(params.getCode()));
|
|
|
- if (ObjectUtil.isEmpty(puser)) {
|
|
|
- throw new ServiceException(ResultCode.USER_IS_NULL);
|
|
|
+ try {
|
|
|
+
|
|
|
+ Condition condition = new Condition(User.class);
|
|
|
+ condition.createCriteria().andEqualTo("phoneNo", params.getPhone())
|
|
|
+ .orEqualTo("name", params.getName());
|
|
|
+ ;
|
|
|
+ List<User> users = userService.findByCondition(condition);
|
|
|
+ if (CollUtil.isNotEmpty(users)) {
|
|
|
+ return ResultGenerator.genFailResult(ResultCode.USER_IS_EXIST);
|
|
|
}
|
|
|
- if (puser.getPid() != null) {
|
|
|
- user.setPpid(puser.getPid());
|
|
|
+ if (!userService.checkCode(params.getPhone(), params.getVerifyCode())) {
|
|
|
+ return ResultGenerator.genFailResult(ResultCode.CODE_CHECK_FAIL);
|
|
|
}
|
|
|
-
|
|
|
- // 更新VIP等级
|
|
|
- Condition c = new Condition(User.class);
|
|
|
- Example.Criteria criteria = c.createCriteria();
|
|
|
- criteria.andEqualTo("pid", puser.getId());
|
|
|
- Integer kidsNum = userService.countByCondition(c);
|
|
|
- ConfigMember nextLevel = configMemberService.findBy("level", puser.getVipLevel() + 1);
|
|
|
- if (nextLevel != null) {
|
|
|
- if (nextLevel.getInvitedNo().compareTo(kidsNum + 1) <= 0) {
|
|
|
- userService.update(User.builder().id(puser.getId()).vipLevel(nextLevel.getLevel()).build());
|
|
|
+ String salt = RandomUtil.randomString(4);
|
|
|
+ String pwd2 = SecureUtil.md5(params.getPwd() + salt).toUpperCase();
|
|
|
+ log.error("[密码]" + params.getPhone() + " :" + pwd2);
|
|
|
+
|
|
|
+ // String code = getInviteCode(0);
|
|
|
+ // if (code == null) {
|
|
|
+ // return ResultGenerator.genFailResult(ResultCode.INTERNAL_SERVER_ERROR);
|
|
|
+ // }
|
|
|
+ // User parent = userService.findBy("userNo", params.getCode());
|
|
|
+ // String userNo = sequenceService.genSerialNumber("register_rule", null);
|
|
|
+ User user = User.builder()
|
|
|
+ .createTime(DateUtil.date())
|
|
|
+ // .invitedCode(code)
|
|
|
+ .name(params.getName())
|
|
|
+ .areaCode(params.getAreaCode())
|
|
|
+ // .userNo(userNo)
|
|
|
+ .isDelete((byte) 1)
|
|
|
+ .createUser("sys")
|
|
|
+ .status((byte) 1)
|
|
|
+ .hasLogin(1)
|
|
|
+ .hasOrder(1)
|
|
|
+ .hasWithdraw(1)
|
|
|
+ .phoneNo(params.getPhone())
|
|
|
+ .pwd(pwd2)
|
|
|
+ .salt(salt)
|
|
|
+ .build();
|
|
|
+ if (StrUtil.isNotBlank(params.getCode())) {
|
|
|
+ // User parent = userService.findBy("userNo", params.getCode());
|
|
|
+ // if (parent != null) {
|
|
|
+ user.setPid(ShareCodeUtils.codeToId(params.getCode()));
|
|
|
+ User puser = userService.findById(ShareCodeUtils.codeToId(params.getCode()));
|
|
|
+ if (ObjectUtil.isEmpty(puser)) {
|
|
|
+ throw new ServiceException(ResultCode.USER_IS_NULL);
|
|
|
+ }
|
|
|
+ if (puser.getPid() != null) {
|
|
|
+ user.setPpid(puser.getPid());
|
|
|
+ }
|
|
|
+
|
|
|
+ // 更新VIP等级
|
|
|
+ Condition c = new Condition(User.class);
|
|
|
+ Example.Criteria criteria = c.createCriteria();
|
|
|
+ criteria.andEqualTo("pid", puser.getId());
|
|
|
+ Integer kidsNum = userService.countByCondition(c);
|
|
|
+ ConfigMember nextLevel = configMemberService.findBy("level", puser.getVipLevel() + 1);
|
|
|
+ if (nextLevel != null) {
|
|
|
+ if (nextLevel.getInvitedNo().compareTo(kidsNum + 1) <= 0) {
|
|
|
+ userService.update(User.builder().id(puser.getId()).vipLevel(nextLevel.getLevel()).build());
|
|
|
+ }
|
|
|
}
|
|
|
}
|
|
|
+ if (StrUtil.isBlank(user.getHeadPic())) {
|
|
|
+ String zm = user.getName().substring(0, 1).toUpperCase();
|
|
|
+ Integer index = RandomUtil.randomInt(10);
|
|
|
+ com.txz.operating.result.Result<ConfigDTO> defaultAvatar = configDubboServiceClient.getConfigByCode("default_avatar");
|
|
|
+ String headPic = defaultAvatar.getData().getValueInfo() + zm + "/" + zm + "_gradient_" + index + ".png";
|
|
|
+ user.setHeadPic(headPic);
|
|
|
+ }
|
|
|
+ user.setVipLevel(0);
|
|
|
+ // 新增
|
|
|
+ userService.add(user);
|
|
|
+ user.setInvitedCode(ShareCodeUtils.idToInvitationCode(user.getId()));
|
|
|
+ // 补位
|
|
|
+ user.setUserNo(UserNoUtil.generateUserNo(user.getId()));
|
|
|
+ userService.update(user);
|
|
|
+ user.setPwd("***");
|
|
|
+ user.setSalt("***");
|
|
|
+ return ResultGenerator.genSuccessResult(user);
|
|
|
+ } catch (Exception e){
|
|
|
+ log.error("注册异常",e );
|
|
|
+ return ResultGenerator.genFailResult(ResultCode.INTERNAL_SERVER_ERROR);
|
|
|
}
|
|
|
- if (StrUtil.isBlank(user.getHeadPic())) {
|
|
|
- String zm = user.getName().substring(0, 1).toUpperCase();
|
|
|
- Integer index = RandomUtil.randomInt(10);
|
|
|
- com.txz.operating.result.Result<ConfigDTO> defaultAvatar = configDubboServiceClient.getConfigByCode("default_avatar");
|
|
|
- String headPic = defaultAvatar.getData().getValueInfo() + zm + "/" + zm + "_gradient_" + index + ".png";
|
|
|
- user.setHeadPic(headPic);
|
|
|
- }
|
|
|
- user.setVipLevel(0);
|
|
|
- // 新增
|
|
|
- userService.add(user);
|
|
|
- user.setInvitedCode(ShareCodeUtils.idToInvitationCode(user.getId()));
|
|
|
- // 补位
|
|
|
- user.setUserNo(UserNoUtil.generateUserNo(user.getId()));
|
|
|
- userService.update(user);
|
|
|
- user.setPwd("***");
|
|
|
- user.setSalt("***");
|
|
|
- return ResultGenerator.genSuccessResult(user);
|
|
|
}
|
|
|
|
|
|
private String getInviteCode(int index) {
|
