|
@ -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.dto.epdc.result.EpdcWorkUserResultDTO; |
|
|
import com.elink.esua.epdc.enums.AppUserAuditStateEnum; |
|
|
import com.elink.esua.epdc.enums.AppUserAuditStateEnum; |
|
|
import com.elink.esua.epdc.enums.AppUserStatesEnum; |
|
|
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.feign.AdminFeignClient; |
|
|
import com.elink.esua.epdc.service.UserGridRelationService; |
|
|
import com.elink.esua.epdc.service.UserGridRelationService; |
|
|
import com.elink.esua.epdc.service.UserInvitationRecordService; |
|
|
import com.elink.esua.epdc.service.UserInvitationRecordService; |
|
@ -502,6 +503,7 @@ public class UserServiceImpl extends BaseServiceImpl<UserDao, UserEntity> implem |
|
|
@Override |
|
|
@Override |
|
|
@Transactional(rollbackFor = Exception.class) |
|
|
@Transactional(rollbackFor = Exception.class) |
|
|
public Result<UserDTO> completeUserInfo(EpdcAppUserCompleteInfoFormDTO formDto) { |
|
|
public Result<UserDTO> completeUserInfo(EpdcAppUserCompleteInfoFormDTO formDto) { |
|
|
|
|
|
Result result = new Result(); |
|
|
EpdcCompleteAppUserDTO completeAppUser = formDto.getCompleteAppUser(); |
|
|
EpdcCompleteAppUserDTO completeAppUser = formDto.getCompleteAppUser(); |
|
|
|
|
|
|
|
|
UserDTO userDto = ConvertUtils.sourceToTarget(completeAppUser, UserDTO.class); |
|
|
UserDTO userDto = ConvertUtils.sourceToTarget(completeAppUser, UserDTO.class); |
|
@ -551,6 +553,8 @@ public class UserServiceImpl extends BaseServiceImpl<UserDao, UserEntity> implem |
|
|
userDto.setState(AppUserStatesEnum.STATE_COMPLETED_INFORMATION_PENDING_REVIEW.value()); |
|
|
userDto.setState(AppUserStatesEnum.STATE_COMPLETED_INFORMATION_PENDING_REVIEW.value()); |
|
|
userDto.setPartyFlag(YesOrNoEnum.NO.value());//是否是党员(0-否,1-是) 认证失败:0
|
|
|
userDto.setPartyFlag(YesOrNoEnum.NO.value());//是否是党员(0-否,1-是) 认证失败:0
|
|
|
userAuthenticateHistoryEntity.setAuthenticatedFlag(YesOrNoEnum.NO.value()); |
|
|
userAuthenticateHistoryEntity.setAuthenticatedFlag(YesOrNoEnum.NO.value()); |
|
|
|
|
|
// 党员认证失败返回code码
|
|
|
|
|
|
result.error(UserModuleErrorCode.AUTHENTICATION_CODE); |
|
|
} else { |
|
|
} else { |
|
|
UpdateWrapper<PartyMembersEntity> partyUpdate = new UpdateWrapper<>(); |
|
|
UpdateWrapper<PartyMembersEntity> partyUpdate = new UpdateWrapper<>(); |
|
|
partyUpdate.eq(UserFieldConsant.IDENTITY_NO, identityNo) |
|
|
partyUpdate.eq(UserFieldConsant.IDENTITY_NO, identityNo) |
|
@ -600,7 +604,7 @@ public class UserServiceImpl extends BaseServiceImpl<UserDao, UserEntity> implem |
|
|
UserGridRelationDTO relationInfo = userGridRelationService.getUserRelationInfo(userEntity.getId(), userGridRelation.getGridId()); |
|
|
UserGridRelationDTO relationInfo = userGridRelationService.getUserRelationInfo(userEntity.getId(), userGridRelation.getGridId()); |
|
|
userDto.setLeaderFlag(relationInfo.getLeaderFlag()); |
|
|
userDto.setLeaderFlag(relationInfo.getLeaderFlag()); |
|
|
userDto.setFaceImg(oldEntity.getFaceImg()); |
|
|
userDto.setFaceImg(oldEntity.getFaceImg()); |
|
|
return new Result().ok(userDto); |
|
|
return result.ok(userDto); |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
/** |
|
|
/** |
|
|