elink-star
/
ShibeiWorkPlatform
12
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Merge remote-tracking branch 'remotes/origin/dev_bugfix' into dev

dev_shibei_match
jianjun 5 years ago
parent
ab0397db71 3029b6cf0e
commit
c7db4e8be5
2 changed files with 16 additions and 12 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 25
      epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/PartyMemberConfirmServiceImpl.java
  2. 3
      epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserResiInfoServiceImpl.java

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

@ -41,9 +41,8 @@ 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;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@ -58,9 +57,9 @@ import java.util.List;
* @author zhaoqifeng
* @date 2020/3/30 14:01
*/
@Slf4j
@Service
public class PartyMemberConfirmServiceImpl implements PartyMemberConfirmService {
private Logger logger = LoggerFactory.getLogger(getClass());
@Autowired
private EpmetUserFeignClient epmetUserFeignClient;
@Autowired
@ -170,7 +169,7 @@ public class PartyMemberConfirmServiceImpl implements PartyMemberConfirmService
@Override
@Transactional(rollbackFor = Exception.class)
public Result submit(PartymemberInfoDTO partyMemberInfoDTO) {
logger.info("submit param:{}",JSON.toJSONString(partyMemberInfoDTO));
log.info("submit param:{}",JSON.toJSONString(partyMemberInfoDTO));
Result result = new Result();
//校验手机验证码是否正常
@ -193,7 +192,7 @@ public class PartyMemberConfirmServiceImpl implements PartyMemberConfirmService
PartymemberInfoEntity.class);
if (confirmAutoDTO == null || !confirmAutoDTO.getComparisonResults()) {
logger.info("submit confirmAutoDTO return null or false:{}",JSON.toJSONString(confirmAutoDTO));
log.info("submit confirmAutoDTO return null or false:{}",JSON.toJSONString(confirmAutoDTO));
//将访问记录更新到热心居民申请行为记录表
saveOrUpdateVisit(partyMemberInfoDTO.getPartymemberVisitId(), null, PartyMemberConstant.OPERATE_AUTO_FAILED);
@ -208,7 +207,7 @@ public class PartyMemberConfirmServiceImpl implements PartyMemberConfirmService
result.setCode(EpmetErrorCode.AUTO_CONFIRM_FAILED.getCode());
result.setMsg(EpmetErrorCode.AUTO_CONFIRM_FAILED.getMsg());
} else {
logger.info("submit confirmAutoDTO return true, auto confirm");
log.info("submit confirmAutoDTO return true, auto confirm");
//将访问记录更新到热心居民申请行为记录表
saveOrUpdateVisit(partyMemberInfoDTO.getPartymemberVisitId(), null, PartyMemberConstant.OPERATE_AUTO_SUCCESS);
@ -217,7 +216,7 @@ public class PartyMemberConfirmServiceImpl implements PartyMemberConfirmService
if (partyMemberInfoEntity.getId().isEmpty()) {
partymemberInfoService.insert(partyMemberInfoEntity);
//记录当前居民与党员库关系，保存认证信息
logger.info(String.format("党员认证自动匹配成功,保存partymember_auth_record,userId=%s,党员库id=%s",partyMemberInfoEntity.getUserId(),confirmAutoDTO.getPatryMemberBaseInfoId()));
log.info(String.format("党员认证自动匹配成功,保存partymember_auth_record,userId=%s,党员库id=%s",partyMemberInfoEntity.getUserId(),confirmAutoDTO.getPatryMemberBaseInfoId()));
partymemberAuthRecordService.insert(partyMemberInfoEntity,confirmAutoDTO.getPatryMemberBaseInfoId());
} else {
partymemberInfoService.updateById(partyMemberInfoEntity);
@ -247,6 +246,8 @@ public class PartyMemberConfirmServiceImpl implements PartyMemberConfirmService
identityParam.setUserId(partyMemberInfoDTO.getUserId());
identityParam.setPartyFlag(NumConstant.ONE_STR);
resiGroupFeignClient.updateWhenAuditedResiRole(identityParam);
//addby jianjun 2020-07-31 之前没有成功的返回结果
result = new Result<>().ok("注册成功");
}
//将自动认证结果存入党员认证自动审核表
@ -345,7 +346,7 @@ public class PartyMemberConfirmServiceImpl implements PartyMemberConfirmService
//如果是自动匹配失败的，人工审核他是党员，需要记录党员库-居民的认证关系
PartymemberConfirmAutoDTO partymemberConfirmAutoDTO=partymemberConfirmAutoService.get(fromDTO.getAutoId());
if(partymemberConfirmAutoDTO!=null){
logger.info(String.format("自动匹配失败,人工审核是党员,保存partymember_auth_record,userId=%s,党员库id=%s",partyMemberInfoEntity.getUserId(),partymemberConfirmAutoDTO.getPatryMemberBaseInfoId()));
log.info(String.format("自动匹配失败,人工审核是党员,保存partymember_auth_record,userId=%s,党员库id=%s",partyMemberInfoEntity.getUserId(),partymemberConfirmAutoDTO.getPatryMemberBaseInfoId()));
partymemberAuthRecordService.insert(partyMemberInfoEntity,partymemberConfirmAutoDTO.getPatryMemberBaseInfoId());
}
} else {
@ -371,7 +372,7 @@ public class PartyMemberConfirmServiceImpl implements PartyMemberConfirmService
manualEntity.setReadFlag(PartyMemberConstant.READ);
partymemberConfirmManualService.updateById(manualEntity);
}else{
logger.error(String.format("入参%s,查询partymember_confirm_manual为空", JSON.toJSONString(fromDTO)));
log.error(String.format("入参%s,查询partymember_confirm_manual为空", JSON.toJSONString(fromDTO)));
throw new RenException("数据异常,根据manualId查询partymember_confirm_manual为空");
}
@ -551,7 +552,7 @@ public class PartyMemberConfirmServiceImpl implements PartyMemberConfirmService
* @param partyMemberInfoDTO 参数
*/
private void isResiRegister(PartymemberInfoDTO partyMemberInfoDTO) {
logger.info("isResiRegister param:{}",JSON.toJSONString(partyMemberInfoDTO));
log.info("isResiRegister param:{}",JSON.toJSONString(partyMemberInfoDTO));
UserResiInfoFormDTO userResiInfoFormDTO = new UserResiInfoFormDTO();
userResiInfoFormDTO.setCustomerId(partyMemberInfoDTO.getCustomerId());
userResiInfoFormDTO.setUserId(partyMemberInfoDTO.getUserId());
@ -564,12 +565,12 @@ public class PartyMemberConfirmServiceImpl implements PartyMemberConfirmService
userResiInfoDTO.setBuildingAddress(partyMemberInfoDTO.getBuilding());
userResiInfoDTO.setCustomerId(partyMemberInfoDTO.getCustomerId());
Result result = epmetUserFeignClient.saveResiInfo(userResiInfoDTO);
logger.info("isResiRegister epmetUserFeignClient.saveResiInfo result:{}",JSON.toJSONString(result));
log.info("isResiRegister epmetUserFeignClient.saveResiInfo result:{}",JSON.toJSONString(result));
if (!result.success()){
throw new RenException(EpmetErrorCode.SERVER_ERROR.getCode(),EpmetErrorCode.SERVER_ERROR.getMsg());
}
}else{
logger.info("isResiRegister partyMember have registered resi，userId:{}",partyMemberInfoDTO.getUserId());
log.info("isResiRegister partyMember have registered resi，userId:{}",partyMemberInfoDTO.getUserId());
}
}

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

@ -17,6 +17,7 @@
package com.epmet.service.impl;
import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.epmet.common.token.util.UserUtil;
@ -264,6 +265,8 @@ public class UserResiInfoServiceImpl extends BaseServiceImpl<UserResiInfoDao, Us
userRoleService.saveUserRole(userRole);*/
//更新该用户在该客户下的注册状态
userCustomerDao.updateRegistered(userResiInfoDTO.getCustomerId(), userResiInfoDTO.getUserId());
}else{
log.error("手机号客户内不可用，没有更新用户信息，param:{}", JSON.toJSONString(userResiInfoDTO));
}
return result;

Write Preview
Loading…
Cancel
Save