认证党员初始化时/resi/mine/resiregister/submit返回idCard

epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/PartyMemberConfirmServiceImpl.java

@@ -114,17 +114,20 @@ public class PartyMemberConfirmServiceImpl implements PartyMemberConfirmService
 			UserResiInfoFormDTO userResiInfoFormDTO = new UserResiInfoFormDTO();
 			userResiInfoFormDTO.setCustomerId(fromDto.getCustomerId());
 			userResiInfoFormDTO.setUserId(fromDto.getUserId());
-			UserResiInfoResultDTO userResiInfoResult = epmetUserFeignClient.getUserResiInfoDTO(userResiInfoFormDTO).getData();
-			if (null != userResiInfoResult) {
-				PartymemberInfoDTO partyMemberInfo = ConvertUtils.sourceToTarget(userResiInfoResult,
-						PartymemberInfoDTO.class);
-				partyMemberInfo.setId("");
-				partyMemberInfo.setMobile(userResiInfoResult.getRegMobile());
-				partyMemberInfo.setEstate(userResiInfoResult.getDistrict());
-				partyMemberInfo.setBuilding(userResiInfoResult.getBuildingAddress());
-				result.setPartyMemberInfo(partyMemberInfo);
+			Result<UserResiInfoResultDTO> res = epmetUserFeignClient.getUserResiInfoDTO(userResiInfoFormDTO);
+			if (res.success() && null != res) {
+				UserResiInfoResultDTO userResiInfoResult = res.getData();
+				if (null != userResiInfoResult) {
+					PartymemberInfoDTO partyMemberInfo = ConvertUtils.sourceToTarget(userResiInfoResult,
+							PartymemberInfoDTO.class);
+					partyMemberInfo.setId("");
+					partyMemberInfo.setMobile(userResiInfoResult.getRegMobile());
+					partyMemberInfo.setEstate(userResiInfoResult.getDistrict());
+					partyMemberInfo.setBuilding(userResiInfoResult.getBuildingAddress());
+					partyMemberInfo.setIdCard(userResiInfoResult.getIdNum());
+					result.setPartyMemberInfo(partyMemberInfo);
+				}
 			}
-
 		}
 		// 将访问行为存入热心居民申请行为记录表
 		String visitId = saveOrUpdateVisit(null, fromDto, PartyMemberConstant.OPERATE_INITIALIZE);

epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/UserResiInfoResultDTO.java

@@ -59,4 +59,8 @@ public class UserResiInfoResultDTO implements Serializable {
 
 	private String nickName;
 	private String realName;
+	/**
+	 * 身份证号
+	 */
+	private String idNum;
 }

epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserResiInfoServiceImpl.java

@@ -186,6 +186,7 @@ public class UserResiInfoServiceImpl extends BaseServiceImpl<UserResiInfoDao, Us
 			resultDTO.setBuildingAddress(userBaseInfoResultDTO.getBuildingAddress());
 			resultDTO.setNickName(userBaseInfoResultDTO.getNickname());
 			resultDTO.setShowName(StrConstant.EPMETY_STR);
+			resultDTO.setIdNum(userBaseInfoResultDTO.getIdNum());
 			if (StringUtils.isNotBlank(userBaseInfoResultDTO.getSurname())){
 				String gender;
 				if (NumConstant.ONE_STR.equals(userBaseInfoResultDTO.getGender())) {