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/ActivityUserMapperMapper.xml

@@ -184,11 +184,11 @@
 		WHERE activity_id_ = #{activityId} AND user_id_ = #{userId}
 	</select>
     <select id="findByStudentId" resultMap="ActivityUserMapper">
-		SELECT * FROM activity_user_mapper WHERE (vip_group_id_ = #{groupId} OR give_vip_group_id_ = #{groupId}) AND user_id_ = #{studentId}
+		SELECT * FROM activity_user_mapper WHERE (vip_group_id_ = #{groupId} OR give_vip_group_id_ = #{groupId}) AND user_id_ = #{studentId} AND return_fee_ = 0
 	</select>
 	<select id="findVipUserMapper" resultMap="ActivityUserMapper">
 		SELECT * FROM activity_user_mapper
-		WHERE 1 = 1
+		WHERE return_fee_ = 0
 		<if test="groupType == 'VIP'">
 			AND (vip_group_id_ = #{groupId} OR give_vip_group_id_ = #{groupId})
 		</if>