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

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

@@ -262,7 +262,7 @@ public class CourseScheduleStudentPaymentServiceImpl extends BaseServiceImpl<Lon
 		}
 
 		if(!CollectionUtils.isEmpty(needUpdatePayments)){
-			courseScheduleStudentPaymentDao.batchUpdate(needUpdatePayments);
+//			courseScheduleStudentPaymentDao.batchUpdate(needUpdatePayments);
 		}
 	}
 }

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

@@ -471,6 +471,7 @@
             AND cg.group_type_ = #{type}
         </if>
         AND cs.class_date_ = DATE_FORMAT(#{date},'%Y-%m-%d')
+        ORDER BY CONCAT(cs.class_date_,' ',cs.start_class_time_)
         <include refid="global.limit"/>
     </select>
 

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

@@ -283,7 +283,7 @@
 		FROM course_schedule_student_payment cssp
 			LEFT JOIN course_schedule cs ON cssp.course_schedule_id_=cs.id_
 		WHERE cssp.music_group_id_=#{groupId} AND cssp.group_type_='VIP'
-		AND CONCAT(cs.class_date_,' ',cs.start_class_time_) > NOW()
+		AND cssp.settlement_time_ IS NULL
 	</select>
 
 	<delete id="deleteStudentCourseSchedule">