BruceSun
/
RuoYi-Vue
mirror of https://gitee.com/y_project/RuoYi-Vue.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

master：开发人员注册及编辑流程完善；

pull/1121/head
liujiang 2025-12-01 14:15:20 +08:00
parent f10a35fac2
commit 429b556971
5 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/userAuthentication/UserAuthCreateVO.java
View File

@ -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)

2
ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/userAuthentication/UserAuthUpdateVO.java
View File

@ -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)

4
xkt/src/main/java/com/ruoyi/xkt/domain/UserAuthentication.java
View File

@ -39,6 +39,10 @@ public class UserAuthentication extends XktBaseEntity {
* 身份证头像面文件ID
*/
private Long idCardFaceFileId;
/**
* 代发人员手机号
*/
private String phonenumber;
/**
* 身份证国徽面文件ID
*/

4
xkt/src/main/java/com/ruoyi/xkt/service/impl/UserAuthenticationServiceImpl.java
View File

@ -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);

2
xkt/src/main/resources/mapper/UserAuthenticationMapper.xml
View File

@ -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