Merge branch 'online1'

# Conflicts:
#	mec-biz/src/main/java/com/ym/mec/biz/dal/dao/CourseScheduleTeacherSalaryDao.java

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

@@ -1313,8 +1313,8 @@ public interface CourseScheduleDao extends BaseDAO<Long, CourseSchedule> {
      * @return java.util.List<java.util.Map<java.lang.Integer,java.lang.Integer>>
      */
     List<Map<Integer, Long>> countStudentVipCoursesWithDate(@Param("studentIds") List<Integer> studentIds,
-                                                               @Param("startTime") Date startTime,
-                                                               @Param("endTime") Date endTime,
+                                                            @Param("startTime") Date startTime,
+                                                            @Param("endTime") Date endTime,
                                                             @Param("groupType") GroupType groupType);
 
 
@@ -1328,8 +1328,8 @@ public interface CourseScheduleDao extends BaseDAO<Long, CourseSchedule> {
      * @return java.util.List<java.util.Map<java.lang.Integer,java.lang.Long>>
      */
     List<Map<Integer, Long>> countStudentPayPracticeCoursesWithDate(@Param("studentIds") List<Integer> studentIds,
-                                                            @Param("startTime") Date startTime,
-                                                            @Param("endTime") Date endTime);
+                                                                    @Param("startTime") Date startTime,
+                                                                    @Param("endTime") Date endTime);
 
     /**
      * @describe 统计学生在未来的vip课数量

mec-biz/src/main/java/com/ym/mec/biz/service/VipGroupService.java

@@ -245,62 +245,62 @@ public interface VipGroupService extends BaseService<Long, VipGroup> {
     void orderCallback(StudentPaymentOrder order);
 
     /**
-	 * @Author: Joburgess
-	 * @Date: 2019/10/3
-	 * @params [vipGroupId, studentId]
-	 * @return void
-	 * @describe 申请退课
-	 */
-	void applyRefund(Long vipGroupId);
-
-	/**
-	 * @describe 给指定学生退课
-	 * @author Joburgess
-	 * @date 2019/11/15
-	 * @param vipGroupId: vip课程
-	 * @param studentId: 学生编号
-	 * @return void
-	 */
-	void applyRefundForStudent(Long vipGroupId, Integer studentId, BigDecimal amount);
-
-	/**
-	 * @describe 对某个学生进行休学
-	 * @author Joburgess
-	 * @date 2019/12/18
-	 * @param vipGroupId: vip课编号
-	 * @param studentId: 学生编号
-	 * @return void
-	 */
-	void pauseForStudent(Long vipGroupId, Integer studentId);
-
-	/**
-	 * @describe 恢复休学的学生
-	 * @author Joburgess
-	 * @date 2019/12/18
-	 * @param studentRecoverInfo:
-	 * @return void
-	 */
-	void recoverForStudent(StudentRecoverDto studentRecoverInfo);
-
-	/**
-	 * @describe 获取学生休学信息
-	 * @author Joburgess
-	 * @date 2019/12/24
-	 * @param vipGroupId:
-	 * @param studentId:
-	 * @return com.ym.mec.biz.dal.dto.StudentRecoverInfoDto
-	 */
-	StudentRecoverInfoDto getStudentPauseInfo(Long vipGroupId, Integer studentId);
-
-	/**
-	 * @describe 获取指定学生的剩余课时费用
-	 * @author Joburgess
-	 * @date 2019/11/15
-	 * @param vipGroupId: VIP课编号
-	 * @param studentId: 学生编号
-	 * @return java.util.Map<java.lang.String,java.math.BigDecimal>
-	 */
-	Map<String,BigDecimal> getStudentSurplusCourseFee(Long vipGroupId, Integer studentId);
+     * @Author: Joburgess
+     * @Date: 2019/10/3
+     * @params [vipGroupId, studentId]
+     * @return void
+     * @describe 申请退课
+     */
+    void applyRefund(Long vipGroupId);
+
+    /**
+     * @describe 给指定学生退课
+     * @author Joburgess
+     * @date 2019/11/15
+     * @param vipGroupId: vip课程
+     * @param studentId: 学生编号
+     * @return void
+     */
+    void applyRefundForStudent(Long vipGroupId, Integer studentId, BigDecimal amount);
+
+    /**
+     * @describe 对某个学生进行休学
+     * @author Joburgess
+     * @date 2019/12/18
+     * @param vipGroupId: vip课编号
+     * @param studentId: 学生编号
+     * @return void
+     */
+    void pauseForStudent(Long vipGroupId, Integer studentId);
+
+    /**
+     * @describe 恢复休学的学生
+     * @author Joburgess
+     * @date 2019/12/18
+     * @param studentRecoverInfo:
+     * @return void
+     */
+    void recoverForStudent(StudentRecoverDto studentRecoverInfo);
+
+    /**
+     * @describe 获取学生休学信息
+     * @author Joburgess
+     * @date 2019/12/24
+     * @param vipGroupId:
+     * @param studentId:
+     * @return com.ym.mec.biz.dal.dto.StudentRecoverInfoDto
+     */
+    StudentRecoverInfoDto getStudentPauseInfo(Long vipGroupId, Integer studentId);
+
+    /**
+     * @describe 获取指定学生的剩余课时费用
+     * @author Joburgess
+     * @date 2019/11/15
+     * @param vipGroupId: VIP课编号
+     * @param studentId: 学生编号
+     * @return java.util.Map<java.lang.String,java.math.BigDecimal>
+     */
+    Map<String,BigDecimal> getStudentSurplusCourseFee(Long vipGroupId, Integer studentId);
 
     /**
      * @Author: Joburgess
@@ -344,7 +344,7 @@ public interface VipGroupService extends BaseService<Long, VipGroup> {
      * @return
      */
     boolean awardedMonthlyRewards();
-    
+
     /**
      * 根据老师查询vip课教学点
      * @param userId
@@ -379,19 +379,19 @@ public interface VipGroupService extends BaseService<Long, VipGroup> {
      */
     void addVipGroupStudents(Long vipGroupId,List<Integer> studentIds);
 
-	/**
-	 * 更新vipgroup至完成状态
-	 */
-	void updateVipGroupStatusToFinished();
-
-	/**
-	 * @describe 获取vip课购买信息
-	 * @author Joburgess
-	 * @date 2019/11/29
-	 * @param vipGroupId: vip课编号
-	 * @param userId: 用户编号
-	 * @return void
-	 */
+    /**
+     * 更新vipgroup至完成状态
+     */
+    void updateVipGroupStatusToFinished();
+
+    /**
+     * @describe 获取vip课购买信息
+     * @author Joburgess
+     * @date 2019/11/29
+     * @param vipGroupId: vip课编号
+     * @param userId: 用户编号
+     * @return void
+     */
     VipGroupPayInfoDto getVipGroupPayInfo(Integer vipGroupId,Integer userId);
 
     /**

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

@@ -109,7 +109,7 @@ public class CourseScheduleTeacherSalaryServiceImpl extends BaseServiceImpl<Long
         //获取活动信息
         VipGroupActivity vipGroupActivity = null;
         if(vipGroup.getVipGroupActivityId() != null){
-        	vipGroupActivity = vipGroupActivityDao.get(vipGroup.getVipGroupActivityId().intValue());
+            vipGroupActivity = vipGroupActivityDao.get(vipGroup.getVipGroupActivityId().intValue());
         }
 
         List<CourseScheduleTeacherSalary> courseScheduleTeacherSalaries = new ArrayList<>();

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

@@ -2261,24 +2261,24 @@
 
     <select id="endFindCourseSchedules" resultMap="CourseScheduleEndDto">
         SELECT
-            cs.id_,
-            cs.group_type_,
-            cs.music_group_id_,
-            cs.class_group_id_,
-            cs.status_,
-            cs.name_,
-            CONCAT(cs.class_date_,' ',cs.start_class_time_) course_start_time_,
-            CONCAT(cs.class_date_,' ',cs.end_class_time_) course_end_time_,
-            cs.actual_teacher_id_,
-            cs.teach_mode_,
-            cs.type_,
-            cs.schoole_id_,
-            s.name_ schoole_name_,
-            o.name_ organ_name_
+        cs.id_,
+        cs.group_type_,
+        cs.music_group_id_,
+        cs.class_group_id_,
+        cs.status_,
+        cs.name_,
+        CONCAT(cs.class_date_,' ',cs.start_class_time_) course_start_time_,
+        CONCAT(cs.class_date_,' ',cs.end_class_time_) course_end_time_,
+        cs.actual_teacher_id_,
+        cs.teach_mode_,
+        cs.type_,
+        cs.schoole_id_,
+        s.name_ schoole_name_,
+        o.name_ organ_name_
         FROM
-            course_schedule cs
-            LEFT JOIN school s ON cs.schoole_id_=s.id_
-            LEFT JOIN organization o ON cs.organ_id_=o.id_
+        course_schedule cs
+        LEFT JOIN school s ON cs.schoole_id_=s.id_
+        LEFT JOIN organization o ON cs.organ_id_=o.id_
         <include refid="endFindCourseSchedulesCondition"/>
         ORDER BY course_start_time_,cs.id_
         <include refid="global.limit"/>
@@ -2862,14 +2862,14 @@
     </resultMap>
     <select id="findCourseRate" resultMap="CourseScheduleRateDtoMap">
         SELECT cs.class_date_,
-               cs.start_class_time_,
-               cs.end_class_time_,
-               cs.id_,
-               cs.teaching_content_,
-               GROUP_CONCAT(cse.comment_ SEPARATOR ";") comment_,
-               cs.status_
+        cs.start_class_time_,
+        cs.end_class_time_,
+        cs.id_,
+        cs.teaching_content_,
+        GROUP_CONCAT(cse.comment_ SEPARATOR ";") comment_,
+        cs.status_
         FROM course_schedule cs
-                 LEFT JOIN course_schedule_evaluate cse ON cs.id_ = cse.course_schedule_id_
+        LEFT JOIN course_schedule_evaluate cse ON cs.id_ = cse.course_schedule_id_
         WHERE cs.group_type_ = #{groupType}
         <if test="groupId != null">
             AND cs.music_group_id_ = #{groupId}
@@ -3060,18 +3060,18 @@
     </select>
     <select id="countStudentVipCoursesWithDate" resultType="map">
         SELECT
-          cssp.user_id_ as 'key',
-          COUNT( cs.id_ ) as 'value'
+        cssp.user_id_ as 'key',
+        COUNT( cs.id_ ) as 'value'
         FROM
-            course_schedule_student_payment cssp
-            LEFT JOIN course_schedule cs ON cs.id_ = cssp.course_schedule_id_
+        course_schedule_student_payment cssp
+        LEFT JOIN course_schedule cs ON cs.id_ = cssp.course_schedule_id_
         WHERE
-            cssp.user_id_ IN
-            <foreach collection="studentIds" item="studentId" separator="," open="(" close=")">
-                #{studentId}
-            </foreach>
-            AND cssp.group_type_ = #{groupType,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler}
-            AND cs.class_date_ BETWEEN #{startTime} AND #{endTime}
+        cssp.user_id_ IN
+        <foreach collection="studentIds" item="studentId" separator="," open="(" close=")">
+            #{studentId}
+        </foreach>
+        AND cssp.group_type_ = #{groupType,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler}
+        AND cs.class_date_ BETWEEN #{startTime} AND #{endTime}
         GROUP BY
         cssp.user_id_
     </select>
@@ -3097,11 +3097,11 @@
 
     <select id="countStudentVipCoursesInFuture" resultType="map">
         SELECT
-          cssp.user_id_ as 'key',
-          COUNT( cs.id_ ) as 'value'
+        cssp.user_id_ as 'key',
+        COUNT( cs.id_ ) as 'value'
         FROM
-          course_schedule_student_payment cssp
-          LEFT JOIN course_schedule cs ON cs.id_ = cssp.course_schedule_id_
+        course_schedule_student_payment cssp
+        LEFT JOIN course_schedule cs ON cs.id_ = cssp.course_schedule_id_
         WHERE
         cssp.user_id_ IN
         <foreach collection="studentIds" item="studentId" separator="," open="(" close=")">