update

mec-biz/src/main/java/com/ym/mec/biz/dal/enums/VipGroupStatusEnum.java

@@ -14,7 +14,8 @@ public enum VipGroupStatusEnum implements BaseEnum<Integer, VipGroupStatusEnum>
 	PROGRESS(2, "进行中"),
 	FINISHED(4, "已结束"),
 	CANCEL(3, "取消"),
-	PAUSE(6, "暂停");
+	PAUSE(6, "暂停"),
+	DELETE(7, "删除");
 
 	private Integer code;
 

mec-biz/src/main/java/com/ym/mec/biz/service/GroupClassService.java

@@ -11,31 +11,31 @@ import java.math.BigDecimal;
 public interface GroupClassService {
 
     /**
-     * @describe 删除团体信息
+     * @describe 删除课程组信息
      * @author Joburgess
      * @date 2020/2/17
-     * @param groupId: 团体编号
-     * @param groupType: 团体类型
+     * @param groupId: 课程组编号
+     * @param groupType: 课程组类型
      * @return boolean
      */
     boolean deleteAllGroupInfo(String groupId, GroupType groupType);
 
     /**
-     * @describe 删除团体信息
+     * @describe 删除课程组信息
      * @author Joburgess
      * @date 2020/2/17
-     * @param groupId: 团体编号
-     * @param groupType: 团体类型
+     * @param groupId: 课程组编号
+     * @param groupType: 课程组类型
      * @return boolean
      */
     boolean deleteGroupOtherInfo(String groupId, GroupType groupType);
 
     /**
-     * @describe 清理团体相关信息
+     * @describe 清理课程组相关信息
      * @author Joburgess
      * @date 2020/2/17
-     * @param groupId: 团体编号
-     * @param groupType: 团体类型
+     * @param groupId: 课程组编号
+     * @param groupType: 课程组类型
      * @return boolean
      */
     boolean cleanGroupInfo(String groupId, GroupType groupType);

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

@@ -471,15 +471,12 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
 		if(Objects.isNull(vipGroup)){
 			throw new BizException("课程组不存在");
 		}
-		if(!VipGroupStatusEnum.NOT_START.equals(vipGroup.getStatus())
-				&&!VipGroupStatusEnum.APPLYING.equals(vipGroup.getStatus())){
-			throw new BizException("此状态课程组不支持删除");
-		}
 		int totalCourseNum = courseScheduleDao.countTotalCourseScheduleNumWithGroup(vipGroupId.toString(), GroupType.VIP.getCode());
 		if(totalCourseNum>0){
 			throw new BizException("此状态课程组不支持删除");
 		}
-		groupClassService.deleteAllGroupInfo(vipGroupId.toString(), GroupType.VIP);
+		vipGroup.setStatus(VipGroupStatusEnum.DELETE);
+		vipGroupDao.update(vipGroup);
 	}
 
 	@Override
@@ -698,9 +695,7 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
 					}
 
 					if((Objects.isNull(aLong)||aLong<=0)
-							&&(allStudentNum<=0)
-							&&(VipGroupStatusEnum.NOT_START.equals(vipGroup.getStatus())
-							||VipGroupStatusEnum.APPLYING.equals(vipGroup.getStatus()))){
+							&&(classGroup.getStudentNum()<=0)){
 						vipGroup.setEnableDelete(1);
 					}
 

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

@@ -620,7 +620,7 @@
             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} AND (vg.group_status_ = 2 OR vg.group_status_ = 5)
+            vg.user_id_ = #{teacherId} AND vg.group_status_!=7 AND (vg.group_status_ = 2 OR vg.group_status_ = 5)
         GROUP BY
         vg.id_,cg.id_
     </select>

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

@@ -1542,7 +1542,7 @@
     <select id="queryMusicGroupIds" resultMap="com.ym.mec.biz.dal.dao.GroupDao.Group">
         SELECT DISTINCT cgsm.music_group_id_ group_id_,cgsm.group_type_ FROM class_group_student_mapper cgsm
         LEFT JOIN music_group mg ON mg.id_ = cgsm.music_group_id_ AND cgsm.group_type_ = 'MUSIC'
