相关方用户第一次注册问题
parent
497098a55f
commit
e21f581599
|
|
@ -282,16 +282,17 @@ public class UserAddExe {
|
|||
}
|
||||
|
||||
UserE userE = new UserE();
|
||||
|
||||
UserExpandInfoDO userExpandInfoDO = userExpandInfoRepository.getInfoByPhone(userDO.getPhone());
|
||||
if (userDO.getCorpinfoId() == null) {
|
||||
BeanUtils.copyProperties(cmd, userE);
|
||||
|
||||
// user表状态变为入职待审核
|
||||
userE.setEmploymentFlag(UserEmploymentFlagEnum.ENTRY_AUDIT.getCode());
|
||||
userE.setFlowFlag(userExpandInfoDO.getFlowFlag());
|
||||
userGateway.update(userE);
|
||||
} else {
|
||||
// 用户有企业id
|
||||
UserExpandInfoDO userExpandInfoDO = userExpandInfoRepository.getInfoByPhone(userDO.getPhone());
|
||||
|
||||
Integer flowFlag = userExpandInfoDO.getFlowFlag();
|
||||
if (UserFlowFlagEnum.FIXED.getCode().equals(flowFlag)) {
|
||||
// 固定用户
|
||||
|
|
|
|||
|
|
@ -242,7 +242,9 @@ public class UserQueryExe {
|
|||
//判断用户信息是否完善
|
||||
UserE userCheck = new UserE();
|
||||
BeanUtils.copyProperties(userDO, userCheck);
|
||||
Boolean b = userCheck.checkUserInfoComplete(userCheck);
|
||||
UserExpandInfoDO userExpandInfoDO = userExpandInfoRepository.getInfoByPhone(userDO.getPhone());
|
||||
Boolean b = userCheck.checkUserInfoComplete(userCheck,userExpandInfoDO.getFlowFlag());
|
||||
|
||||
userLoginCO.setIsInfoComplete(b);
|
||||
|
||||
List<Long> userIds = userDOList.stream().map(UserDO::getId).collect(Collectors.toList());
|
||||
|
|
|
|||
|
|
@ -161,11 +161,11 @@ public class UserE extends BaseE {
|
|||
// 微信openid
|
||||
private String openId;
|
||||
|
||||
public static Boolean checkUserInfoComplete(UserE userE) {
|
||||
public static Boolean checkUserInfoComplete(UserE userE, Integer flowFlag) {
|
||||
return StringUtils.isNotEmpty(userE.getUsername()) &&
|
||||
StringUtils.isNotEmpty(userE.getPhone()) &&
|
||||
StringUtils.isNotEmpty(userE.getUserIdCard()) &&
|
||||
userE.getFlowFlag() != null;
|
||||
flowFlag != null;
|
||||
}
|
||||
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue