Merge branch 'saas' of http://git.dayaedu.com/yonge/mec into master_saas

 Conflicts:

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

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

@@ -4439,9 +4439,9 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
         //获取分布默认的课程类型单价
         MusicGroup musicGroup = musicGroupDao.findByClassGroupId(masterClassGroupId);
         //主班乐团不能是系统收费团
-//        if(musicGroup.getCourseViewType() == CourseViewTypeEnum.MEMBER_FEE){
-//            throw new BizException("操作失败：主班乐团不能是系统收费团");
-//        }
+        /*if(musicGroup.getCourseViewType() == CourseViewTypeEnum.MEMBER_FEE){
+            throw new BizException("操作失败：主班乐团不能是系统收费团");
+        }*/
         Map<String, BigDecimal> unitPriceMap = MapUtil.convertIntegerMap(organizationCourseUnitPriceSettingsDao.queryMapByOrganIdAndChargeTypeId(musicGroup.getChargeTypeId(), musicGroup.getOrganId()));
         Set<String> masterKeySet = masterMap.keySet();
         //计算主班课程类型剩余价值

mec-biz/src/main/resources/config/mybatis/CourseScheduleMapper.xml

@@ -3546,7 +3546,7 @@
             #{item}
         </foreach>
         AND new_course_id_ IS NOT NULL AND pre_course_flag_ = 0
-        AND status_ = 'NOT_START'
+        AND status_ = 'NOT_START' AND del_flag_ = 0
     </select>
     <select id="getLock" resultMap="CourseSchedule">
         SELECT * FROM course_schedule WHERE id_ = #{courseId} FOR UPDATE