|
@@ -190,6 +190,7 @@ public class TbClassStudentTempServiceImpl extends BaseServiceImpl<TbClassStuden
|
|
|
}
|
|
|
|
|
|
LibVip libVip=null;
|
|
|
+ String vipTip="";
|
|
|
List<LibVip> libVips=vipService.findByUserIdAndChildNames(user.getId(), tbLibImStudentTemp.getStudentName());
|
|
|
if(libVips!=null && libVips.size()>=2) {
|
|
|
tbLibImStudentTemp.setStatus(0);
|
|
@@ -249,6 +250,7 @@ public class TbClassStudentTempServiceImpl extends BaseServiceImpl<TbClassStuden
|
|
|
sSJParentRole.setUserId(user.getId());
|
|
|
sSJParentRole.setVipId(libVip.getId());
|
|
|
sSJParentRole=sSJParentRoleService.save(sSJParentRole);
|
|
|
+ vipTip=",已成功关联副家长";
|
|
|
}
|
|
|
}
|
|
|
|
|
@@ -266,6 +268,7 @@ public class TbClassStudentTempServiceImpl extends BaseServiceImpl<TbClassStuden
|
|
|
sSJParentRole.setUserId(user.getId());
|
|
|
sSJParentRole.setVipId(libVip.getId());
|
|
|
sSJParentRole=sSJParentRoleService.save(sSJParentRole);
|
|
|
+ vipTip=",已成功关联副家长";
|
|
|
}
|
|
|
}
|
|
|
|
|
@@ -274,7 +277,7 @@ public class TbClassStudentTempServiceImpl extends BaseServiceImpl<TbClassStuden
|
|
|
if(StringUtils.isNotEmpty(libVip.getDerver())) {
|
|
|
if(!libVip.getDerver().equals(tbLibImStudentTemp.getDerver())) {
|
|
|
tbLibImStudentTemp.setStatus(0);
|
|
|
- tbLibImStudentTemp.setErrorReason("小塾号与用户已绑定的小塾不一致");
|
|
|
+ tbLibImStudentTemp.setErrorReason("小塾号与学生已绑定的小塾不一致"+vipTip);
|
|
|
this.save(tbLibImStudentTemp);
|
|
|
reqNum=0;
|
|
|
return reqNum;
|
|
@@ -284,7 +287,7 @@ public class TbClassStudentTempServiceImpl extends BaseServiceImpl<TbClassStuden
|
|
|
if(conchDerver!=null) {
|
|
|
if (StringUtils.isNotEmpty(conchDerver.getVipId()) && !libVip.getDerver().equals(tbLibImStudentTemp.getDerver())) {
|
|
|
tbLibImStudentTemp.setStatus(0);
|
|
|
- tbLibImStudentTemp.setErrorReason("导入小塾已被其他人绑定");
|
|
|
+ tbLibImStudentTemp.setErrorReason("导入小塾已被其他学生绑定"+vipTip);
|
|
|
this.save(tbLibImStudentTemp);
|
|
|
reqNum=0;
|
|
|
return reqNum;
|
|
@@ -300,13 +303,13 @@ public class TbClassStudentTempServiceImpl extends BaseServiceImpl<TbClassStuden
|
|
|
//有学生,判断机构不为空,判断是否机构和导入机构一致,一致的话反回导入不成功,不一致的话返回机构不合
|
|
|
if(!libVip.getLibId().equals(tbLibImStudentTemp.getLibId())) {
|
|
|
tbLibImStudentTemp.setStatus(0);
|
|
|
- tbLibImStudentTemp.setErrorReason("与平台已有用户机构冲突");
|
|
|
+ tbLibImStudentTemp.setErrorReason("与平台已有用户机构冲突"+vipTip);
|
|
|
this.save(tbLibImStudentTemp);
|
|
|
reqNum=0;
|
|
|
return reqNum;
|
|
|
}else {
|
|
|
tbLibImStudentTemp.setStatus(0);
|
|
|
- tbLibImStudentTemp.setErrorReason("与平台已有用户信息冲突");
|
|
|
+ tbLibImStudentTemp.setErrorReason("与平台已有学生信息冲突"+vipTip);
|
|
|
this.save(tbLibImStudentTemp);
|
|
|
reqNum=0;
|
|
|
return reqNum;
|