Merge branch 'online' of http://git.dayaedu.com/yonge/cooleshow into zx_online_message

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/impl/TeacherServiceImpl.java

@@ -574,7 +574,9 @@ public class TeacherServiceImpl extends ServiceImpl<TeacherDao, Teacher> impleme
         if (null == teacher) {
             teacher = new Teacher();
             teacher.setUserId(teacherSubmitReq.getUserId());
-            teacher = getTeacherDetil(teacher, teacherSubmitReq);
+            teacher.setEntryFlag(YesOrNoEnum.NO);
+            teacher.setMusicianFlag(YesOrNoEnum.NO);
+            getTeacherDetil(teacher, teacherSubmitReq);
             baseMapper.insert(teacher);
 
             // 导入IM账号到三方
@@ -693,10 +695,6 @@ 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());
@@ -709,11 +707,15 @@ public class TeacherServiceImpl extends ServiceImpl<TeacherDao, Teacher> impleme
         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;