Merge branch 'active_course_2021-09-26～29' of http://git.dayaedu.com/yonge/mec into 2021-double-eleven

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

@@ -310,7 +310,7 @@
 		COUNT(CASE WHEN give_vip_flag_ = 1 THEN 1 ELSE NULL END) give_vip_num_,
 		COUNT(CASE WHEN give_practice_flag_ = 1 THEN 1 ELSE NULL END) give_practice_num_
 		FROM activity_user_mapper aum
-		WHERE activity_id_ = #{activityId}
+		WHERE aum.return_fee_ = 0 AND aum.activity_id_ = #{activityId}
 		<if test="userId != null">
 			AND aum.teacher_id_ = #{userId}
 		</if>