活动排课

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

@@ -3473,7 +3473,7 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
 		//是否关联活动
 		if(vipGroup.getVipGroupActivityId() != null){
 			ActivityUserMapper activityUserMapper = activityUserMapperService.findByStudentId(vipGroupId, studentId);
-			if(activityUserMapper != null){
+			if(activityUserMapper != null && !activityUserMapper.getReturnFee()){
 				if(Objects.nonNull(activityUserMapper.getVipGroupId())){
 					VipGroup group = vipGroupDao.get(activityUserMapper.getVipGroupId());
 					vipGroupCategory = vipGroupCategoryDao.get(group.getVipGroupCategoryId().intValue());

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

@@ -171,11 +171,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} AND return_fee_ = 0
+		SELECT * FROM activity_user_mapper WHERE (vip_group_id_ = #{groupId} OR give_vip_group_id_ = #{groupId}) AND user_id_ = #{studentId}
 	</select>
 	<select id="findVipUserMapper" resultMap="ActivityUserMapper">
 		SELECT * FROM activity_user_mapper
-		WHERE return_fee_ = 0
+		WHERE 1 = 1
 		<if test="groupType == 'VIP'">
 			AND (vip_group_id_ = #{groupId} OR give_vip_group_id_ = #{groupId})
 		</if>