Merge branch '2021-double-eleven' of http://git.dayaedu.com/yonge/mec

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

@@ -356,7 +356,7 @@ public class GroupClassServiceImpl implements GroupClassService {
                                 continue;
                             }
                             Map<String, BigDecimal> salary = vipGroupService.countVipGroupPredictFee1(giveVipGroup, giveVipGroup.getUserId(), courseScheduleTeacherSalaries.get(i).getCourseScheduleId());
-                            if(masterGroup){
+                            if(!masterGroup){
                                 offlineTeacherSalary = salary.get("offlineTeacherSalary");
                             }else {
                                 offlineTeacherSalary = salary.get("giveOfflineTeacherSalary");

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>

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

@@ -856,7 +856,7 @@
                vg.courses_start_date,
                vg.courses_expire_date_,
                cg.total_class_times_,
-               su.username_
+               su.real_name_ username_
         FROM vip_group vg
                  LEFT JOIN class_group cg ON vg.id_ = cg.music_group_id_ AND cg.group_type_ = 'VIP'
                  LEFT JOIN sys_user su ON vg.user_id_ = su.id_