Merge branch 'online' of http://git.dayaedu.com/yonge/cooleshow into online

cooleshow-user/user-biz/src/main/resources/config/mybatis/VideoLessonGroupMapper.xml

@@ -322,7 +322,7 @@
 	
 	<select id="queryMyLessonGroup" resultType="com.yonge.cooleshow.biz.dal.vo.LessonGroupVo">
 		SELECT
-			g.id_ AS id,
+			g.video_lesson_group_id_ AS id,
 			g.lesson_name_ AS lessonName,
 			g.lesson_subject_ AS lessonSubject,
 			s.name_ AS lessonSubjectName,
@@ -335,7 +335,7 @@
 			u.real_name_ AS realName,
 			u.avatar_ AS avatar,
 			g.audit_version_ as auditVersion,
-			(SELECT COUNT(1) FROM video_lesson_purchase_record r WHERE r.video_lesson_group_id_=g.id_ AND r.order_status_='PAID') AS countStudent
+			(SELECT COUNT(1) FROM video_lesson_purchase_record r WHERE r.video_lesson_group_id_=g.video_lesson_group_id_ AND r.order_status_='PAID') AS countStudent
 		FROM video_lesson_purchase_record pr
 		left join (
 		SELECT gg.* FROM video_lesson_auth_record ar left join video_lesson_group_log gg on ar.video_group_id_ = gg.video_lesson_group_id_ and ar.version_ = gg.version_

cooleshow-user/user-biz/src/main/resources/config/mybatis/VideoLessonPurchaseRecordMapper.xml

@@ -31,6 +31,6 @@
 	</update>
 	
 	<select id="queryByVideoLessonGroupId" resultMap="BaseResultMap">
-		SELECT * FROM video_lesson_group WHERE video_lesson_group_id_ = #{videoLessonGroupId} and order_status_  = #{orderStatus}
+		SELECT * FROM video_lesson_purchase_record WHERE video_lesson_group_id_ = #{videoLessonGroupId} and order_status_  = #{orderStatus}
 	</select>
 </mapper>