志愿者认证逻辑完善

esua-epdc/epdc-module/epdc-api/epdc-api-client/src/main/java/com/elink/esua/epdc/dto/form/v2/EpdcCompleteUserInfoFormV2DTO.java

@@ -72,4 +72,10 @@ public class EpdcCompleteUserInfoFormV2DTO implements Serializable {
      * 居住网格id
      */
     private Long gridId;
+
+    /////////////////////////////////////////非必要字段，特殊场景使用
+    /**
+     * 认证类型 参考 UserAuthTypeEnum
+     */
+    private String userAuthType;
 }

esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/AppUserServiceImpl.java

@@ -10,6 +10,7 @@ import com.elink.esua.epdc.async.GroupTask;
 import com.elink.esua.epdc.common.token.dto.TokenDto;
 import com.elink.esua.epdc.common.token.util.CpUserDetailRedis;
 import com.elink.esua.epdc.commons.tools.constant.NumConstant;
+import com.elink.esua.epdc.commons.tools.enums.UserAuthTypeEnum;
 import com.elink.esua.epdc.commons.tools.enums.UserSexEnum;
 import com.elink.esua.epdc.commons.tools.enums.UserTagEnum;
 import com.elink.esua.epdc.commons.tools.enums.YesOrNoEnum;
@@ -928,6 +929,7 @@ public class AppUserServiceImpl implements AppUserService {
             }
         }
         EpdcCompleteAppUserDTO completeAppUserDto = ConvertUtils.sourceToTarget(userDto, EpdcCompleteAppUserDTO.class);
+        completeAppUserDto.setUserAuthType(infoDto.getUserAuthType());
         return this.packageUserCompleteInfo(completeAppUserDto, userState);
     }
 
@@ -1305,8 +1307,9 @@ public class AppUserServiceImpl implements AppUserService {
 
         // 调用用户完善个人信息-保存
         EpdcCompleteUserInfoFormV2DTO epdcCompleteUserInfoFormDTO = ConvertUtils.sourceToTarget(formDto, EpdcCompleteUserInfoFormV2DTO.class);
-        // set 党员标识，将志愿者完善信息视为党员完善信息
+        // set 党员标识，将志愿者完善信息视为党员完善信息，方便身份证号码唯一校验等操作
         epdcCompleteUserInfoFormDTO.setPartyFlag(YesOrNoEnum.YES.value());
+        epdcCompleteUserInfoFormDTO.setUserAuthType(UserAuthTypeEnum.VOLUNTEER_AUTH.value());
         Result<EpdcAppAuthorizationDTO> result = completeUserInfoNormally(tokenDto, epdcCompleteUserInfoFormDTO);
 
         return result;

esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/EpdcCompleteAppUserDTO.java

@@ -113,4 +113,10 @@ public class EpdcCompleteAppUserDTO implements Serializable {
      * 用户头像
      */
     private String faceImg;
+
+    /////////////////////////////////////////非必要字段，特殊场景使用
+    /**
+     * 认证类型 参考 UserAuthTypeEnum
+     */
+    private String userAuthType;
 }

esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/UserServiceImpl.java

@@ -723,6 +723,7 @@ public class UserServiceImpl extends BaseServiceImpl<UserDao, UserEntity> implem
                 ConvertUtils.sourceToTarget(parentAndAllDeptDTO, DeptEntityUtils.DeptDto.class),
                 authenticationFailedEntity
         );
+        authenticationFailedEntity.setId(null);
         authenticationFailedEntity.setUserId(dto.getId());
         authenticationFailedEntity.setState(dto.getState());
         authenticationFailedEntity.setAddress(dto.getAddress());
@@ -887,10 +888,13 @@ public class UserServiceImpl extends BaseServiceImpl<UserDao, UserEntity> implem
         if (selectCount == NumConstant.ZERO) {
             // 党员认证失败,移除用户身份标签
             userTagRelationService.removeUserTagRelation(completeAppUser.getId(), UserTagEnum.PARTY_MEMBER.value());
-            // 党员库中没有，存进党员认证失败表
-            generatePartyAuthenticationFailedRecord(completeAppUser, userGridRelation, parentAndAllDeptDTO);
-            // 生成党员认证不通过记录
-            generateUserAuthenticateHistory(completeAppUser, UserAuthTypeEnum.PARTY_AUTH, YesOrNoEnum.NO, "党员库中无此党员信息");
+            // 若不是志愿者认证，进行党员认证失败保存
+            if (!UserAuthTypeEnum.VOLUNTEER_AUTH.value().equals(completeAppUser.getUserAuthType())) {
+                // 党员库中没有，存进党员认证失败表
+                generatePartyAuthenticationFailedRecord(completeAppUser, userGridRelation, parentAndAllDeptDTO);
+                // 生成党员认证不通过记录
+                generateUserAuthenticateHistory(completeAppUser, UserAuthTypeEnum.PARTY_AUTH, YesOrNoEnum.NO, "党员库中无此党员信息");
+            }
             return Boolean.FALSE;
         } else {
             //党员认证成功