From e1cb47e907bcbeef5ec8e947af2d2f2b6635d89f Mon Sep 17 00:00:00 2001 From: jianjun Date: Thu, 30 Jul 2020 22:56:21 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AE=A4=E8=AF=81=E5=85=9A=E5=91=98=E9=80=BB?= =?UTF-8?q?=E8=BE=91=E6=B7=BB=E5=8A=A0=E6=97=A5=E5=BF=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/PartyMemberConfirmServiceImpl.java | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/PartyMemberConfirmServiceImpl.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/PartyMemberConfirmServiceImpl.java index 0b5acdf437..5d2a6b8b01 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/PartyMemberConfirmServiceImpl.java +++ b/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); @@ -540,18 +543,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 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()); userResiInfoDTO.setCustomerId(partyMemberInfoDTO.getCustomerId()); - epmetUserFeignClient.saveResiInfo(userResiInfoDTO); + 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()); } }