Merge branch 'master' of http://git.dayaedu.com/yonge/cooleshow

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

@@ -1052,19 +1052,19 @@ public class CourseScheduleServiceImpl extends ServiceImpl<CourseScheduleDao, Co
             teacherSalaryList.add(teacherSalary);
             teacherSalary.setCreateTime(now);
 
-            teacherId=payment.getTeacherId();
-            studentId=payment.getUserId();
+            teacherId = payment.getTeacherId();
+            studentId = payment.getUserId();
         }
         courseScheduleTeacherSalaryService.getDao().insertBatch(teacherSalaryList);
         log.info("buyPracticeCourseSuccess ok");
 
-        Set<Long> studentIds=new HashSet();
+        Set<Long> studentIds = new HashSet();
         studentIds.add(studentId);
         try {
-            imUserFriendService.saveUserFriend(teacherId,studentIds);
-            log.info("保存用户通讯录成功,teacherId:{},studentIds:{}",teacherId,studentIds);
-        }catch (Exception e){
-            log.error("保存用户通讯录失败,teacherId:{},studentIds:{},e:{}",teacherId,studentIds,e);
+            imUserFriendService.saveUserFriend(teacherId, studentIds);
+            log.info("保存用户通讯录成功,teacherId:{},studentIds:{}", teacherId, studentIds);
+        } catch (Exception e) {
+            log.error("保存用户通讯录失败,teacherId:{},studentIds:{},e:{}", teacherId, studentIds, e);
         }
 
         //消息推送
@@ -1882,6 +1882,7 @@ public class CourseScheduleServiceImpl extends ServiceImpl<CourseScheduleDao, Co
                 imGroupService.dismiss(String.valueOf(groupId));
             } catch (Exception e) {
                 log.error("琴房课程组id:{},关闭群聊失败:{}", groupId, e);
+                throw new BizException("关闭群聊失败");
             }
         } else {
             courseGroupService.update(null, Wrappers.<CourseGroup>lambdaUpdate()