|
|
|
@ -18,6 +18,7 @@ import com.epmet.resi.mine.dto.from.PartyMemberInitFromDTO; |
|
|
|
import com.epmet.resi.mine.dto.from.VerificationCodeFromDTO; |
|
|
|
import com.epmet.resi.mine.dto.result.PartyMemberInitResultDTO; |
|
|
|
import com.epmet.resi.partymember.dto.partymember.PartymemberConfirmAutoDTO; |
|
|
|
import com.epmet.resi.partymember.dto.partymember.PartymemberConfirmManualDTO; |
|
|
|
import com.epmet.resi.partymember.dto.partymember.PartymemberInfoDTO; |
|
|
|
import lombok.extern.slf4j.Slf4j; |
|
|
|
import org.springframework.beans.factory.annotation.Autowired; |
|
|
|
@ -81,8 +82,9 @@ public class PartyMemberConfirmServiceImpl implements PartyMemberConfirmService |
|
|
|
userResiInfoFormDTO.setUserId(fromDto.getUserId()); |
|
|
|
UserResiInfoResultDTO userResiInfoResult = epmetUserFeignClient.getUserResiInfoDTO(userResiInfoFormDTO).getData(); |
|
|
|
if (null != userResiInfoResult) { |
|
|
|
PartymemberInfoDTO partyMemberInfo = ConvertUtils.sourceToTarget(userResiInfoResult, |
|
|
|
PartymemberInfoDTO partyMemberInfo = ConvertUtils.sourceToTarget(userResiInfoResult, |
|
|
|
PartymemberInfoDTO.class); |
|
|
|
partyMemberInfo.setId(""); |
|
|
|
partyMemberInfo.setMobile(userResiInfoResult.getRegMobile()); |
|
|
|
partyMemberInfo.setEstate(userResiInfoResult.getDistrict()); |
|
|
|
partyMemberInfo.setBuilding(userResiInfoResult.getBuildingAddress()); |
|
|
|
@ -108,16 +110,16 @@ public class PartyMemberConfirmServiceImpl implements PartyMemberConfirmService |
|
|
|
partyMemberInfoParam.setCustomerId(fromDTO.getCustomerId()); |
|
|
|
PartymemberInfoDTO partyMemberInfoResult = partymemberInfoService.getPartyMemberInfoByMobile(partyMemberInfoParam); |
|
|
|
if (null != partyMemberInfoResult) { |
|
|
|
result.setCode(EpmetErrorCode.MOBILE_HAS_BEEN_USED.getValue()); |
|
|
|
result.setMsg(EpmetErrorCode.MOBILE_HAS_BEEN_USED.getName()); |
|
|
|
result.setCode(EpmetErrorCode.MOBILE_HAS_BEEN_USED.getCode()); |
|
|
|
result.setMsg(EpmetErrorCode.MOBILE_HAS_BEEN_USED.getMsg()); |
|
|
|
return result; |
|
|
|
} |
|
|
|
|
|
|
|
//生成短信验证码
|
|
|
|
Map<String, String> message = (Map<String, String>) messageFeignClient.sendSmsCaptcha(fromDTO.getMobile()).getData(); |
|
|
|
if(null == message) { |
|
|
|
result.setCode(EpmetErrorCode.MOBILE_GET_CODE_ERROR.getValue()); |
|
|
|
result.setMsg(EpmetErrorCode.MOBILE_GET_CODE_ERROR.getName()); |
|
|
|
if (null == message) { |
|
|
|
result.setCode(EpmetErrorCode.MOBILE_GET_CODE_ERROR.getCode()); |
|
|
|
result.setMsg(EpmetErrorCode.MOBILE_GET_CODE_ERROR.getMsg()); |
|
|
|
return result; |
|
|
|
} |
|
|
|
//删除旧验证码
|
|
|
|
@ -144,8 +146,8 @@ public class PartyMemberConfirmServiceImpl implements PartyMemberConfirmService |
|
|
|
if (null == code) { |
|
|
|
saveOrUpdateVisit(partyMemberInfoDTO.getPartymemberVisitId(), null, |
|
|
|
PartyMemberConstant.OPERATE_AUTO_FAILED); |
|
|
|
result.setCode(EpmetErrorCode.MOBILE_CODE_ERROR.getValue()); |
|
|
|
result.setMsg(EpmetErrorCode.MOBILE_CODE_ERROR.getName()); |
|
|
|
result.setCode(EpmetErrorCode.MOBILE_CODE_ERROR.getCode()); |
|
|
|
result.setMsg(EpmetErrorCode.MOBILE_CODE_ERROR.getMsg()); |
|
|
|
return result; |
|
|
|
} |
|
|
|
|
|
|
|
@ -157,23 +159,32 @@ public class PartyMemberConfirmServiceImpl implements PartyMemberConfirmService |
|
|
|
PartymemberInfoEntity partyMemberInfoEntity = ConvertUtils.sourceToTarget(partyMemberInfoDTO, |
|
|
|
PartymemberInfoEntity.class); |
|
|
|
|
|
|
|
if (confirmAutoDTO == null || confirmAutoDTO.getResult().compareTo(PartyMemberConstant.BENCHMARK) < 0) { |
|
|
|
if (confirmAutoDTO == null || (confirmAutoDTO.getResult().compareTo(PartyMemberConstant.BENCHMARK) < 0 && !confirmAutoDTO.getComparisonResults())) { |
|
|
|
//将访问记录更新到热心居民申请行为记录表
|
|
|
|
saveOrUpdateVisit(partyMemberInfoDTO.getPartymemberVisitId(), null, PartyMemberConstant.OPERATE_AUTO_FAILED); |
|
|
|
|
|
|
|
//自动认证失败
|
|
|
|
partyMemberInfoEntity.setConfirmResult("1"); |
|
|
|
partymemberInfoService.insert(partyMemberInfoEntity); |
|
|
|
if (partyMemberInfoEntity.getId().isEmpty()) { |
|
|
|
partymemberInfoService.insert(partyMemberInfoEntity); |
|
|
|
} else { |
|
|
|
partymemberInfoService.updateById(partyMemberInfoEntity); |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
result.setCode(EpmetErrorCode.AUTO_CONFIRM_FAILED.getValue()); |
|
|
|
result.setMsg(EpmetErrorCode.AUTO_CONFIRM_FAILED.getName()); |
|
|
|
result.setCode(EpmetErrorCode.AUTO_CONFIRM_FAILED.getCode()); |
|
|
|
result.setMsg(EpmetErrorCode.AUTO_CONFIRM_FAILED.getMsg()); |
|
|
|
} else { |
|
|
|
//将访问记录更新到热心居民申请行为记录表
|
|
|
|
saveOrUpdateVisit(partyMemberInfoDTO.getPartymemberVisitId(), null, PartyMemberConstant.OPERATE_AUTO_SUCCESS); |
|
|
|
|
|
|
|
//自动认证成功
|
|
|
|
partyMemberInfoEntity.setConfirmResult("0"); |
|
|
|
partymemberInfoService.insert(partyMemberInfoEntity); |
|
|
|
if (partyMemberInfoEntity.getId().isEmpty()) { |
|
|
|
partymemberInfoService.insert(partyMemberInfoEntity); |
|
|
|
} else { |
|
|
|
partymemberInfoService.updateById(partyMemberInfoEntity); |
|
|
|
} |
|
|
|
|
|
|
|
//添加用户党员角色关系
|
|
|
|
UserRoleDTO userRole = new UserRoleDTO(); |
|
|
|
@ -188,9 +199,17 @@ public class PartyMemberConfirmServiceImpl implements PartyMemberConfirmService |
|
|
|
|
|
|
|
//将自动认证结果存入党员认证自动审核表
|
|
|
|
if (confirmAutoDTO != null) { |
|
|
|
PartymemberConfirmAutoDTO partymemberConfirmAutoDTO = |
|
|
|
partymemberConfirmAutoService.getInfoByPartyMemberInfoId(partyMemberInfoEntity.getPartymemberVisitId()); |
|
|
|
confirmAutoDTO.setPartymemberInfoId(partyMemberInfoEntity.getPartymemberVisitId()); |
|
|
|
partymemberConfirmAutoService.insert(ConvertUtils.sourceToTarget(confirmAutoDTO, |
|
|
|
PartymemberConfirmAutoEntity.class)); |
|
|
|
if (null == partymemberConfirmAutoDTO) { |
|
|
|
partymemberConfirmAutoService.insert(ConvertUtils.sourceToTarget(confirmAutoDTO, |
|
|
|
PartymemberConfirmAutoEntity.class)); |
|
|
|
} else { |
|
|
|
confirmAutoDTO.setId(partymemberConfirmAutoDTO.getId()); |
|
|
|
partymemberConfirmAutoService.updateById(ConvertUtils.sourceToTarget(confirmAutoDTO, |
|
|
|
PartymemberConfirmAutoEntity.class)); |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
//判断是否已注册居民，如果没有则注册居民
|
|
|
|
@ -209,15 +228,20 @@ public class PartyMemberConfirmServiceImpl implements PartyMemberConfirmService |
|
|
|
PartymemberInfoDTO partyMemberInfo = partymemberInfoService.getPartyMemberInfo(infoDTO); |
|
|
|
infoDTO.setId(partyMemberInfo.getId()); |
|
|
|
partymemberInfoService.updateById(ConvertUtils.sourceToTarget(infoDTO, PartymemberInfoEntity.class)); |
|
|
|
PartymemberConfirmManualDTO partymemberConfirmManualDTO = |
|
|
|
partymemberConfirmManualService.getInfoByPartyMemberInfoId(partyMemberInfo.getId()); |
|
|
|
|
|
|
|
if (null == partymemberConfirmManualDTO) { |
|
|
|
//待审核数据存入党员认证人工审核表
|
|
|
|
PartymemberConfirmManualEntity manualEntity = new PartymemberConfirmManualEntity(); |
|
|
|
manualEntity.setCustomerId(infoDTO.getCustomerId()); |
|
|
|
manualEntity.setGridId(infoDTO.getGridId()); |
|
|
|
manualEntity.setUserId(infoDTO.getUserId()); |
|
|
|
manualEntity.setPartymemberInfoId(infoDTO.getId()); |
|
|
|
manualEntity.setAuditStatus(PartyMemberConstant.UNDER_AUDITTING); |
|
|
|
partymemberConfirmManualService.insert(manualEntity); |
|
|
|
} |
|
|
|
|
|
|
|
//待审核数据存入党员认证人工审核表
|
|
|
|
PartymemberConfirmManualEntity manualEntity = new PartymemberConfirmManualEntity(); |
|
|
|
manualEntity.setCustomerId(infoDTO.getCustomerId()); |
|
|
|
manualEntity.setGridId(infoDTO.getGridId()); |
|
|
|
manualEntity.setUserId(infoDTO.getUserId()); |
|
|
|
manualEntity.setPartymemberInfoId(infoDTO.getId()); |
|
|
|
manualEntity.setAuditStatus(PartyMemberConstant.UNDER_AUDITTING); |
|
|
|
partymemberConfirmManualService.insert(manualEntity); |
|
|
|
|
|
|
|
return new Result(); |
|
|
|
} |
|
|
|
|
wangchao
5 years ago