系统收费

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

@@ -1887,11 +1887,11 @@ public interface CourseScheduleDao extends BaseDAO<Long, CourseSchedule> {
 
 
     /**
-     * 获取班级最大已排课时长
+     * 获取班级预排课时长
      * @param classGroupSet
      * @return
      */
-    List<Map<Integer, Integer>> countPreMinutesByClassGroupId(@Param("classGroupSet") List<Integer> classGroupSet, @Param("courseDetailId") Integer courseDetailId);
+    List<Map<Integer, Integer>> countPreMinutesByClassGroupId(@Param("classGroupSet") List<Integer> classGroupSet);
 
     /**
      * 获取进行中或已结束的预排课课程

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

@@ -156,7 +156,7 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
     @Autowired
     private MusicGroupSchoolTermCourseDetailDao musicGroupSchoolTermCourseDetailDao;
     @Autowired
-    private CloudTeacherOrderDao cloudTeacherOrderDao;
+    private CloudTeacherOrderService cloudTeacherOrderService;
 
     @Override
     public BaseDAO<Integer, ClassGroup> getDAO() {
@@ -2682,6 +2682,7 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
         if (!CollectionUtils.isEmpty(teacherAttendances)) {
             teacherAttendanceDao.batchInsert(teacherAttendances);
         }
+        cloudTeacherOrderService.checkCloudOrderStart();
         imUserFriendService.refreshGroupImUserFriend(termCourseDetail.getMusicGroupId(),MUSIC);
     }
 
@@ -3494,7 +3495,7 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
         if(termCourseDetail != null){
             preTotalNumMap = MapUtil.convertIntegerMap(courseScheduleDao.countPreTotalNumByClassGroupId(classGroupSet));
             preSubMinutesMap = MapUtil.convertIntegerMap(courseScheduleDao.countPreSubMinutesByClassGroupId(classGroupSet,termCourseDetail.getId()));
-            preMinutesMap = MapUtil.convertIntegerMap(courseScheduleDao.countPreMinutesByClassGroupId(classGroupSet,termCourseDetail.getId()));
+            preMinutesMap = MapUtil.convertIntegerMap(courseScheduleDao.countPreMinutesByClassGroupId(classGroupSet));
         }
         Map<Integer, Long> currentNumMap = MapUtil.convertIntegerMap(courseScheduleDao.countExpendNumByClassGroupId(classGroupSet));
 

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

@@ -218,7 +218,7 @@ public class MusicGroupSchoolTermCourseDetailServiceImpl extends BaseServiceImpl
 					"STUDENT",pushMemberRenew);
 		}
 		//会员结束前5天提醒学员续费(退团提醒)
-		String pushMemberRenewQuit = sysConfigDao.findConfigValue(SysConfigService.PUSH_MEMBER_RENEW_QUIT);
+		/*String pushMemberRenewQuit = sysConfigDao.findConfigValue(SysConfigService.PUSH_MEMBER_RENEW_QUIT);
 		if(StringUtils.isEmpty(pushMemberRenewQuit)){
 			pushMemberRenewQuit = "5";
 		}
@@ -251,7 +251,7 @@ public class MusicGroupSchoolTermCourseDetailServiceImpl extends BaseServiceImpl
 					0,
 					null,
 					"STUDENT",pushMemberRenewQuit,memberEndAutoQuitMusic);
-		}
+		}*/
 	}
 
 	private MusicGroupSchoolTermCourseDetail getCourseDetail(MusicGroupSchoolTermCourseDetail courseDetail){

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

@@ -3801,7 +3801,7 @@
         <foreach collection="ids" item="id" open="(" close=")" separator=",">
             #{id}
         </foreach>
-        AND group_type_='MUSIC' AND DATE_FORMAT(NOW(),'%Y-%m-%d') >= class_date_ AND member_flag_ = 1
+        AND group_type_='MUSIC' AND DATE_FORMAT(NOW(),'%Y-%m-%d') >= class_date_ AND member_flag_ = 1 AND pre_course_flag_ = 0
         GROUP BY music_group_id_
     </select>
 
@@ -3915,15 +3915,14 @@
         GROUP BY cgsm.class_group_id_
     </select>
     <select id="countPreMinutesByClassGroupId" resultType="java.util.Map">
-        SELECT cgsm.class_group_id_ 'key',MAX(mgst.pre_member_course_minutes_) 'value'
-        FROM class_group_student_mapper cgsm
-        LEFT JOIN music_group_school_term_student_course_detail mgst ON mgst.user_id_ = cgsm.user_id_
-        WHERE cgsm.class_group_id_ IN
+        SELECT class_group_id_ 'key',SUM(ROUND((UNIX_TIMESTAMP(CONCAT(class_date_,' ',end_class_time_)) - UNIX_TIMESTAMP(CONCAT(class_date_,' ',start_class_time_)))/60)) 'value'
+        FROM course_schedule
+        WHERE class_group_id_ IN
         <foreach collection="classGroupSet" open="(" close=")" item="classGroupId" separator=",">
             #{classGroupId}
         </foreach>
-        AND mgst.music_group_school_term_course_detail_id_ = #{courseDetailId}
-        GROUP BY cgsm.class_group_id_
+        group_type_ = 'MUSIC' AND pre_course_flag_ = 1
+        GROUP BY class_group_id_
     </select>
     <select id="queryOverPreCourseListByMusicGroupId" resultType="int">
         SELECT count(id_) FROM course_schedule WHERE music_group_id_ = #{musicGroupId} AND group_type_ = 'MUSIC' AND is_lock_ = 1 AND pre_course_flag_ = 1