update

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

@@ -1618,6 +1618,8 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
         List<TeacherClassGroupDto> teacherMusicClassGroup;
         switch (type) {
             case "VIP": // VIP课
+                teacherMusicClassGroup = classGroupDao.findTeacherVipClassGroup(user.getId().longValue(), status, groupName, type);
+                break;
             case "LIVE": // 直播课
                 teacherMusicClassGroup = classGroupDao.findTeacherVipClassGroup(user.getId().longValue(), status, groupName, type);
                 break;

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

@@ -2892,8 +2892,11 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
 
                 Map<Integer, String> map = new HashMap<>(1);
                 map.put(userId, userId.toString());
-                sysMessageService.batchSendMessage(MessageSenderPluginContext.MessageSender.JIGUANG, messageTypeEnum, map, null, 0, "2", "STUDENT",
-                        vipGroup.getName());
+                String baseApiUrl = sysConfigDao.findConfigValue(SysConfigService.BASE_API_URL);
+
+                String pushUrl = baseApiUrl + "/#/myOrder";
+                sysMessageService.batchSendMessage(MessageSenderPluginContext.MessageSender.JIGUANG,
+                        messageTypeEnum, map, null, 0, "8?" + pushUrl, "STUDENT",vipGroup.getName());
                 try {
                     contractService.transferVipGroupCoursesContract(userId, vipGroup.getId(), order.getType());
                 } catch (Exception e) {

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

@@ -761,11 +761,11 @@
             s.name_ school_name_
         FROM
             vip_group vg
-            LEFT JOIN class_group cg ON vg.id_=cg.music_group_id_ AND cg.group_type_= #{groupType}
+            LEFT JOIN class_group cg ON vg.id_ = cg.music_group_id_ AND cg.group_type_= #{groupType}
             LEFT JOIN course_schedule cs ON cg.id_=cs.class_group_id_
             LEFT JOIN school s ON vg.teacher_school_id_ = s.id_
         WHERE
-            vg.user_id_ = #{teacherId}
+            vg.user_id_ = #{teacherId} AND cg.del_flag_ = 0
             <if test="status == null or status == ''">
                 AND vg.group_status_ != 7 AND (vg.group_status_ = 2 OR vg.group_status_ = 5)
             </if>

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

@@ -404,7 +404,7 @@
     <sql id="studentLiveGroupQueryCondition">
         <where>
             vg.audit_status_='PASS'
-            AND vg.group_status_ = 1 AND vg.group_type_ = 'VIP'
+            AND vg.group_status_ = 1 AND vg.group_type_ = 'LIVE'
             AND vg.courses_expire_date_ &gt;= DATE_FORMAT(NOW(),'%Y%m%d')
             AND vg.registration_start_time_ &lt;= NOW()
             AND vg.courses_start_date &gt; NOW()