|  |  | @ -41,7 +41,6 @@ import com.epmet.resi.partymember.dto.partymember.result.AdditionalInfoDTO; | 
			
		
	
		
			
				
					|  |  |  | import com.epmet.resi.partymember.dto.partymember.result.AuditingDetailResultDTO; | 
			
		
	
		
			
				
					|  |  |  | import com.epmet.resi.partymember.dto.partymember.result.AutoFailedDetailResultDTO; | 
			
		
	
		
			
				
					|  |  |  | import com.epmet.resi.partymember.dto.partymember.result.RejectedDetailResultDTO; | 
			
		
	
		
			
				
					|  |  |  | import lombok.extern.slf4j.Slf4j; | 
			
		
	
		
			
				
					|  |  |  | import org.apache.commons.lang3.StringUtils; | 
			
		
	
		
			
				
					|  |  |  | import org.slf4j.Logger; | 
			
		
	
		
			
				
					|  |  |  | import org.slf4j.LoggerFactory; | 
			
		
	
	
		
			
				
					|  |  | @ -60,7 +59,6 @@ import java.util.List; | 
			
		
	
		
			
				
					|  |  |  |  * @date 2020/3/30 14:01 | 
			
		
	
		
			
				
					|  |  |  |  */ | 
			
		
	
		
			
				
					|  |  |  | @Service | 
			
		
	
		
			
				
					|  |  |  | @Slf4j | 
			
		
	
		
			
				
					|  |  |  | public class PartyMemberConfirmServiceImpl implements PartyMemberConfirmService { | 
			
		
	
		
			
				
					|  |  |  | 	private Logger logger = LoggerFactory.getLogger(getClass()); | 
			
		
	
		
			
				
					|  |  |  | 	@Autowired | 
			
		
	
	
		
			
				
					|  |  | @ -172,7 +170,7 @@ public class PartyMemberConfirmServiceImpl implements PartyMemberConfirmService | 
			
		
	
		
			
				
					|  |  |  | 	@Override | 
			
		
	
		
			
				
					|  |  |  | 	@Transactional(rollbackFor = Exception.class) | 
			
		
	
		
			
				
					|  |  |  | 	public Result submit(PartymemberInfoDTO partyMemberInfoDTO) { | 
			
		
	
		
			
				
					|  |  |  | 		log.debug("submit param:{}",JSON.toJSONString(partyMemberInfoDTO)); | 
			
		
	
		
			
				
					|  |  |  | 		logger.info("submit param:{}",JSON.toJSONString(partyMemberInfoDTO)); | 
			
		
	
		
			
				
					|  |  |  | 		Result result = new Result(); | 
			
		
	
		
			
				
					|  |  |  | 
 | 
			
		
	
		
			
				
					|  |  |  | 		//校验手机验证码是否正常
 | 
			
		
	
	
		
			
				
					|  |  | @ -195,7 +193,7 @@ public class PartyMemberConfirmServiceImpl implements PartyMemberConfirmService | 
			
		
	
		
			
				
					|  |  |  | 				PartymemberInfoEntity.class); | 
			
		
	
		
			
				
					|  |  |  | 
 | 
			
		
	
		
			
				
					|  |  |  | 		if (confirmAutoDTO == null || !confirmAutoDTO.getComparisonResults()) { | 
			
		
	
		
			
				
					|  |  |  | 			log.debug("submit confirmAutoDTO return null or false:{}",JSON.toJSONString(confirmAutoDTO)); | 
			
		
	
		
			
				
					|  |  |  | 			logger.info("submit confirmAutoDTO return null or false:{}",JSON.toJSONString(confirmAutoDTO)); | 
			
		
	
		
			
				
					|  |  |  | 			//将访问记录更新到热心居民申请行为记录表
 | 
			
		
	
		
			
				
					|  |  |  | 			saveOrUpdateVisit(partyMemberInfoDTO.getPartymemberVisitId(), null, PartyMemberConstant.OPERATE_AUTO_FAILED); | 
			
		
	
		
			
				
					|  |  |  | 
 | 
			
		
	
	
		
			
				
					|  |  | @ -210,7 +208,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"); | 
			
		
	
		
			
				
					|  |  |  | 			logger.info("submit confirmAutoDTO return true, auto confirm"); | 
			
		
	
		
			
				
					|  |  |  | 			//将访问记录更新到热心居民申请行为记录表
 | 
			
		
	
		
			
				
					|  |  |  | 			saveOrUpdateVisit(partyMemberInfoDTO.getPartymemberVisitId(), null, PartyMemberConstant.OPERATE_AUTO_SUCCESS); | 
			
		
	
		
			
				
					|  |  |  | 
 | 
			
		
	
	
		
			
				
					|  |  | @ -553,7 +551,7 @@ public class PartyMemberConfirmServiceImpl implements PartyMemberConfirmService | 
			
		
	
		
			
				
					|  |  |  | 	 * @param partyMemberInfoDTO 参数 | 
			
		
	
		
			
				
					|  |  |  | 	 */ | 
			
		
	
		
			
				
					|  |  |  | 	private void isResiRegister(PartymemberInfoDTO partyMemberInfoDTO) { | 
			
		
	
		
			
				
					|  |  |  | 		log.debug("isResiRegister param:{}",JSON.toJSONString(partyMemberInfoDTO)); | 
			
		
	
		
			
				
					|  |  |  | 		logger.info("isResiRegister param:{}",JSON.toJSONString(partyMemberInfoDTO)); | 
			
		
	
		
			
				
					|  |  |  | 		UserResiInfoFormDTO userResiInfoFormDTO = new UserResiInfoFormDTO(); | 
			
		
	
		
			
				
					|  |  |  | 		userResiInfoFormDTO.setCustomerId(partyMemberInfoDTO.getCustomerId()); | 
			
		
	
		
			
				
					|  |  |  | 		userResiInfoFormDTO.setUserId(partyMemberInfoDTO.getUserId()); | 
			
		
	
	
		
			
				
					|  |  | @ -566,12 +564,12 @@ public class PartyMemberConfirmServiceImpl implements PartyMemberConfirmService | 
			
		
	
		
			
				
					|  |  |  | 			userResiInfoDTO.setBuildingAddress(partyMemberInfoDTO.getBuilding()); | 
			
		
	
		
			
				
					|  |  |  | 			userResiInfoDTO.setCustomerId(partyMemberInfoDTO.getCustomerId()); | 
			
		
	
		
			
				
					|  |  |  | 			Result result = epmetUserFeignClient.saveResiInfo(userResiInfoDTO); | 
			
		
	
		
			
				
					|  |  |  | 			log.debug("isResiRegister epmetUserFeignClient.saveResiInfo result:{}",JSON.toJSONString(result)); | 
			
		
	
		
			
				
					|  |  |  | 			logger.info("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()); | 
			
		
	
		
			
				
					|  |  |  | 			logger.info("isResiRegister partyMember have registered resi,userId:{}",partyMemberInfoDTO.getUserId()); | 
			
		
	
		
			
				
					|  |  |  | 		} | 
			
		
	
		
			
				
					|  |  |  | 	} | 
			
		
	
		
			
				
					|  |  |  | 
 | 
			
		
	
	
		
			
				
					|  |  | 
 |