From 353b78d5cf806b67347100570be44a719ca396e9 Mon Sep 17 00:00:00 2001
From: 18792927508 <1322446236@qq.com>
Date: Wed, 25 Oct 2023 14:41:30 +0800
Subject: [PATCH] =?UTF-8?q?=E9=83=A8=E9=97=A8=E4=BB=A3=E7=A0=81=E4=BF=AE?=
=?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../IdentityAuthenticationServiceImpl.java | 29 +++++++++++--------
.../service/impl/WeChatUserServiceImpl.java | 13 +++++++--
.../IdentityAuthenticationMapper.xml | 3 ++
3 files changed, 30 insertions(+), 15 deletions(-)
diff --git a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/impl/IdentityAuthenticationServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/impl/IdentityAuthenticationServiceImpl.java
index d496918..d6e69d7 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/impl/IdentityAuthenticationServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/impl/IdentityAuthenticationServiceImpl.java
@@ -197,19 +197,24 @@ public class IdentityAuthenticationServiceImpl implements IdentityAuthentication
*/
// authentication.setUserName(loginUser.getUsername());
// authentication.setUserId(loginUser.getUserId());
- authentication.setName(name);
- authentication.setIdentityNo(idcardno);
- authentication.setCertificationTime(new Date());
- authentication.setCertificationStatus(0);
- authentication.setCreateBy(name);
- // authentication.setCreateBy(loginUser.getUsername());
- try {
- identityAuthenticationMapper.insertIdentityAuthentication(authentication);
- authentication.setId(authentication.getId());
- } catch (Exception e) {
- System.out.println("认证记录新增失败");
- }
+ authentication.setIdentityNo(idcardno);
+ // 查询认证表是否已存在该身份证信息的认证，不存在则新增，存在不处理
+ IdentityAuthentication identityAuthentication = identityAuthenticationMapper.selectIdentityAuthentication(authentication);
+ if(identityAuthentication!=null) {
+ return AjaxResult.success(identityAuthentication);
+ }
+ authentication.setName(name);
+ authentication.setCertificationTime(new Date());
+ authentication.setCertificationStatus(0);
+ authentication.setCreateBy(name);
+ // authentication.setCreateBy(loginUser.getUsername());
+ try {
+ identityAuthenticationMapper.insertIdentityAuthentication(authentication);
+ authentication.setId(authentication.getId());
+ } catch (Exception e) {
+ System.out.println("认证记录新增失败");
+ }
}
}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/impl/WeChatUserServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/impl/WeChatUserServiceImpl.java
index 4ff87f1..5acd5e1 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/impl/WeChatUserServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/impl/WeChatUserServiceImpl.java
@@ -115,10 +115,19 @@ public class WeChatUserServiceImpl implements WeChatUserService {
}else if(!codeCache.equals(ientityAuthentication.getVerifyCode())){
return AjaxResult.warn("验证码校验失败");
}
- SysUser sysUserName=sysUserMapper.selectUserByUserName(ientityAuthentication.getUserName());
+ SysUser sysUserName=sysUserMapper.checkUserNameUnique(ientityAuthentication.getUserName());
if(sysUserName!=null){
return AjaxResult.warn("账号已存在");
}
+ SysUser checkPhoneUnique = sysUserMapper.checkPhoneUnique(ientityAuthentication.getPhone());
+ if(checkPhoneUnique!=null){
+ return AjaxResult.warn("手机号已存在");
+ }
+ SysUser checkEmailUnique = sysUserMapper.checkEmailUnique(ientityAuthentication.getEmail());
+ if(checkEmailUnique!=null){
+ return AjaxResult.warn("邮箱已存在");
+ }
+
// 根据身份证查询系统用户表中是否存在该用户，存在则同步已认证的信息，不存在则新增
SysUser sysUser=sysUserMapper.selectUserByIdCard(ientityAuthentication.getIdentityNo());
@@ -133,8 +142,6 @@ public class WeChatUserServiceImpl implements WeChatUserService {
ientityAuthentication.setUserId(sysUser.getUserId());
}else {
sysUser=new SysUser();
- // 用户名设为电话号
- sysUser.setUserName(ientityAuthentication.getPhone());
sysUser.setIdCard(ientityAuthentication.getIdentityNo());
sysUser.setNickName(ientityAuthentication.getName());
sysUser.setUserName(ientityAuthentication.getUserName());
diff --git a/ruoyi-system/src/main/resources/mapper/wisdomarbitrate/IdentityAuthenticationMapper.xml b/ruoyi-system/src/main/resources/mapper/wisdomarbitrate/IdentityAuthenticationMapper.xml
index 2477c63..8615a18 100644
--- a/ruoyi-system/src/main/resources/mapper/wisdomarbitrate/IdentityAuthenticationMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/wisdomarbitrate/IdentityAuthenticationMapper.xml
@@ -60,6 +60,9 @@
AND i.user_id = #{userId}
+
+ AND i.identity_no = #{identityNo}
+