|
@@ -574,7 +574,7 @@ public class TeacherServiceImpl extends ServiceImpl<TeacherDao, Teacher> impleme
|
|
|
if (null == teacher) {
|
|
|
teacher = new Teacher();
|
|
|
teacher.setUserId(teacherSubmitReq.getUserId());
|
|
|
- teacher = getTeacherDetil(teacher, teacherSubmitReq);
|
|
|
+ getTeacherDetil(teacher, teacherSubmitReq);
|
|
|
baseMapper.insert(teacher);
|
|
|
|
|
|
// 导入IM账号到三方
|
|
@@ -693,27 +693,31 @@ public class TeacherServiceImpl extends ServiceImpl<TeacherDao, Teacher> impleme
|
|
|
*/
|
|
|
private Teacher getTeacherDetil(Teacher teacher, TeacherSubmitReq teacherSubmitReq) {
|
|
|
teacher.setSubjectId(teacherSubmitReq.getSubjectId());
|
|
|
- teacher.setEntryFlag(YesOrNoEnum.NO);
|
|
|
- teacher.setEntryAuthDate(null);
|
|
|
- teacher.setMusicianFlag(YesOrNoEnum.NO);
|
|
|
- teacher.setMusicianDate(null);
|
|
|
teacher.setIsSettlement(teacherSubmitReq.getIsSettlement());
|
|
|
teacher.setIsTestUser(teacherSubmitReq.getIsTestUser());
|
|
|
teacher.setSettlementFrom(teacherSubmitReq.getSettlementFrom());
|
|
|
teacher.setTenantId(teacherSubmitReq.getTenantId() == null ? -1L : teacherSubmitReq.getTenantId());
|
|
|
teacher.setAvatar(Optional.ofNullable(teacherSubmitReq.getAvatar()).orElse(teacher.getAvatar()));
|
|
|
if (StringUtil.isEmpty(teacherSubmitReq.getTeacherType())) {
|
|
|
+ teacher.setEntryFlag(YesOrNoEnum.NO);
|
|
|
+ teacher.setMusicianFlag(YesOrNoEnum.NO);
|
|
|
+ teacher.setEntryAuthDate(null);
|
|
|
+ teacher.setMusicianDate(null);
|
|
|
return teacher;
|
|
|
}
|
|
|
String[] teacherTypes = teacherSubmitReq.getTeacherType().split(",");
|
|
|
for (String teacherType : teacherTypes) {
|
|
|
if (TeacherTypeEnum.ENTRY.getCode().equals(teacherType)) {
|
|
|
teacher.setEntryFlag(YesOrNoEnum.YES);
|
|
|
- teacher.setEntryAuthDate(new Date());
|
|
|
+ if (teacher.getTeacherDate() == null) {
|
|
|
+ teacher.setEntryAuthDate(new Date());
|
|
|
+ }
|
|
|
}
|
|
|
if (TeacherTypeEnum.MUSICIAN.getCode().equals(teacherType)) {
|
|
|
teacher.setMusicianFlag(YesOrNoEnum.YES);
|
|
|
- teacher.setMusicianDate(new Date());
|
|
|
+ if (teacher.getMusicDate() == null) {
|
|
|
+ teacher.setMusicianDate(new Date());
|
|
|
+ }
|
|
|
}
|
|
|
}
|
|
|
return teacher;
|