|
|
@@ -75,8 +75,9 @@ public class ExpertManage { |
|
|
|
*/ |
|
|
|
@Transactional(rollbackFor = Exception.class) |
|
|
|
public void expertBasicInfoSubmit(ExpertUserBasicInfoSubmitRequest req) { |
|
|
|
Long operatorId = LoginUserUtil.getUserId(); |
|
|
|
// 用户id |
|
|
|
Long userId = assemblerAndGenerateExpert(req); |
|
|
|
Long userId = assemblerAndGenerateExpert(req, operatorId); |
|
|
|
// 批量通过专家入库审核/专家履职意向审核 |
|
|
|
expertMetaApplyManage.autoPassExpertApply(userId); |
|
|
|
|
|
|
@@ -140,7 +141,7 @@ public class ExpertManage { |
|
|
|
} |
|
|
|
|
|
|
|
@Transactional(rollbackFor = Exception.class) |
|
|
|
public Long generateOrGetUserId(ExpertBasicInfo basicInfo) { |
|
|
|
public Long generateOrGetUserId(ExpertBasicInfo basicInfo, Long operatorId) { |
|
|
|
String phoneNo = basicInfo.getPhoneNo(); |
|
|
|
UserInfo userInfo = iUserInfoService.getUserInfoByPhoneNo(phoneNo); |
|
|
|
if (Objects.isNull(userInfo)) { |
|
|
@@ -151,8 +152,8 @@ public class ExpertManage { |
|
|
|
// .employeeCode(dingEmployeeInfo.getEmployeeCode()) |
|
|
|
.available(UserAvailableEnum.DISABLE.name()) |
|
|
|
.mobile(phoneNo) |
|
|
|
.createBy(LoginUserUtil.getUserId()) |
|
|
|
.updateBy(LoginUserUtil.getUserId()) |
|
|
|
.createBy(operatorId) |
|
|
|
.updateBy(operatorId) |
|
|
|
.createOn(LocalDateTime.now()) |
|
|
|
.updateOn(LocalDateTime.now()) |
|
|
|
.build(); |
|
|
@@ -179,14 +180,17 @@ public class ExpertManage { |
|
|
|
if (false) { |
|
|
|
verifyCodeCheckHelper.verification(VerificationCodeType.EXPERT_REGISTER, phoneNo, verificationCode); |
|
|
|
} |
|
|
|
assemblerAndGenerateExpert(request); |
|
|
|
assemblerAndGenerateExpert(request, null); |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
@Transactional(rollbackFor = Exception.class) |
|
|
|
public Long assemblerAndGenerateExpert(ExpertUserBasicInfoSubmitRequest req) { |
|
|
|
public Long assemblerAndGenerateExpert(ExpertUserBasicInfoSubmitRequest req, Long operatorId) { |
|
|
|
if (Objects.isNull(operatorId)) { |
|
|
|
operatorId = -1L; |
|
|
|
} |
|
|
|
ExpertBasicInfo basicInfo = req.getBasicInfo(); |
|
|
|
Long userId = generateOrGetUserId(basicInfo); |
|
|
|
Long userId = generateOrGetUserId(basicInfo, operatorId); |
|
|
|
|
|
|
|
// 校验区域编码合法性 校验履职意向编码合法性 |
|
|
|
ExpertRegionInfo expertRegionInfo = basicInfo.getExpertRegionInfo(); |
|
|
|