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

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

@@ -440,7 +440,7 @@ public class EduPracticeGroupServiceImpl implements EduPracticeGroupService{
 
                 return BaseController.succeed(result);
             }else{
-                throw new BizException("用户账户余额不足");
+                throw new BizException("账户余额不足，请完成账户充值");
             }
         }else{
             throw new BizException("当前购买方式暂时只支持用户余额购买");

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

@@ -366,7 +366,9 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
 		vipGroup.getCourseSchedules().forEach(courseSchedule -> {
 			courseSchedule.setGroupType(GroupType.VIP);
 			courseSchedule.setMusicGroupId(vipGroupApplyBaseInfoDto.getId().toString());
-		    courseSchedule.setSchoolId(vipGroup.getVipGroupApplyBaseInfo().getTeacherSchoolId());
+		    if(courseSchedule.getTeachMode().equals(TeachModeEnum.OFFLINE)){
+				courseSchedule.setSchoolId(vipGroup.getVipGroupApplyBaseInfo().getTeacherSchoolId());
+			}
 		    courseSchedule.setTeacherId(vipGroupApplyBaseInfoDto.getUserId());
 			courseSchedule.setActualTeacherId(vipGroupApplyBaseInfoDto.getUserId());
 			courseSchedule.setStatus(CourseStatusEnum.NOT_START);

mec-web/src/main/java/com/ym/mec/web/controller/education/EduPracticeGroupController.java

@@ -179,4 +179,5 @@ public class EduPracticeGroupController extends BaseController {
         }
         return practiceGroupService.cancelWaitPayOrder(studentId, groupId);
     }
+
 }