认证党员失败错误信息

esua-epdc/epdc-module/epdc-api/epdc-api-client/src/main/java/com/elink/esua/epdc/dto/result/EpdcAppAuthorizationDTO.java

@@ -43,4 +43,15 @@ public class EpdcAppAuthorizationDTO implements Serializable {
      * 网格名称
      */
     private String grid;
+
+
+    /**
+     * 0成功 1党员认证失败
+     */
+    private String resultCode;
+
+    /**
+     * 党员认证失败信息
+     */
+    private String resultMsg;
 }

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

@@ -826,6 +826,13 @@ public class AppUserServiceImpl implements AppUserService {
 
         Result<UserDTO> completeResult = userFeignClient.completeUserInfo(dto);
         if (!completeResult.success()) {
+            //党员认证失败
+            if(100006001==completeResult.getCode()){
+                EpdcAppAuthorizationDTO authorizationDto = new EpdcAppAuthorizationDTO();
+                authorizationDto.setResultCode(YesOrNoEnum.YES.value());
+                authorizationDto.setResultMsg(completeResult.getMsg());
+                return new Result().ok(authorizationDto);
+            }
             return new Result().error(completeResult.getMsg());
         }
         UserDTO user = completeResult.getData();

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

@@ -552,7 +552,8 @@ public class UserServiceImpl extends BaseServiceImpl<UserDao, UserEntity> implem
                 partyAuthenticationFailedDao.insert(authenticationFailedEntity);
 
                 userDto.setState(AppUserStatesEnum.STATE_COMPLETED_INFORMATION_PENDING_REVIEW.value());
-                userDto.setPartyFlag(YesOrNoEnum.NO.value());//是否是党员(0-否，1-是)  认证失败：0
+                // 是否是党员(0-否，1-是)  认证失败：0
+                userDto.setPartyFlag(YesOrNoEnum.NO.value());
                 userAuthenticateHistoryEntity.setAuthenticatedFlag(YesOrNoEnum.NO.value());
                 // 党员认证失败返回code码
                 result.error(UserModuleErrorCode.AUTHENTICATION_CODE, MessageUtils.getMessage(UserModuleErrorCode.AUTHENTICATION_CODE));

esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/i18n/messages.properties

@@ -1,2 +1,2 @@
 #Default
-100006001=\u515A\u5458\u8BA4\u8BC1\u5931\u8D25
+100006001=\u5728\u515A\u5458\u5E93\u4E2D\u6CA1\u6709\u627E\u5230\u60A8\u7684\u4FE1\u606F\uFF0C\u6211\u4EEC\u5148\u5C06\u60A8\u8BA4\u8BC1\u4E3A\u5C45\u6C11\uFF0C\u8BF7\u8054\u7CFB\u5F53\u5730\u7BA1\u7406\u4EBA\u5458\u5B8C\u5584\u515A\u5458\u5E93\u540E\u7EE7\u7EED\u8BA4\u8BC1