-        LEFT JOIN vip_group vg ON vg.id_ = cgsm.music_group_id_ AND cgsm.group_type_ = 'VIP'
+        LEFT JOIN vip_group vg ON vg.id_ = cgsm.music_group_id_ AND cgsm.group_type_ = 'VIP' AND vg.group_status_!=7
         LEFT JOIN practice_group pg ON pg.id_ = cgsm.music_group_id_ AND cgsm.group_type_ = 'PRACTICE'
         WHERE cgsm.user_id_ = #{userId} AND cgsm.status_ != 'QUIT'
         AND (mg.status_ = 'PROGRESS' OR vg.group_status_ = 2 OR vg.group_status_ = 4 OR (pg.id_ IS NOT NULL AND
@@ -1554,7 +1554,7 @@
         SELECT COUNT(DISTINCT cgsm.music_group_id_)
         FROM class_group_student_mapper cgsm
                  LEFT JOIN music_group mg ON mg.id_ = cgsm.music_group_id_ AND cgsm.group_type_ = 'MUSIC'
-                 LEFT JOIN vip_group vg ON vg.id_ = cgsm.music_group_id_ AND cgsm.group_type_ = 'VIP'
+                 LEFT JOIN vip_group vg ON vg.id_ = cgsm.music_group_id_ AND cgsm.group_type_ = 'VIP' AND vg.group_status_!=7
                  LEFT JOIN practice_group pg ON pg.id_ = cgsm.music_group_id_ AND cgsm.group_type_ = 'PRACTICE'
         WHERE cgsm.user_id_ = #{userId}
           AND cgsm.status_ != 'QUIT'
@@ -1563,7 +1563,7 @@
     <select id="queryMusicGroupIdsWithoutOverGroup" resultMap="com.ym.mec.biz.dal.dao.GroupDao.Group">
         SELECT DISTINCT spo.music_group_id_ group_id_,cgsm.group_type_ FROM student_payment_order spo
         LEFT JOIN class_group_student_mapper cgsm ON spo.music_group_id_ = cgsm.music_group_id_
-        LEFT JOIN vip_group vg ON vg.id_=spo.music_group_id_ AND spo.group_type_='VIP'
+        LEFT JOIN vip_group vg ON vg.id_=spo.music_group_id_ AND spo.group_type_='VIP' AND vg.group_status_!=7
         LEFT JOIN class_group cg ON cgsm.class_group_id_ = cg.id_
         WHERE spo.type_ != 'OTHER' AND spo.music_group_id_ IS NOT NULL
         AND spo.user_id_ = #{userId} AND spo.status_='SUCCESS' AND cgsm.status_ != 'QUIT'
@@ -1575,7 +1575,7 @@
         SELECT COUNT(DISTINCT spo.music_group_id_)
         FROM student_payment_order spo
                  LEFT JOIN class_group_student_mapper cgsm ON spo.music_group_id_ = cgsm.music_group_id_
-                 LEFT JOIN vip_group vg ON vg.id_ = spo.music_group_id_ AND spo.group_type_ = 'VIP'
+                 LEFT JOIN vip_group vg ON vg.id_ = spo.music_group_id_ AND spo.group_type_ = 'VIP' AND vg.group_status_!=7
                  LEFT JOIN class_group cg ON cgsm.class_group_id_ = cg.id_
         WHERE spo.type_ != 'OTHER'
           AND spo.music_group_id_ IS NOT NULL

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

@@ -164,7 +164,7 @@
     <sql id="vipGroupQueryCondition">
         <where>
             1=1
-            AND vg.audit_status_='PASS'
+            AND vg.audit_status_='PASS' AND vg.group_status_ != 7
             <if test="search!=null and search!=''">
                 AND (vg.name_ LIKE CONCAT('%',#{search},'%') OR vg.id_= #{search})
             </if>
@@ -323,6 +323,7 @@
         <where>
             vg.audit_status_='PASS'
             AND vg.group_status_=1
+            AND vg.group_status_!=7
             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()