小程序重新注册时，更改实名认证信息

补充已经实名认证过的unionId

csm-service/cms-service-user/src/main/java/com/mmc/iuav/user/dao/RealNameAuthDao.java

@@ -12,7 +12,7 @@ import java.util.List;
  */
 @Mapper
 public interface RealNameAuthDao {
-    int existHasBeenAuth(String unionId, String idNumber);
+    RealNameAuthDO existHasBeenAuth(String unionId, String idNumber);
 
     RealNameAuthDO getRealNameAuthByUnionId(String unionId);
 

csm-service/cms-service-user/src/main/java/com/mmc/iuav/user/service/impl/AuthServiceImpl.java

@@ -133,8 +133,8 @@ public class AuthServiceImpl implements AuthService {
             RealNameAuthDO nameAuthByUnionId = realNameAuthDao.getRealNameAuthBakByUnionId(unionId);
             if (nameAuthByUnionId != null) {
                 nameAuthByUnionId.setUserAccountId(userAccountDO.getId());
-                nameAuthByUnionId.setId(null);
-                realNameAuthDao.addRealNameAuth(nameAuthByUnionId);
+//                nameAuthByUnionId.setId(null);
+                realNameAuthDao.updateRealNameAuth(nameAuthByUnionId);
             }
             log.info("用户的id是=====》{}",userAccountDO.getId());
         } else {

csm-service/cms-service-user/src/main/java/com/mmc/iuav/user/service/impl/RealNameAuthServiceImpl.java

@@ -52,8 +52,12 @@ public class RealNameAuthServiceImpl implements RealNameAuthService {
             return ResultBody.error(ResultEnum.REAL_NAME_PASS_ERROR);
         }
         // 查询是否已认证
-        int count = realNameAuthDao.existHasBeenAuth(realNameAuthVO.getUnionId(), realNameAuthVO.getIdNumber());
-        if (count > 0) {
+        RealNameAuthDO realNameAuthDO1 = realNameAuthDao.existHasBeenAuth(realNameAuthVO.getUnionId(), realNameAuthVO.getIdNumber());
+        if (realNameAuthDO1 != null) {
+            if(realNameAuthDO1.getUnionId() == null){
+                realNameAuthDO1.setUnionId(realNameAuthVO.getUnionId());
+                realNameAuthDao.updateRealNameAuth(realNameAuthDO1);
+            }
             return ResultBody.error(ResultEnum.IDENTITY_HAS_BEEN_AUTHENTICATED);
         }
         // 校验正面

csm-service/cms-service-user/src/main/resources/mapper/RealNameAuthDao.xml

@@ -77,12 +77,31 @@
         where id = #{id}
     </update>
 
-    <select id="existHasBeenAuth" resultType="java.lang.Integer">
-        select count(*)
-        from real_name_auth
-        where id_number = #{idNumber}
-          and check_status = 1
-          and is_deleted = 0
+    <select id="existHasBeenAuth" resultType="com.mmc.iuav.user.entity.RealNameAuthDO">
+        select rna.id,
+               rna.user_account_id,
+               rna.union_id,
+               rna.front_id_img,
+               rna.back_id_img,
+               rna.id_number,
+               rna.user_name,
+               rna.sex,
+               rna.nationality,
+               rna.birthday,
+               rna.address,
+               rna.issue,
+               rna.start_date,
+               rna.end_date,
+               rna.is_fake_front,
+               rna.is_fake_back,
+               rna.check_status,
+               rna.remark,
+               rna.create_time
+        from real_name_auth rna
+        where rna.id_number = #{idNumber}
+          and rna.check_status = 1
+          and rna.is_deleted = 0
+        limit 1
     </select>
 
     <select id="getRealNameAuthByUnionId" resultType="com.mmc.iuav.user.entity.RealNameAuthDO">