1、vip课课程总价

2、购买成功后状态更新调整

mec-biz/src/main/java/com/ym/mec/biz/dal/dao/CourseScheduleDao.java

@@ -365,6 +365,17 @@ public interface CourseScheduleDao extends BaseDAO<Long, CourseSchedule> {
     List<CourseSchedule> findVipGroupCourseSchedules(@Param("vipGroupId") Long vipGroupId);
 
     /**
+     * @describe 获取对应乐团下未开始的排课计划编号列表
+     * @author Joburgess
+     * @date 2019/12/5
+     * @param groupId: 乐团编号
+     * @param groupType: 乐团类型
+     * @return java.util.List<java.lang.Integer>
+     */
+    List<Long> findVipGroupNotStartCourseScheduleIds(@Param("groupId") String groupId,
+                                                        @Param("groupType") String groupType);
+
+    /**
      * @return java.lang.String
      * @Author: Joburgess
      * @Date: 2019/10/16

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

@@ -1413,8 +1413,7 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
     	if(vipGroup.getStatus()==VipGroupStatusEnum.CANCEL){
     		throw new BizException("该课程已结束或者已被停止,无法进行此操作");
 		}
-		List<CourseSchedule> vipGroupCourseSchedules = courseScheduleDao.findVipGroupCourseSchedules(vipGroupId);
-		List<Long> courseScheduleIds = vipGroupCourseSchedules.stream().map(CourseSchedule::getId).collect(Collectors.toList());
+		List<Long> courseScheduleIds = courseScheduleDao.findVipGroupNotStartCourseScheduleIds(vipGroupId.toString(),GroupType.VIP.getCode());
     	if(vipGroup.getStatus()==VipGroupStatusEnum.NOT_START){
 			vipGroup.setStatus(VipGroupStatusEnum.CANCEL);
     		vipGroupDao.update(vipGroup);

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

@@ -206,6 +206,7 @@
         <foreach collection="courseScheduleIds" item="courseScheduleId" open="(" close=")" separator=",">
             #{courseScheduleId}
         </foreach>
+        AND CONCAT( cs.class_date_, ' ', cs.start_class_time_ ) &gt; NOW()
     </delete>
 
     <!-- 分页查询 -->
@@ -842,6 +843,15 @@
           cs.music_group_id_ =#{vipGroupId} AND cs.group_type_ = 'VIP'
         ORDER BY start_class_time_
     </select>
+    <select id="findVipGroupNotStartCourseScheduleIds" resultType="long">
+        SELECT
+            cs.id_
+        FROM
+        	course_schedule cs
+        WHERE
+          cs.music_group_id_ =#{groupId} AND cs.group_type_ = #{groupType}
+          AND CONCAT(cs.class_date_,' ',cs.start_class_time_) &gt; NOW()
+    </select>
     <select id="findByClassGroupAndDate" resultMap="CourseSchedule">
         SELECT
         id_,