change error code

cif-service/src/main/java/com/txz/cif/core/ResultCode.java

@@ -36,6 +36,7 @@ public enum ResultCode {
     USER_IS_NULL("1003", "未找到用户"),
     UNLOGIN_PWD_ERROR("1004", "密码错误"),
     APPCODE_IS_NULL("1005", "应用编号不能为空"),
+    PARENT_USER_IS_NULL("1006", "邀请码错误"),
     STATUS_IS_NULL("1013", "状态异常"),
     ACCOUNT_IS_NULL("1051", "账号不能为空"),
     HOSPITAL_IS_NULL("1052", "医院不能为空"),

cif-service/src/main/java/com/txz/cif/web/UserApiController.java

@@ -210,7 +210,7 @@ public class UserApiController extends AbstractApiController {
     @GetMapping("/memberConfigs")
     public Result<List<ConfigMember>> memberConfigs() {
         List<ConfigMember> result = configMemberService.findAll();
-        return ResultGenerator.genSuccessResult(result.stream().map(e -> e.setInvitedNo( e.getInvitedNo() - e.getHasInvitedNo())).collect(Collectors.toList()));
+        return ResultGenerator.genSuccessResult(result.stream().map(e -> e.setInvitedNo(e.getInvitedNo() - e.getHasInvitedNo())).collect(Collectors.toList()));
     }
     
     
@@ -244,7 +244,7 @@ public class UserApiController extends AbstractApiController {
         if (nextLevel == null) {
             bo.setNextInvitedNo(invited);
         } else {
-            bo.setNextInvitedNo( nextLevel.getInvitedNo() );
+            bo.setNextInvitedNo(nextLevel.getInvitedNo());
         }
         c = new Condition(User.class);
         c.createCriteria().andEqualTo("ppid", user.getId());
@@ -311,7 +311,7 @@ public class UserApiController extends AbstractApiController {
             return ResultGenerator.genFailResult(ResultCode.ACCOUNT_IS_NULL);
         }
         try {
-
+            
             Condition condition = new Condition(User.class);
             condition.createCriteria().andEqualTo("phoneNo", params.getPhone())
                     .orEqualTo("name", params.getName());
@@ -326,7 +326,7 @@ public class UserApiController extends AbstractApiController {
             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);
@@ -355,12 +355,12 @@ public class UserApiController extends AbstractApiController {
                 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);
+                    return ResultGenerator.genFailResult(ResultCode.PARENT_USER_IS_NULL);
                 }
                 if (puser.getPid() != null) {
                     user.setPpid(puser.getPid());
                 }
-
+                
                 //  更新VIP等级
                 Condition c = new Condition(User.class);
                 Example.Criteria criteria = c.createCriteria();
@@ -390,8 +390,8 @@ public class UserApiController extends AbstractApiController {
             user.setPwd("***");
             user.setSalt("***");
             return ResultGenerator.genSuccessResult(user);
-        } catch (Exception e){
-            log.error("注册异常",e );
+        } catch (Exception e) {
+            log.error("注册异常", e);
             return ResultGenerator.genFailResult(ResultCode.INTERNAL_SERVER_ERROR);
         }
     }