用户名教师

mec-biz/src/main/java/com/ym/mec/biz/dal/dao/VipGroupDao.java

@@ -309,4 +309,12 @@ public interface VipGroupDao extends BaseDAO<Long, VipGroup> {
 	 * @return
 	 */
 	List<VipGroup> queryRequiredOverList();
+
+	/**
+	 * @describe 获取正常状态的vip课
+	 * @author Joburgess
+	 * @date 2019/12/3
+	 * @return java.util.List<com.ym.mec.biz.dal.entity.VipGroup>
+	 */
+	List<VipGroup> queryNormalStatusList();
 }

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

@@ -8,7 +8,12 @@ import com.ym.mec.common.enums.BaseEnum;
  */
 public enum VipGroupStatusEnum implements BaseEnum<Integer, VipGroupStatusEnum> {
 
-	NOT_START(0, "未开始"), APPLYING(1, "报名中"), PROGRESS(2, "进行中"), FINISHED(4, "已结束"), CANCEL(3, "取消");
+	NOT_START(0, "未开始"),
+	APPLYING(1, "报名中"),
+	APPLYING_END(5,"报名结束"),
+	PROGRESS(2, "进行中"),
+	FINISHED(4, "已结束"),
+	CANCEL(3, "取消");
 
 	private Integer code;
 

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

@@ -1690,6 +1690,26 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
 			}
 			vipGroupDao.batchUpdate(vipGroupList);
 		}
+		List<VipGroup> normalVipGroupList = vipGroupDao.queryNormalStatusList();
+		if (!CollectionUtils.isEmpty(normalVipGroupList)){
+            Date now = new Date();
+            for (VipGroup vipGroup : normalVipGroupList) {
+                if(now.before(vipGroup.getRegistrationStartTime())){
+                    vipGroup.setStatus(VipGroupStatusEnum.NOT_START);
+                }
+                if(vipGroup.getRegistrationStartTime().before(now)&&vipGroup.getCoursesExpireDate().after(now)){
+                    vipGroup.setStatus(VipGroupStatusEnum.APPLYING);
+                }
+                if(vipGroup.getCoursesExpireDate().before(now)&&vipGroup.getCourseStartDate().after(now)){
+                    vipGroup.setStatus(VipGroupStatusEnum.APPLYING_END);
+                }
+                if(vipGroup.getCourseStartDate().before(now)&&vipGroup.getCoursesExpireDate().after(now)){
+                    vipGroup.setStatus(VipGroupStatusEnum.PROGRESS);
+                }
+                vipGroup.setUpdateTime(now);
+            }
+            vipGroupDao.batchUpdate(vipGroupList);
+        }
 	}
 
 	@Override

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

@@ -869,4 +869,7 @@
     <select id="queryRequiredOverList" resultMap="VipGroup">
     	select vg.* from vip_group vg left join class_group cg on vg.id_ = cg.music_group_id_ where vg.status_ = 2 and cg.total_class_times_ = cg.current_class_times_ and cg.total_class_times_ &gt; 0
     </select>
+    <select id="queryNormalStatusList" resultMap="VipGroup">
+        SELECT * FROM vip_group WHERE status_!=3 AND status_!=4
+    </select>
 </mapper>