From 429b5569719ca446b11267e76791fdd4628e0f34 Mon Sep 17 00:00:00 2001 From: liujiang <569804566@qq.com> Date: Mon, 1 Dec 2025 14:15:20 +0800 Subject: [PATCH] =?UTF-8?q?master=EF=BC=9A=E5=BC=80=E5=8F=91=E4=BA=BA?= =?UTF-8?q?=E5=91=98=E6=B3=A8=E5=86=8C=E5=8F=8A=E7=BC=96=E8=BE=91=E6=B5=81?= =?UTF-8?q?=E7=A8=8B=E5=AE=8C=E5=96=84=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../xkt/vo/userAuthentication/UserAuthCreateVO.java | 2 ++ .../xkt/vo/userAuthentication/UserAuthUpdateVO.java | 2 ++ .../main/java/com/ruoyi/xkt/domain/UserAuthentication.java | 4 ++++ .../ruoyi/xkt/service/impl/UserAuthenticationServiceImpl.java | 4 ++-- xkt/src/main/resources/mapper/UserAuthenticationMapper.xml | 2 +- 5 files changed, 11 insertions(+), 3 deletions(-) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/userAuthentication/UserAuthCreateVO.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/userAuthentication/UserAuthCreateVO.java index 6b14b7495..8041e7e21 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/userAuthentication/UserAuthCreateVO.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/userAuthentication/UserAuthCreateVO.java @@ -7,6 +7,7 @@ import lombok.Data; import javax.validation.Valid; import javax.validation.constraints.NotBlank; import javax.validation.constraints.NotNull; +import javax.validation.constraints.Pattern; import javax.validation.constraints.Size; import java.math.BigDecimal; @@ -26,6 +27,7 @@ public class UserAuthCreateVO { private String realName; @NotBlank(message = "联系电话不能为空") @ApiModelProperty(value = "联系电话", required = true) + @Pattern(regexp = "^1[3-9]\\d{9}$", message = "联系电话格式不正确，请输入有效的中国大陆手机号") private String phonenumber; @NotBlank(message = "验证码不能为空") @ApiModelProperty(value = "验证码", required = true) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/userAuthentication/UserAuthUpdateVO.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/userAuthentication/UserAuthUpdateVO.java index 5dfe16cc9..5877084ad 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/userAuthentication/UserAuthUpdateVO.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/userAuthentication/UserAuthUpdateVO.java @@ -7,6 +7,7 @@ import lombok.Data; import javax.validation.Valid; import javax.validation.constraints.NotBlank; import javax.validation.constraints.NotNull; +import javax.validation.constraints.Pattern; import javax.validation.constraints.Size; import java.math.BigDecimal; @@ -28,6 +29,7 @@ public class UserAuthUpdateVO { private String realName; @NotBlank(message = "联系电话不能为空") @ApiModelProperty(value = "联系电话", required = true) + @Pattern(regexp = "^1[3-9]\\d{9}$", message = "联系电话格式不正确，请输入有效的中国大陆手机号") private String phonenumber; @NotBlank(message = "身份证号不能为空") @ApiModelProperty(value = "身份证号", required = true) diff --git a/xkt/src/main/java/com/ruoyi/xkt/domain/UserAuthentication.java b/xkt/src/main/java/com/ruoyi/xkt/domain/UserAuthentication.java index 3ab6780b4..fcd678f8c 100644 --- a/xkt/src/main/java/com/ruoyi/xkt/domain/UserAuthentication.java +++ b/xkt/src/main/java/com/ruoyi/xkt/domain/UserAuthentication.java @@ -39,6 +39,10 @@ public class UserAuthentication extends XktBaseEntity { * 身份证头像面文件ID */ private Long idCardFaceFileId; + /** + * 代发人员手机号 + */ + private String phonenumber; /** * 身份证国徽面文件ID */ diff --git a/xkt/src/main/java/com/ruoyi/xkt/service/impl/UserAuthenticationServiceImpl.java b/xkt/src/main/java/com/ruoyi/xkt/service/impl/UserAuthenticationServiceImpl.java index f963945a9..0e2d4b244 100644 --- a/xkt/src/main/java/com/ruoyi/xkt/service/impl/UserAuthenticationServiceImpl.java +++ b/xkt/src/main/java/com/ruoyi/xkt/service/impl/UserAuthenticationServiceImpl.java @@ -72,7 +72,7 @@ public class UserAuthenticationServiceImpl implements IUserAuthenticationService // 保存身份证国徽 SysFile idCardEmblem = BeanUtil.toBean(createDTO.getEmblemFile(), SysFile.class); this.fileMapper.insert(idCardEmblem); - UserAuthentication userAuth = new UserAuthentication().setIdCard(createDTO.getIdCard()) + UserAuthentication userAuth = new UserAuthentication().setIdCard(createDTO.getIdCard()).setPhonenumber(createDTO.getPhonenumber()) .setRealName(createDTO.getRealName()).setUserId(userId).setAuthStatus(UserAuthStatus.UN_AUDITED.getValue()) .setIdCardFaceFileId(idCardFace.getId()).setIdCardEmblemFileId(idCardEmblem.getId()); return userAuthMapper.insert(userAuth); @@ -100,7 +100,7 @@ public class UserAuthenticationServiceImpl implements IUserAuthenticationService // 保存身份证国徽 SysFile idCardEmblem = BeanUtil.toBean(updateDTO.getEmblemFile(), SysFile.class); this.fileMapper.insert(idCardEmblem); - userAuth.setIdCard(updateDTO.getIdCard()) + userAuth.setIdCard(updateDTO.getIdCard()).setPhonenumber(updateDTO.getPhonenumber()) .setRealName(updateDTO.getRealName()).setUserId(userId).setAuthStatus(UserAuthStatus.UN_AUDITED.getValue()) .setIdCardFaceFileId(idCardFace.getId()).setIdCardEmblemFileId(idCardEmblem.getId()); return userAuthMapper.updateById(userAuth); diff --git a/xkt/src/main/resources/mapper/UserAuthenticationMapper.xml b/xkt/src/main/resources/mapper/UserAuthenticationMapper.xml index e9b074769..c4bc5dbf9 100644 --- a/xkt/src/main/resources/mapper/UserAuthenticationMapper.xml +++ b/xkt/src/main/resources/mapper/UserAuthenticationMapper.xml @@ -31,7 +31,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" SELECT ua.id AS userAuthId, ua.real_name, - u.phonenumber, + ua.phonenumber, u.avatar FROM user_authentication ua JOIN sys_user u ON ua.user_id = u.user_id