add area code

cif-service/src/main/java/com/txz/cif/model/User.java

@@ -7,215 +7,216 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.*;
 
-import java.util.Date;
 import javax.persistence.*;
+import java.util.Date;
 
 @Getter
 @Setter
 @NoArgsConstructor
 @AllArgsConstructor
 @Builder
-@ApiModel(value="com.txz.cif.model.User")
+@ApiModel(value = "com.txz.cif.model.User")
 @Table(name = "c_user")
-public class User  {
+public class User {
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)
-    @ApiModelProperty(value="id")
+    @ApiModelProperty(value = "id")
     private Long id;
-
+    
     /**
      * pid
      */
-    @ApiModelProperty(value="pidpid")
+    @ApiModelProperty(value = "pidpid")
     private Long pid;
-
+    
     /**
      * 爷爷id
      */
-    @ApiModelProperty(value="ppid爷爷id")
+    @ApiModelProperty(value = "ppid爷爷id")
     private Long ppid;
-
+    
     /**
      * 用户号
      */
     @Column(name = "user_no")
-    @ApiModelProperty(value="userId用户号")
+    @ApiModelProperty(value = "userId用户号")
     private String userNo;
-
-    @ApiModelProperty(value="语言")
-    private String  language;
-
-
+    
+    @ApiModelProperty(value = "语言")
+    private String language;
+    
+    
     @Column(name = "last_token")
-    @ApiModelProperty(value="token" )
-    private String  lastToken;
-
+    @ApiModelProperty(value = "token")
+    private String lastToken;
+    
     /**
      * 邀请码
      */
     @Column(name = "invited_code")
-    @ApiModelProperty(value="invitedCode邀请码")
+    @ApiModelProperty(value = "invitedCode邀请码")
     private String invitedCode;
-
+    
     /**
      * 昵称
      */
-    @ApiModelProperty(value="nickname昵称")
+    @ApiModelProperty(value = "nickname昵称")
     private String nickname;
-
+    
     /**
      * 身份证号
      */
-    @ApiModelProperty(value="identity身份证号")
+    @ApiModelProperty(value = "identity身份证号")
     private String identity;
-
+    
     /**
      * 头像
      */
     @Column(name = "head_pic")
-    @ApiModelProperty(value="headPic头像")
+    @ApiModelProperty(value = "headPic头像")
     private String headPic;
-
+    
     /**
      * 性别 0未知 1男 2女
      */
-    @ApiModelProperty(value="sex性别 0未知 1男 2女")
+    @ApiModelProperty(value = "sex性别 0未知 1男 2女")
     private Byte sex;
-
+    
     /**
      * 状态  1正常 2禁止提现 3禁止登录 4禁止下单
      */
-    @ApiModelProperty(value="状态  1正常 2禁止提现 3禁止登录 4禁止下单")
+    @ApiModelProperty(value = "状态  1正常 2禁止提现 3禁止登录 4禁止下单")
     private Byte status;
-
+    
     /**
      * 银行
      */
-    @ApiModelProperty(value="bank银行")
+    @ApiModelProperty(value = "bank银行")
     private String bank;
-
+    
     /**
      * 名字
      */
-    @ApiModelProperty(value="name名字")
+    @ApiModelProperty(value = "name名字")
     private String name;
-
+    
+    /**
+     * 区号
+     */
+    private String areaCode;
+    
     /**
      * 电话
      */
     @Column(name = "phone_no")
-    @ApiModelProperty(value="phoneNo电话")
+    @ApiModelProperty(value = "phoneNo电话")
     private String phoneNo;
-
+    
     /**
      * 银行账号
      */
     @Column(name = "bank_account")
-    @ApiModelProperty(value="bankAccount银行账号")
+    @ApiModelProperty(value = "bankAccount银行账号")
     private String bankAccount;
-
+    
     /**
      * vip等级
      */
     @Column(name = "vip_level")
-    @ApiModelProperty(value="vipLevelvip等级")
+    @ApiModelProperty(value = "vipLevelvip等级")
     private Integer vipLevel;
-
+    
     @Column(name = "has_withdraw")
-    @ApiModelProperty(value="是否有提现权限 1是 2否")
+    @ApiModelProperty(value = "是否有提现权限 1是 2否")
     private Integer hasWithdraw;
-
+    
     @Column(name = "has_login")
-    @ApiModelProperty(value="是否有登录权限 1是 2否")
+    @ApiModelProperty(value = "是否有登录权限 1是 2否")
     private Integer hasLogin;
-
+    
     @Column(name = "has_order")
-    @ApiModelProperty(value="是否有下单权限 1是 2否")
+    @ApiModelProperty(value = "是否有下单权限 1是 2否")
     private Integer hasOrder;
-
-
-
+    
+    
     /**
      * 最后登录时间
      */
     @Column(name = "last_login_time")
-    @ApiModelProperty(value="lastLoginTime最后登录时间")
+    @ApiModelProperty(value = "lastLoginTime最后登录时间")
     private Date lastLoginTime;
-
-
-    @ApiModelProperty(value="备注")
+    
+    
+    @ApiModelProperty(value = "备注")
     private String memo;
-
-
+    
+    
     /**
      * 创建人
      */
     @Column(name = "create_user")
-    @ApiModelProperty(value="createUser创建人")
+    @ApiModelProperty(value = "createUser创建人")
     private String createUser;
-
+    
     @Column(name = "bank_account_name")
-    @ApiModelProperty(value="银行用户名称")
+    @ApiModelProperty(value = "银行用户名称")
     private String bankAccountName;
-
-
-
+    
+    
     /**
      * 更新人
      */
     @Column(name = "update_user")
-    @ApiModelProperty(value="updateUser更新人")
+    @ApiModelProperty(value = "updateUser更新人")
     private String updateUser;
-
+    
     /**
      * 更新时间
      */
     @Column(name = "update_time")
-    @ApiModelProperty(value="updateTime更新时间")
+    @ApiModelProperty(value = "updateTime更新时间")
     private Date updateTime;
-
+    
     /**
      * 创建时间
      */
     @Column(name = "create_time")
-    @ApiModelProperty(value="createTime创建时间")
+    @ApiModelProperty(value = "createTime创建时间")
     private Date createTime;
-
+    
     /**
      * 版本号
      */
-    @ApiModelProperty(value="version版本号")
+    @ApiModelProperty(value = "version版本号")
     private String version;
-
+    
     /**
      * 删除状态 1未删除 2已删除
      */
     @Column(name = "is_delete")
-    @ApiModelProperty(value="isDelete删除状态 1未删除 2已删除")
+    @ApiModelProperty(value = "isDelete删除状态 1未删除 2已删除")
     private Byte isDelete;
-
-
-
+    
+    
     /**
      * 密码
      */
-    @ApiModelProperty(value="pwd密码")
+    @ApiModelProperty(value = "pwd密码")
     private String pwd;
-
+    
     /**
      * 盐
      */
-    @ApiModelProperty(value="salt盐")
+    @ApiModelProperty(value = "salt盐")
     private String salt;
-
-
-
+    
+    
     public UserInfoBO generator() {
-        UserInfoBO bo = BeanUtil.toBean(this,UserInfoBO.class);
+        UserInfoBO bo = BeanUtil.toBean(this, UserInfoBO.class);
         bo.setUserId(this.id);
         bo.setSseId(SecureUtil.md5("sse" + this.id));
         return bo;
     }
-
-
+    
+    
 }

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

