Merge branch 'reg_feature_5.31'

mec-biz/src/main/java/com/ym/mec/biz/service/impl/MusicGroupServiceImpl.java

@@ -239,8 +239,8 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
         }
         musicGroup.setDelFlag(false);
         CooperationOrgan cooperationOrgan = cooperationOrganDao.get(musicGroup.getCooperationOrganId());
-        if(cooperationOrgan.getEducationUserId() == null){
-            throw new BizException("操作失败：请先配置合作单位: {} 关联的乐团主管",cooperationOrgan.getName());
+        if (cooperationOrgan.getEducationUserId() == null) {
+            throw new BizException("操作失败：请先配置合作单位: {} 关联的乐团主管", cooperationOrgan.getName());
         }
         musicGroup.setEducationalTeacherId(cooperationOrgan.getEducationUserId());
         // 保存乐团基本信息
@@ -388,6 +388,13 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
             student.setCurrentClass(studentPreRegistration.getCurrentClass());
             studentDao.insert(student);
             sysUserCashAccountDao.insert(new SysUserCashAccount(userId, "CNY"));
+        } else {
+            user.setUsername(studentPreRegistration.getUserName());
+            if (!user.getUserType().contains("STUDENT")) {
+                user.setUserType(user.getUserType() + ",STUDENT");
+            }
+            user.setUpdateTime(new Date());
+            teacherDao.updateUser(user);
         }
 
         studentPreRegistration.setCreateTime(date);
@@ -2576,29 +2583,29 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
             return;
         }
         List<Integer> quitUserIdList = new ArrayList<>();
-        if(oldMusicGroup.getTeamTeacherId() != null){
+        if (oldMusicGroup.getTeamTeacherId() != null) {
             quitUserIdList.add(oldMusicGroup.getTeamTeacherId());
         }
-        if(oldMusicGroup.getEducationalTeacherId() != null){
+        if (oldMusicGroup.getEducationalTeacherId() != null) {
             quitUserIdList.add(oldMusicGroup.getEducationalTeacherId());
         }
-        if(oldMusicGroup.getDirectorUserId() != null){
+        if (oldMusicGroup.getDirectorUserId() != null) {
             quitUserIdList.add(oldMusicGroup.getDirectorUserId());
         }
-        if(oldMusicGroup.getTransactionTeacherId() != null){
+        if (oldMusicGroup.getTransactionTeacherId() != null) {
             quitUserIdList.add(oldMusicGroup.getTransactionTeacherId());
         }
         Map<Integer, String> userRoleMap = new HashMap<>(4);
-        if(newMusicGroup.getTeamTeacherId() != null){
+        if (newMusicGroup.getTeamTeacherId() != null) {
             userRoleMap.put(newMusicGroup.getTeamTeacherId(), "运营主管");
         }
-        if(newMusicGroup.getEducationalTeacherId() != null){
+        if (newMusicGroup.getEducationalTeacherId() != null) {
             userRoleMap.put(newMusicGroup.getEducationalTeacherId(), "乐团主管");
         }
-        if(newMusicGroup.getDirectorUserId() != null){
+        if (newMusicGroup.getDirectorUserId() != null) {
             userRoleMap.put(newMusicGroup.getDirectorUserId(), "乐队指导");
         }
-        if(newMusicGroup.getTransactionTeacherId() != null){
+        if (newMusicGroup.getTransactionTeacherId() != null) {
             userRoleMap.put(newMusicGroup.getTransactionTeacherId(), "衔接老师");
         }
         classGroups.forEach(e -> {
@@ -2632,8 +2639,8 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
             courseScheduleDao.updateCourseScheduleSchool("MUSIC", musicGroupId, musicGroup.getSchoolId());
         }
         CooperationOrgan cooperationOrgan = cooperationOrganDao.get(musicGroup.getCooperationOrganId());
-        if(cooperationOrgan.getEducationUserId() == null){
-            throw new BizException("操作失败：请先配置合作单位: {} 关联的乐团主管",cooperationOrgan.getName());
+        if (cooperationOrgan.getEducationUserId() == null) {
+            throw new BizException("操作失败：请先配置合作单位: {} 关联的乐团主管", cooperationOrgan.getName());
         }
         boolean refresh = false;
         musicGroup.setEducationalTeacherId(cooperationOrgan.getEducationUserId());
@@ -2642,39 +2649,39 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
             updateTeamTeacher(group, musicGroup);
         }
         //不是导入的乐团
-        if(musicGroupId.length() > 10){
+        if (musicGroupId.length() > 10) {
             //是否有预报名的群聊
             ImGroup imGroup = imGroupService.get(Long.parseLong(musicGroupId));
-            if(imGroup != null){
+            if (imGroup != null) {
                 refresh = true;
                 List<Integer> quitUserIdList = new ArrayList<>();
-                if(group.getTeamTeacherId() != null){
+                if (group.getTeamTeacherId() != null) {
                     quitUserIdList.add(group.getTeamTeacherId());
                 }
-                if(group.getEducationalTeacherId() != null){
+                if (group.getEducationalTeacherId() != null) {
                     quitUserIdList.add(group.getEducationalTeacherId());
                 }
-                if(group.getDirectorUserId() != null){
+                if (group.getDirectorUserId() != null) {
                     quitUserIdList.add(group.getDirectorUserId());
                 }
-                if(group.getTransactionTeacherId() != null){
+                if (group.getTransactionTeacherId() != null) {
                     quitUserIdList.add(group.getTransactionTeacherId());
                 }
                 Map<Integer, String> userRoleMap = new HashMap<>(4);
-                if(musicGroup.getTeamTeacherId() != null){
+                if (musicGroup.getTeamTeacherId() != null) {
                     userRoleMap.put(musicGroup.getTeamTeacherId(), "运营主管");
                 }
-                if(musicGroup.getEducationalTeacherId() != null){
+                if (musicGroup.getEducationalTeacherId() != null) {
                     userRoleMap.put(musicGroup.getEducationalTeacherId(), "乐团主管");
                 }
-                if(musicGroup.getDirectorUserId() != null){
+                if (musicGroup.getDirectorUserId() != null) {
                     userRoleMap.put(musicGroup.getDirectorUserId(), "乐队指导");
                 }
-                if(musicGroup.getTransactionTeacherId() != null){
+                if (musicGroup.getTransactionTeacherId() != null) {
                     userRoleMap.put(musicGroup.getTransactionTeacherId(), "衔接老师");
                 }
-                imGroupMemberService.quit(Long.parseLong(musicGroupId),quitUserIdList);
-                imGroupMemberService.join(Long.parseLong(musicGroupId),userRoleMap);
+                imGroupMemberService.quit(Long.parseLong(musicGroupId), quitUserIdList);
+                imGroupMemberService.join(Long.parseLong(musicGroupId), userRoleMap);
             }
         }