diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/exception/UserModuleErrorCode.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/exception/UserModuleErrorCode.java new file mode 100644 index 000000000..02ae133b1 --- /dev/null +++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/exception/UserModuleErrorCode.java @@ -0,0 +1,16 @@ +package com.elink.esua.epdc.exception; + +import com.elink.esua.epdc.commons.tools.exception.ErrorCode; + +/** + * @author: qushutong + * @Date: 2020/1/3 17:31 + * @Description: + */ +public interface UserModuleErrorCode extends ErrorCode { + + /*** + * 党员认证失败 + */ + int AUTHENTICATION_CODE= 100006001; +} 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 ea183d266..2e96a4e9a 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 @@ -56,6 +56,7 @@ import com.elink.esua.epdc.dto.epdc.result.EpdcUserRegisterAuditMsgResultDTO; import com.elink.esua.epdc.dto.epdc.result.EpdcWorkUserResultDTO; import com.elink.esua.epdc.enums.AppUserAuditStateEnum; import com.elink.esua.epdc.enums.AppUserStatesEnum; +import com.elink.esua.epdc.exception.UserModuleErrorCode; import com.elink.esua.epdc.feign.AdminFeignClient; import com.elink.esua.epdc.service.UserGridRelationService; import com.elink.esua.epdc.service.UserInvitationRecordService; @@ -502,6 +503,7 @@ public class UserServiceImpl extends BaseServiceImpl implem @Override @Transactional(rollbackFor = Exception.class) public Result completeUserInfo(EpdcAppUserCompleteInfoFormDTO formDto) { + Result result = new Result(); EpdcCompleteAppUserDTO completeAppUser = formDto.getCompleteAppUser(); UserDTO userDto = ConvertUtils.sourceToTarget(completeAppUser, UserDTO.class); @@ -551,6 +553,8 @@ public class UserServiceImpl extends BaseServiceImpl implem userDto.setState(AppUserStatesEnum.STATE_COMPLETED_INFORMATION_PENDING_REVIEW.value()); userDto.setPartyFlag(YesOrNoEnum.NO.value());//是否是党员(0-否,1-是) 认证失败:0 userAuthenticateHistoryEntity.setAuthenticatedFlag(YesOrNoEnum.NO.value()); + // 党员认证失败返回code码 + result.error(UserModuleErrorCode.AUTHENTICATION_CODE); } else { UpdateWrapper partyUpdate = new UpdateWrapper<>(); partyUpdate.eq(UserFieldConsant.IDENTITY_NO, identityNo) @@ -600,7 +604,7 @@ public class UserServiceImpl extends BaseServiceImpl implem UserGridRelationDTO relationInfo = userGridRelationService.getUserRelationInfo(userEntity.getId(), userGridRelation.getGridId()); userDto.setLeaderFlag(relationInfo.getLeaderFlag()); userDto.setFaceImg(oldEntity.getFaceImg()); - return new Result().ok(userDto); + return result.ok(userDto); } /** diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/i18n/messages.properties b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/i18n/messages.properties index e69de29bb..5eb4f45e8 100644 --- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/i18n/messages.properties +++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/i18n/messages.properties @@ -0,0 +1,2 @@ +#Default +100006001=Ա֤ʧ \ No newline at end of file