@@ -86,39 +86,39 @@ public class UserApiController extends AbstractApiController {
             case 1:
                 return ResultGenerator.genSuccessResult(Arrays.stream(BizTypeEnum.values())
                         .map(temp -> {
-                            EnumBo bo =  EnumBo.builder().code(temp.getKey()).name(temp.getValue()).build();
-                            String msg = LocalUtil.get("BizTypeEnum."+temp.name());
-                            if (StrUtil.isNotBlank(msg) ){
+                            EnumBo bo = EnumBo.builder().code(temp.getKey()).name(temp.getValue()).build();
+                            String msg = LocalUtil.get("BizTypeEnum." + temp.name());
+                            if (StrUtil.isNotBlank(msg)) {
                                 bo.setName(msg);
                             }
                             return bo;
                         }).collect(Collectors.toList()));
             case 2:
                 return ResultGenerator.genSuccessResult(Arrays.stream(RechargeStatusEnum.values())
-                        .map(temp ->  {
-                            EnumBo bo =  EnumBo.builder().code(temp.getKey()).name(temp.getDesc()).build();
-                            String msg = LocalUtil.get("RechargeStatusEnum."+temp.name());
-                            if (StrUtil.isNotBlank(msg) ){
+                        .map(temp -> {
+                            EnumBo bo = EnumBo.builder().code(temp.getKey()).name(temp.getDesc()).build();
+                            String msg = LocalUtil.get("RechargeStatusEnum." + temp.name());
+                            if (StrUtil.isNotBlank(msg)) {
                                 bo.setName(msg);
                             }
                             return bo;
-                        } ).collect(Collectors.toList()));
+                        }).collect(Collectors.toList()));
             case 3:
                 return ResultGenerator.genSuccessResult(Arrays.stream(WithdrawStatusEnum.values())
-                        .map(temp ->  {
-                            EnumBo bo =  EnumBo.builder().code(temp.getKey()).name(temp.getDesc()).build();
-                            String msg = LocalUtil.get("WithdrawStatusEnum."+temp.name());
-                            if (StrUtil.isNotBlank(msg) ){
+                        .map(temp -> {
+                            EnumBo bo = EnumBo.builder().code(temp.getKey()).name(temp.getDesc()).build();
+                            String msg = LocalUtil.get("WithdrawStatusEnum." + temp.name());
+                            if (StrUtil.isNotBlank(msg)) {
                                 bo.setName(msg);
                             }
                             return bo;
-                        } ).collect(Collectors.toList()));
+                        }).collect(Collectors.toList()));
             case 4:
                 return ResultGenerator.genSuccessResult(Arrays.stream(RedEnvelopeStatusEnum.values())
                         .map(temp -> {
-                            EnumBo bo =  EnumBo.builder().code(temp.getKey()).name(temp.getDesc()).build();
-                            String msg = LocalUtil.get("RedEnvelopeStatusEnum."+temp.name());
-                            if (StrUtil.isNotBlank(msg) ){
+                            EnumBo bo = EnumBo.builder().code(temp.getKey()).name(temp.getDesc()).build();
+                            String msg = LocalUtil.get("RedEnvelopeStatusEnum." + temp.name());
+                            if (StrUtil.isNotBlank(msg)) {
                                 bo.setName(msg);
                             }
                             return bo;
@@ -126,9 +126,9 @@ public class UserApiController extends AbstractApiController {
             case 5:
                 return ResultGenerator.genSuccessResult(BizTypeEnum.getRedEnvelopeTypes().stream()
                         .map(temp -> {
-                            EnumBo bo =  EnumBo.builder().code(temp.getKey()).name(temp.getValue()).build();
-                            String msg = LocalUtil.get("BizTypeEnum."+temp.name());
-                            if (StrUtil.isNotBlank(msg) ){
+                            EnumBo bo = EnumBo.builder().code(temp.getKey()).name(temp.getValue()).build();
+                            String msg = LocalUtil.get("BizTypeEnum." + temp.name());
+                            if (StrUtil.isNotBlank(msg)) {
                                 bo.setName(msg);
                             }
                             return bo;
@@ -136,10 +136,10 @@ public class UserApiController extends AbstractApiController {
         }
         return ResultGenerator.genSuccessResult();
     }
-
+    
     
     @ApiOperation(value = "用户登陆", notes = "", httpMethod = "POST")
-
+    
     @PostMapping("/login")
     public Result<UserBo> login(@RequestBody LoginAccountParameters loginPara,
                                 @RequestHeader(value = "version", defaultValue = "1.0.1") String version,
@@ -283,7 +283,7 @@ public class UserApiController extends AbstractApiController {
         if (params == null) {
             return ResultGenerator.genFailResult(ResultCode.OBJECT_IS_NULL);
         }
-        if (StrUtil.isBlank(params.getPhone())) {
+        if (StrUtil.isBlank(params.getPhone()) || StrUtil.isBlank(params.getAreaCode())) {
             return ResultGenerator.genFailResult(ResultCode.ACCOUNT_IS_NULL);
         }
         Condition condition = new Condition(User.class);
@@ -307,6 +307,7 @@ public class UserApiController extends AbstractApiController {
         // 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).phoneNo(params.getPhone()).pwd(pwd2).salt(salt).build();

cif-service/src/main/java/com/txz/cif/web/para/RegisterAccountParameters.java

@@ -26,6 +26,11 @@ public class RegisterAccountParameters {
 
     @ApiModelProperty(name="companyId",value = "公司id",required=true)
     private Integer companyId;
+    
+    /**
+     * 区号
+     */
+    private String areaCode;
 
     @ApiModelProperty(name="address",value = "地址",required=false)
     private String address;