Merge remote-tracking branch 'remotes/origin/dev_more_appid' into dev_heart

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

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

@@ -172,6 +172,7 @@ public class PartyMemberConfirmServiceImpl implements PartyMemberConfirmService
 	@Override
 	@Transactional(rollbackFor = Exception.class)
 	public Result submit(PartymemberInfoDTO partyMemberInfoDTO) {
+		log.debug("submit param:{}",JSON.toJSONString(partyMemberInfoDTO));
 		Result result = new Result();
 
 		//校验手机验证码是否正常
@@ -194,6 +195,7 @@ public class PartyMemberConfirmServiceImpl implements PartyMemberConfirmService
 				PartymemberInfoEntity.class);
 
 		if (confirmAutoDTO == null || !confirmAutoDTO.getComparisonResults()) {
+			log.debug("submit confirmAutoDTO return null or false:{}",JSON.toJSONString(confirmAutoDTO));
 			//将访问记录更新到热心居民申请行为记录表
 			saveOrUpdateVisit(partyMemberInfoDTO.getPartymemberVisitId(), null, PartyMemberConstant.OPERATE_AUTO_FAILED);
 
@@ -208,6 +210,7 @@ public class PartyMemberConfirmServiceImpl implements PartyMemberConfirmService
 			result.setCode(EpmetErrorCode.AUTO_CONFIRM_FAILED.getCode());
 			result.setMsg(EpmetErrorCode.AUTO_CONFIRM_FAILED.getMsg());
 		} else {
+			log.debug("submit confirmAutoDTO return true, auto confirm");
 			//将访问记录更新到热心居民申请行为记录表
 			saveOrUpdateVisit(partyMemberInfoDTO.getPartymemberVisitId(), null, PartyMemberConstant.OPERATE_AUTO_SUCCESS);
 
@@ -550,17 +553,25 @@ public class PartyMemberConfirmServiceImpl implements PartyMemberConfirmService
 	 * @param partyMemberInfoDTO 参数
 	 */
 	private void isResiRegister(PartymemberInfoDTO partyMemberInfoDTO) {
+		log.debug("isResiRegister param:{}",JSON.toJSONString(partyMemberInfoDTO));
 		UserResiInfoFormDTO userResiInfoFormDTO = new UserResiInfoFormDTO();
 		userResiInfoFormDTO.setCustomerId(partyMemberInfoDTO.getCustomerId());
 		userResiInfoFormDTO.setUserId(partyMemberInfoDTO.getUserId());
 		Result<UserResiInfoResultDTO> userResiInfoResult = epmetUserFeignClient.getUserResiInfoDTO(userResiInfoFormDTO);
-		if (null == userResiInfoResult.getData()) {
+		if (userResiInfoResult.success() && null == userResiInfoResult.getData()) {
 			UserResiInfoDTO userResiInfoDTO = ConvertUtils.sourceToTarget(partyMemberInfoDTO, UserResiInfoDTO.class);
 			userResiInfoDTO.setRegMobile(partyMemberInfoDTO.getMobile());
 			userResiInfoDTO.setResiVisitId(partyMemberInfoDTO.getPartymemberVisitId());
 			userResiInfoDTO.setDistrict(partyMemberInfoDTO.getEstate());
 			userResiInfoDTO.setBuildingAddress(partyMemberInfoDTO.getBuilding());
-			epmetUserFeignClient.saveResiInfo(userResiInfoDTO);
+			userResiInfoDTO.setCustomerId(partyMemberInfoDTO.getCustomerId());
+			Result result = epmetUserFeignClient.saveResiInfo(userResiInfoDTO);
+			log.debug("isResiRegister epmetUserFeignClient.saveResiInfo result:{}",JSON.toJSONString(result));
+			if (!result.success()){
+				throw new RenException(EpmetErrorCode.SERVER_ERROR.getCode(),EpmetErrorCode.SERVER_ERROR.getMsg());
+			}
+		}else{
+			log.debug("isResiRegister partyMember have registered resi，userId:{}",partyMemberInfoDTO.getUserId());
 		}
 	}