From 93671595cce1ab63dbf7d942290de0bf660845cb Mon Sep 17 00:00:00 2001 From: yujintao Date: Mon, 13 Apr 2020 15:39:35 +0800 Subject: [PATCH] =?UTF-8?q?=E5=BF=97=E6=84=BF=E8=80=85=E8=AE=A4=E8=AF=81?= =?UTF-8?q?=E9=80=BB=E8=BE=91=E5=AE=8C=E5=96=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dto/form/v2/EpdcCompleteUserInfoFormV2DTO.java | 6 ++++++ .../esua/epdc/service/impl/AppUserServiceImpl.java | 5 ++++- .../esua/epdc/dto/epdc/EpdcCompleteAppUserDTO.java | 6 ++++++ .../esua/epdc/service/impl/UserServiceImpl.java | 12 ++++++++---- 4 files changed, 24 insertions(+), 5 deletions(-) diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-client/src/main/java/com/elink/esua/epdc/dto/form/v2/EpdcCompleteUserInfoFormV2DTO.java b/esua-epdc/epdc-module/epdc-api/epdc-api-client/src/main/java/com/elink/esua/epdc/dto/form/v2/EpdcCompleteUserInfoFormV2DTO.java index f4094c08c..30262ad20 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-client/src/main/java/com/elink/esua/epdc/dto/form/v2/EpdcCompleteUserInfoFormV2DTO.java +++ b/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; } diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/AppUserServiceImpl.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/AppUserServiceImpl.java index 77a950e27..a79a8628c 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/AppUserServiceImpl.java +++ b/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 result = completeUserInfoNormally(tokenDto, epdcCompleteUserInfoFormDTO); return result; diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/EpdcCompleteAppUserDTO.java b/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/EpdcCompleteAppUserDTO.java index b80b8dac6..30afff993 100644 --- a/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/EpdcCompleteAppUserDTO.java +++ b/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; } diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/UserServiceImpl.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/UserServiceImpl.java index cd25ce83e..fdf45f922 100644 --- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/UserServiceImpl.java +++ b/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 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 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 { //党员认证成功