Merge remote-tracking branch 'origin/master'

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

@@ -1885,6 +1885,14 @@ public interface CourseScheduleDao extends BaseDAO<Long, CourseSchedule> {
      */
     List<Map<Integer, Long>> countPreSubMinutesByClassGroupId(@Param("classGroupSet") List<Integer> classGroupSet, @Param("courseDetailId") Integer courseDetailId);
 
+
+    /**
+     * 获取班级最大已排课时长
+     * @param classGroupSet
+     * @return
+     */
+    List<Map<Integer, Integer>> countPreMinutesByClassGroupId(@Param("classGroupSet") List<Integer> classGroupSet, @Param("courseDetailId") Integer courseDetailId);
+
     /**
      * 获取进行中或已结束的预排课课程
      * @param musicGroupId

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

@@ -230,4 +230,11 @@ public interface StudentDao extends com.ym.mec.common.dal.BaseDAO<Integer, Stude
      * @return
      */
     int getMemberNum(@Param("studentIdsStr") String studentIdsStr);
+
+    /**
+     * 会员结束前15天提醒学员续费
+     * @param pushMemberRenew
+     * @return
+     */
+    List<Integer> queryPushMemberRenew(String pushMemberRenew);
 }

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

@@ -603,32 +603,32 @@ public interface StudentRegistrationDao extends BaseDAO<Long, StudentRegistratio
     int getFirstPayNum(@Param("musicGroupId") String musicGroupId, @Param("startTime") Date startTime, @Param("endTime") Date endTime);
 
     /**
-     * 获取报名缴费的相关人数
-     *
-     * @param musicGroupIds
+     * 获取不在指定班级类型的学员列表
+     * @param musicGroupId
      * @return
      */
-    List<MusicGroupRegAndMoneyDto> getRegisters(@Param("musicGroupIds") List<String> musicGroupIds);
+    String getNotClassName(@Param("musicGroupId") String musicGroupId);
 
     /**
-     * 获取已缴费审核中的人数
+     * 是否有其他会员收费团
      * @param musicGroupId
+     * @param userId
      * @return
      */
-    int countPayAndCheckNum(@Param("musicGroupId") String musicGroupId);
+    boolean checkHasMemberGroup(@Param("musicGroupId") String musicGroupId, @Param("userId") Integer userId);
 
     /**
-     * 获取不在班的学员列表
-     * @param musicGroupId
+     * 获取报名缴费的相关人数
+     *
+     * @param musicGroupIds
      * @return
      */
-    String getNotClassName(@Param("musicGroupId") String musicGroupId);
+    List<MusicGroupRegAndMoneyDto> getRegisters(@Param("musicGroupIds") List<String> musicGroupIds);
 
     /**
-     * 是否有其他会员收费团
+     * 获取已缴费审核中的人数
      * @param musicGroupId
-     * @param userId
      * @return
      */
-    boolean checkHasMemberGroup(@Param("musicGroupId") String musicGroupId, @Param("userId") Integer userId);
+    int countPayAndCheckNum(@Param("musicGroupId") String musicGroupId);
 }

mec-biz/src/main/java/com/ym/mec/biz/dal/dto/ClassGroupTeachersDto.java

@@ -27,6 +27,17 @@ public class ClassGroupTeachersDto extends ClassGroup {
 	/** 剩余可排课时长 */
 	private Integer preSubMinutes;
 
+	/** 已排课时长 */
+	private Integer preMinutes;
+
+	public Integer getPreMinutes() {
+		return preMinutes;
+	}
+
+	public void setPreMinutes(Integer preMinutes) {
+		this.preMinutes = preMinutes;
+	}
+
 	public Integer getPreSubMinutes() {
 		return preSubMinutes;
 	}

mec-biz/src/main/java/com/ym/mec/biz/dal/entity/CourseSchedule.java

@@ -183,8 +183,19 @@ public class CourseSchedule {
 	private Integer preCourseFlag = 0;
 
 	//课程调整不的超过该时间限制
+	private Date validStartTime;
+
+	//课程调整不的超过该时间限制
 	private Date validEndTime;
 
+	public Date getValidStartTime() {
+		return validStartTime;
+	}
+
+	public void setValidStartTime(Date validStartTime) {
+		this.validStartTime = validStartTime;
+	}
+
 	public Date getValidEndTime() {
 		return validEndTime;
 	}

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

@@ -5,6 +5,8 @@ import com.ym.mec.common.enums.BaseEnum;
 public enum MessageTypeEnum implements BaseEnum<String, MessageTypeEnum> {
     SMS_APPLY_MESSAGE("SMS_APPLY_MESSAGE", "报名通知"),
     REMIND_EDUCATION_COURSE_TIME("REMIND_EDUCATION_COURSE_TIME", "排课提醒"),
+    STUDENT_MEMBER_RENEW_MESSAGE("STUDENT_MEMBER_RENEW_MESSAGE", "会员续费提醒"),
+    STUDENT_MEMBER_RENEW_QUIT_MESSAGE("STUDENT_MEMBER_RENEW_QUIT_MESSAGE", "会员续费提醒"),
     SMS_VERIFY_CODE_LOGIN("SMS_VERIFY_CODE_LOGIN", "验证码登录"),
     KAPTCHA_SESSION_KEY("KAPTCHA_SESSION_KEY", "登录图形验证码"),
     SMS_PAYMENT_MESSAGE("SMS_PAYMENT_MESSAGE", "缴费通知"),

mec-biz/src/main/java/com/ym/mec/biz/dal/page/StudentManageQueryInfo.java

@@ -46,6 +46,17 @@ public class StudentManageQueryInfo extends QueryInfo {
 
     private Integer comeOnPackage;
 
+    //是否有会员
+    private Integer hasMember;
+
+    public Integer getHasMember() {
+        return hasMember;
+    }
+
+    public void setHasMember(Integer hasMember) {
+        this.hasMember = hasMember;
+    }
+
     private Integer subjectId;
 
     private String activityCourseType;
@@ -74,17 +85,6 @@ public class StudentManageQueryInfo extends QueryInfo {
         this.activityCourseType = activityCourseType;
     }
 
-    //是否有会员
-    private Integer hasMember;
-
-    public Integer getHasMember() {
-        return hasMember;
-    }
-
-    public void setHasMember(Integer hasMember) {
-        this.hasMember = hasMember;
-    }
-
     public Integer getCarePackage() {
         return carePackage;
     }

mec-biz/src/main/java/com/ym/mec/biz/handler/WebSocketHandler.java

@@ -193,7 +193,7 @@ public class WebSocketHandler extends AbstractWebSocketHandler {
             randomAccessFile.close();
             userSoundInfoMap.get(phone).setAccessFile(null);
         }
-        userSoundInfoMap.get(phone).setRecordMeasurePithInfo(null);
+//        userSoundInfoMap.get(phone).setRecordMeasurePithInfo(null);
         LOGGER.info("评分数据：{}", JSON.toJSONString(userSoundInfoMap.get(phone)));
         userSoundInfoMap.remove(phone);
     }

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

@@ -10,5 +10,5 @@ public interface MusicGroupSchoolTermCourseDetailService extends BaseService<Int
 
     HttpResponseResult upset(MusicGroupSchoolTermCourseDetail musicGroupSchoolTermCourseDetail);
 
-    HttpResponseResult musicSchoolTermPush();
+    void musicSchoolTermPush();
 }

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

@@ -213,11 +213,17 @@ public interface SysConfigService extends BaseService<Long, SysConfig> {
 
     String WARNING_MIN_COURSE_SALARY = "warning_min_course_salary";
 
-    String CHILDREN_DAY_VIP_ACTIVITY_IDS = "children_day_vip_activity_ids";
-
     //提醒乐团主管排下学期的课程的时间节点（默认提前14天）
     String REMIND_COURSE_TIME = "remind_course_time";
 
+    //会员结束前15天提醒学员续费（默认提前15天）
+    String PUSH_MEMBER_RENEW = "push_member_renew";
+
+    //会员结束前5天提醒学员续费(退团提醒)（默认提前15天）
+    String PUSH_MEMBER_RENEW_QUIT = "push_member_renew_quit";
+
+    String CHILDREN_DAY_VIP_ACTIVITY_IDS = "children_day_vip_activity_ids";
+
     /**
      * @return com.ym.mec.biz.dal.entity.SysConfig
      * @params paramName

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

@@ -2701,6 +2701,7 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
             courseScheduleStudentPaymentDao.deleteByCourseSchedule(courseScheduleIds);
             courseScheduleTeacherSalaryDao.batchDeleteByCourseScheduleIds(courseScheduleIds);
             courseScheduleDao.deleteCourseSchedulesByClassGroupIds(courseScheduleIds);
+            musicGroupSchoolTermCourseDetailDao.delete(musicGroupSchoolTermCourseDetailId);
         }else {
             List<CourseSchedule> courseSchedules = courseScheduleDao.queryPreCourseListByClassGroupId(classGroupId);
             if(courseSchedules.size() == 0){
@@ -2946,6 +2947,7 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
                     courseSchedule.setPreCourseFlag(1);
                     courseSchedule.setMemberFlag(1);
                     courseSchedule.setValidEndTime(schoolTermCourseDetail.getEndSchoolTerm());
+                    courseSchedule.setValidStartTime(schoolTermCourseDetail.getStartSchoolTerm());
                     courseScheduleDao.insert(courseSchedule);
                     courseScheduleList.add(courseSchedule);
 
@@ -3489,9 +3491,11 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
         MusicGroupSchoolTermCourseDetail termCourseDetail = musicGroupSchoolTermCourseDetailDao.findByCourseDateAndMusicGroupId(musicGroupId, null,0);
         Map<Integer, Long> preTotalNumMap = null;
         Map<Integer, Long> preSubMinutesMap = null;
+        Map<Integer, Integer> preMinutesMap = null;
         if(termCourseDetail != null){
             preTotalNumMap = MapUtil.convertIntegerMap(courseScheduleDao.countPreTotalNumByClassGroupId(classGroupSet));
             preSubMinutesMap = MapUtil.convertIntegerMap(courseScheduleDao.countPreSubMinutesByClassGroupId(classGroupSet,termCourseDetail.getId()));
+            preMinutesMap = MapUtil.convertIntegerMap(courseScheduleDao.countPreMinutesByClassGroupId(classGroupSet,termCourseDetail.getId()));
         }
         Map<Integer, Long> currentNumMap = MapUtil.convertIntegerMap(courseScheduleDao.countExpendNumByClassGroupId(classGroupSet));
 
@@ -3511,6 +3515,11 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
                     classGroup.setPreSubMinutes(aLong==null?0:aLong.intValue());
                 }
             }
+            if(preMinutesMap != null){
+                if (preMinutesMap.containsKey(classGroup.getId())) {
+                    classGroup.setPreMinutes(preMinutesMap.get(classGroup.getId()));
+                }
+            }
             if(preTotalNumMap != null){
                 if (preTotalNumMap.containsKey(classGroup.getId())) {
                     Long aLong = preTotalNumMap.get(classGroup.getId());

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

@@ -1919,6 +1919,11 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
 							throw new BizException("操作失败：不允许跨学期调整");
 						}
 					}
+					if(preCourseSchedule.getValidStartTime() != null){
+						if(preCourseSchedule.getValidStartTime().compareTo(preCourseSchedule.getClassDate()) > 0){
+							throw new BizException("操作失败：不允许跨学期调整");
+						}
+					}
                     for (CourseSchedule backCourseSchedule : existClassDateCourses) {
 
                         //判断前后两节课是否存在冲突
@@ -3376,7 +3381,8 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
                 newCourseSchedule.setGroupType(oldCourseSchedule.getGroupType());
             }
 			newCourseSchedule.setValidEndTime(oldCourseSchedule.getValidEndTime());
-            
+			newCourseSchedule.setValidStartTime(oldCourseSchedule.getValidStartTime());
+
             //课程是否已结算
             int settlementNum = courseScheduleTeacherSalaryDao.checkCourseIsSettlement(oldCourseSchedule.getId().intValue());
             if (settlementNum > 0) {
@@ -3498,6 +3504,11 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
 					throw new BizException("操作失败：不允许跨学期调整");
 				}
 			}
+			if(newCourseSchedule.getValidStartTime() != null){
+				if(newCourseSchedule.getValidStartTime().compareTo(newCourseSchedule.getClassDate()) > 0){
+					throw new BizException("操作失败：不允许跨学期调整");
+				}
+			}
 
 			if(newCourseSchedule.getStartClassTime().compareTo(date)<0){
 				throw new BizException("调整无效,不能调整至已结束");

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

@@ -260,6 +260,15 @@ public class MemberRankSettingServiceImpl extends BaseServiceImpl<Integer, Membe
 			throw new BizException("学员信息不存在");
 		}
 		
+		//查询原定的是否已处理
+		StudentPaymentOrder orignStudentPaymentOrder = studentPaymentOrderService.get(studentPaymentOrder.getId());
+		if(orignStudentPaymentOrder == null){
+			return false;
+		}
+		if(orignStudentPaymentOrder.getStatus() != DealStatusEnum.ING || orignStudentPaymentOrder.getStatus() != DealStatusEnum.WAIT_PAY){
+			return false;
+		}
+		
 		Date nowDate = new Date();
 		// 更新订单信息
 		studentPaymentOrder.setUpdateTime(nowDate);

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

@@ -54,6 +54,8 @@ public class MusicGroupSchoolTermCourseDetailServiceImpl extends BaseServiceImpl
 	private SysMessageService sysMessageService;
 	@Autowired
 	private TeacherDao teacherDao;
+	@Autowired
+	private StudentDao studentDao;
 
 	@Override
 	public BaseDAO<Integer, MusicGroupSchoolTermCourseDetail> getDAO() {
@@ -77,7 +79,7 @@ public class MusicGroupSchoolTermCourseDetailServiceImpl extends BaseServiceImpl
 		//校验当前乐团是否所有学员都在班
 		String notClassName = studentRegistrationDao.getNotClassName(musicGroupId);
 		if(StringUtils.isNotEmpty(notClassName)){
-			throw new BizException("操作失败：{} 学员未在任何班级",notClassName);
+			throw new BizException("操作失败：{} 学员未在以下任何班级",notClassName);
 		}
 		MusicGroupSchoolTermCourseDetail courseDetail = musicGroupSchoolTermCourseDetailDao.
 				findByCourseDateAndMusicGroupId(musicGroupId,null,0);
@@ -151,7 +153,7 @@ public class MusicGroupSchoolTermCourseDetailServiceImpl extends BaseServiceImpl
 	}
 
 	@Override
-	public HttpResponseResult musicSchoolTermPush() {
+	public void musicSchoolTermPush() {
 		String remindCourseTime = sysConfigDao.findConfigValue(SysConfigService.REMIND_COURSE_TIME);
 		if(StringUtils.isEmpty(remindCourseTime)){
 			remindCourseTime = "14";
@@ -161,10 +163,10 @@ public class MusicGroupSchoolTermCourseDetailServiceImpl extends BaseServiceImpl
 		if(musicGroupIds.size() > 0){
 			List<MusicGroup> musicGroupList = musicGroupDao.getMusicGroupByIds(musicGroupIds);
 			List<Integer> educationIds = musicGroupList.stream().map(e -> e.getEducationalTeacherId()).collect(Collectors.toList());
-			Map<Integer, String> educationNameMap = MapUtil.convertMybatisMap(teacherDao.queryNameByIdList(educationIds));
+			Map<Integer, String> educationPhoneMap = MapUtil.convertMybatisMap(teacherDao.queryPhoneByIds(StringUtils.join(educationIds,",")));
 			for (MusicGroup musicGroup : musicGroupList) {
 				Map<Integer,String> userMap = new HashMap<>(1);
-				userMap.put(musicGroup.getEducationalTeacherId(),educationNameMap.get(musicGroup.getEducationalTeacherId()));
+				userMap.put(musicGroup.getEducationalTeacherId(),educationPhoneMap.get(musicGroup.getEducationalTeacherId()));
 				sysMessageService.batchSendMessage(MessageSenderPluginContext.MessageSender.AWSMS,
 						MessageTypeEnum.REMIND_EDUCATION_COURSE_TIME,
 						userMap,
@@ -173,9 +175,11 @@ public class MusicGroupSchoolTermCourseDetailServiceImpl extends BaseServiceImpl
 						null,
 						null,
 						musicGroup.getName());
+				Map<Integer,String> userMap1 = new HashMap<>(1);
+				userMap1.put(musicGroup.getEducationalTeacherId(),musicGroup.getEducationalTeacherId().toString());
 				sysMessageService.batchSendMessage(MessageSenderPluginContext.MessageSender.JIGUANG,
 						MessageTypeEnum.REMIND_EDUCATION_COURSE_TIME,
-						userMap,
+						userMap1,
 						null,
 						0,
 						null,
@@ -183,7 +187,66 @@ public class MusicGroupSchoolTermCourseDetailServiceImpl extends BaseServiceImpl
 						musicGroup.getName());
 			}
 		}
-		return null;
+		//会员结束前15天提醒学员续费
+		String pushMemberRenew = sysConfigDao.findConfigValue(SysConfigService.PUSH_MEMBER_RENEW);
+		if(StringUtils.isEmpty(pushMemberRenew)){
+			pushMemberRenew = "15";
+		}
+		List<Integer> studentIds = studentDao.queryPushMemberRenew(pushMemberRenew);
+		if(studentIds.size() > 0){
+			Map<Integer, String> studentPhoneMap = MapUtil.convertMybatisMap(teacherDao.queryPhoneByIds(StringUtils.join(studentIds,",")));
+			Map<Integer,String> userMap = new HashMap<>(studentIds.size());
+			Map<Integer,String> userMap1 = new HashMap<>(studentIds.size());
+			for (Integer studentId : studentIds) {
+				userMap.put(studentId,studentPhoneMap.get(studentId));
+				userMap1.put(studentId,studentId.toString());
+			}
+			sysMessageService.batchSendMessage(MessageSenderPluginContext.MessageSender.AWSMS,
+					MessageTypeEnum.STUDENT_MEMBER_RENEW_MESSAGE,
+					userMap,
+					null,
+					0,
+					null,
+					null);
+
+			sysMessageService.batchSendMessage(MessageSenderPluginContext.MessageSender.JIGUANG,
+					MessageTypeEnum.STUDENT_MEMBER_RENEW_MESSAGE,
+					userMap1,
+					null,
+					0,
+					null,
+					"STUDENT");
+		}
+		//会员结束前15天提醒学员续费(退团提醒)
+		String pushMemberRenewQuit = sysConfigDao.findConfigValue(SysConfigService.PUSH_MEMBER_RENEW_QUIT);
+		if(StringUtils.isEmpty(pushMemberRenewQuit)){
+			pushMemberRenewQuit = "5";
+		}
+		List<Integer> studentIdList = studentDao.queryPushMemberRenew(pushMemberRenewQuit);
+		if(studentIdList.size() > 0){
+			Map<Integer, String> studentPhoneMap = MapUtil.convertMybatisMap(teacherDao.queryPhoneByIds(StringUtils.join(studentIdList,",")));
+			Map<Integer,String> userMap = new HashMap<>(studentIdList.size());
+			Map<Integer,String> userMap1 = new HashMap<>(studentIdList.size());
+			for (Integer studentId : studentIdList) {
+				userMap.put(studentId,studentPhoneMap.get(studentId));
+				userMap1.put(studentId,studentId.toString());
+			}
+			sysMessageService.batchSendMessage(MessageSenderPluginContext.MessageSender.AWSMS,
+					MessageTypeEnum.STUDENT_MEMBER_RENEW_QUIT_MESSAGE,
+					userMap,
+					null,
+					0,
+					null,
+					null);
+
+			sysMessageService.batchSendMessage(MessageSenderPluginContext.MessageSender.JIGUANG,
+					MessageTypeEnum.STUDENT_MEMBER_RENEW_QUIT_MESSAGE,
+					userMap1,
+					null,
+					0,
+					null,
+					"STUDENT");
+		}
 	}
 
 	private MusicGroupSchoolTermCourseDetail getCourseDetail(MusicGroupSchoolTermCourseDetail courseDetail){
@@ -193,13 +256,18 @@ public class MusicGroupSchoolTermCourseDetailServiceImpl extends BaseServiceImpl
 		String year = DateUtil.getYear(startCourseDate);
 		if(month >= 9 || month <= 2){
 			if(month >= 9){
+				courseDetail.setStartSchoolTerm(DateUtil.getLastDayOfMonth(DateUtil.stringToDate(year + "-09-01 00:00:00")));
 				year = DateUtil.getYear(DateUtil.addYears(startCourseDate, 1));
+			}else {
+				String year1 = DateUtil.getYear(DateUtil.addYears(startCourseDate, -1));
+				courseDetail.setStartSchoolTerm(DateUtil.getLastDayOfMonth(DateUtil.stringToDate(year1 + "-09-01 00:00:00")));
 			}
 			courseDetail.setEndSchoolTerm(DateUtil.getLastDayOfMonth(DateUtil.stringToDate(year + "-02-01 00:00:00")));
 		}else {
+			courseDetail.setStartSchoolTerm(DateUtil.getLastDayOfMonth(DateUtil.stringToDate(year + "-03-01 00:00:00")));
 			courseDetail.setEndSchoolTerm(DateUtil.stringToDate(year + "-08-31 00:00:00"));
 		}
-		courseDetail.setStartSchoolTerm(startCourseDate);
+//		courseDetail.setStartSchoolTerm(startCourseDate);
 		//计算可排课时长
 //		int week = LocalDateTime.ofInstant(startCourseDate.toInstant(),DateUtil.zoneId).getDayOfWeek().getValue();
 		int week = DateUtil.date2Week1(startCourseDate);

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

@@ -26,9 +26,6 @@ import com.ym.mec.biz.dal.dto.PageInfoOrder;
 import com.ym.mec.biz.dal.dto.SporadicChargeInfoDto;
 import com.ym.mec.biz.dal.dto.StudentPaymentOrderDto;
 import com.ym.mec.biz.dal.dto.StudentPaymentOrderExportDto;
-import com.ym.mec.biz.dal.entity.Goods;
-import com.ym.mec.biz.dal.entity.StudentPaymentOrder;
-import com.ym.mec.biz.dal.entity.StudentPaymentRouteOrder;
 import com.ym.mec.biz.dal.enums.DealStatusEnum;
 import com.ym.mec.biz.dal.enums.GroupType;
 import com.ym.mec.biz.dal.enums.OrderDetailTypeEnum;

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

@@ -2289,7 +2289,7 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
 			return;
 		}
 
-		if(studentPaymentOrder.getStatus().equals(DealStatusEnum.SUCCESS)){
+		if(!studentPaymentOrder.getStatus().equals(DealStatusEnum.ING)){
 			return;
 		}
 

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

@@ -39,6 +39,7 @@
         <result column="member_flag_" property="memberFlag"/>
         <result column="pre_course_flag_" property="preCourseFlag"/>
         <result column="valid_end_time_" property="validEndTime"/>
+        <result column="valid_start_time_" property="validStartTime"/>
     </resultMap>
 
     <resultMap type="com.ym.mec.biz.dal.dto.Mapper" id="Mapper">
@@ -163,6 +164,7 @@
         cs.new_course_id_,
         cs.member_flag_,
         cs.valid_end_time_,
+        cs.valid_start_time_,
         cs.pre_course_flag_
     </sql>
 
@@ -186,13 +188,13 @@
         INSERT INTO course_schedule
         (group_type_,music_group_id_,class_group_id_,status_,subsidy_,class_date_,start_class_time_,end_class_time_,
         teacher_id_,actual_teacher_id_,create_time_,update_time_,type_,name_,teach_mode_,student_num_,leave_student_num_,
-        schoole_id_,is_lock_,note_,teaching_content_,organ_id_,member_flag_,pre_course_flag_,valid_end_time_)
+        schoole_id_,is_lock_,note_,teaching_content_,organ_id_,member_flag_,pre_course_flag_,valid_end_time_,valid_start_time_)
         VALUES(#{groupType,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{musicGroupId},#{classGroupId},
         #{status,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{subsidy},#{classDate},#{startClassTime},
         #{endClassTime},#{teacherId},#{teacherId},now(),now(),
         #{type,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{name},
         #{teachMode,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{studentNum},#{leaveStudentNum},
-        #{schoolId},#{isLock},#{note},#{teachingContent},#{organId},#{memberFlag},#{preCourseFlag},#{validEndTime})
+        #{schoolId},#{isLock},#{note},#{teachingContent},#{organId},#{memberFlag},#{preCourseFlag},#{validEndTime},#{validStartTime})
     </insert>
 
     <insert id="batchAddCourseSchedules" parameterType="java.util.List" useGeneratedKeys="true" keyColumn="id"
@@ -200,7 +202,7 @@
         INSERT INTO course_schedule
         (group_type_,music_group_id_,class_group_id_,status_,subsidy_,class_date_,start_class_time_,end_class_time_,
         teacher_id_,actual_teacher_id_,create_time_,update_time_,type_,name_,teach_mode_,student_num_,leave_student_num_,
-        schoole_id_,is_lock_,note_,teaching_content_,organ_id_,member_flag_,pre_course_flag_,valid_end_time_)
+        schoole_id_,is_lock_,note_,teaching_content_,organ_id_,member_flag_,pre_course_flag_,valid_end_time_,valid_start_time_)
         VALUE
         <foreach collection="list" item="course" separator=",">
             (#{course.groupType,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{course.musicGroupId},
@@ -209,7 +211,7 @@
             #{course.teacherId},now(),now(),#{course.type,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},
             #{course.name},#{course.teachMode,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{course.studentNum},
             #{course.leaveStudentNum},#{course.schoolId},#{course.isLock},#{course.note},#{course.teachingContent},
-            #{course.organId},#{course.memberFlag},#{course.preCourseFlag},#{course.validEndTime})
+            #{course.organId},#{course.memberFlag},#{course.preCourseFlag},#{course.validEndTime},#{course.validStartTime})
         </foreach>
     </insert>
 
@@ -220,6 +222,9 @@
             <if test="validEndTime != null">
                 valid_end_time_ = #{validEndTime},
             </if>
+            <if test="validStartTime != null">
+                valid_start_time_ = #{validStartTime},
+            </if>
             <if test="preCourseFlag != null">
                 pre_course_flag_ = #{preCourseFlag},
             </if>
@@ -3796,8 +3801,7 @@
         <foreach collection="ids" item="id" open="(" close=")" separator=",">
             #{id}
         </foreach>
-        AND group_type_='MUSIC'
-        AND status_ IN ('UNDERWAY','OVER')
+        AND group_type_='MUSIC' AND DATE_FORMAT(NOW(),'%Y-%m-%d') >= class_date_
         GROUP BY music_group_id_
     </select>
 
@@ -3910,6 +3914,17 @@
         AND mgst.music_group_school_term_course_detail_id_ = #{courseDetailId}
         GROUP BY cgsm.class_group_id_
     </select>
+    <select id="countPreMinutesByClassGroupId" resultType="java.util.Map">
+        SELECT cgsm.class_group_id_ 'key',MAX(mgst.pre_member_course_minutes_) 'value'
+        FROM class_group_student_mapper cgsm
+        LEFT JOIN music_group_school_term_student_course_detail mgst ON mgst.user_id_ = cgsm.user_id_
+        WHERE cgsm.class_group_id_ IN
+        <foreach collection="classGroupSet" open="(" close=")" item="classGroupId" separator=",">
+            #{classGroupId}
+        </foreach>
+        AND mgst.music_group_school_term_course_detail_id_ = #{courseDetailId}
+        GROUP BY cgsm.class_group_id_
+    </select>
     <select id="queryOverPreCourseListByMusicGroupId" resultType="int">
         SELECT count(id_) FROM course_schedule WHERE music_group_id_ = #{musicGroupId} AND group_type_ = 'MUSIC' AND is_lock_ = 1 AND pre_course_flag_ = 1
                                         AND CONCAT(class_date_,' ', start_class_time_) &lt;= NOW()

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

@@ -22,10 +22,10 @@
         <result column="current_grade_num_" property="currentGradeNum"/>
         <result column="current_class_" property="currentClass"/>
         <result column="cooperation_organ_id_" property="cooperationOrganId"/>
-        <result column="activity_course_detail_" property="activityCourseDetail"/>
         <result column="member_rank_setting_id_" property="memberRankSettingId"/>
         <result column="membership_start_time_" property="membershipStartTime"/>
         <result column="membership_end_time_" property="membershipEndTime"/>
+        <result column="activity_course_detail_" property="activityCourseDetail"/>
     </resultMap>
 
     <!-- 根据主键查询一条记录 -->
@@ -124,9 +124,6 @@
             <if test="currentClass != null">
                 current_class_=#{currentClass},
             </if>
-            <if test="activityCourseDetail != null">
-                activity_course_detail_=#{activityCourseDetail},
-            </if>
             <if test="memberRankSettingId != null">
                 member_rank_setting_id_=#{memberRankSettingId},
             </if>
@@ -136,6 +133,9 @@
             <if test="membershipEndTime != null">
                 membership_end_time_=#{membershipEndTime},
             </if>
+            <if test="activityCourseDetail != null">
+                activity_course_detail_=#{activityCourseDetail},
+            </if>
                 cooperation_organ_id_=#{cooperationOrganId},
                 update_time_ = NOW()
         </set>
@@ -734,6 +734,9 @@
     <select id="getMemberNum" resultType="int">
         SELECT COUNT(0) FROM student WHERE member_rank_setting_id_ IS NOT NULL AND FIND_IN_SET(user_id_,#{studentIdsStr})
     </select>
+    <select id="queryPushMemberRenew" resultType="java.lang.Integer">
+        SELECT user_id_ FROM student WHERE DATEDIFF(membership_end_time_,NOW()) = #{pushMemberRenew};
+    </select>
 
     <update id="updateGrade"><![CDATA[
         UPDATE student SET current_grade_num_=current_grade_num_+1

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

@@ -1502,7 +1502,15 @@
         SELECT GROUP_CONCAT(DISTINCT su.username_) FROM student_registration sr
         LEFT JOIN sys_user su ON su.id_ = sr.user_id_
         WHERE sr.music_group_id_ = #{musicGroupId} AND sr.music_group_status_ = 'NORMAL'
-        AND sr.user_id_ NOT IN (SELECT DISTINCT user_id_ FROM class_group_student_mapper WHERE music_group_id_ = #{musicGroupId} AND group_type_ = 'MUSIC' AND status_ != 'QUIT')
+        AND sr.user_id_ NOT IN (SELECT DISTINCT cgsm.user_id_ FROM class_group_student_mapper cgsm
+        LEFT JOIN class_group cg ON cg.id_ = cgsm.class_group_id_
+        WHERE cgsm.music_group_id_ = #{musicGroupId} AND cgsm.group_type_ = 'MUSIC'
+        AND cgsm.status_ != 'QUIT' AND cg.del_flag_ = 0 AND cg.type_ IN ('SNAP','NORMAL','MIX'))
+    </select>
+    <select id="checkHasMemberGroup" resultType="java.lang.Boolean">
+        SELECT COUNT(sr.id_) > 0 FROM student_registration sr
+        LEFT JOIN music_group mg ON mg.id_ = sr.music_group_id_
+        WHERE sr.music_group_id_ != #{musicGroupId} AND sr.music_group_status_ != 'QUIT' AND sr.user_id_ = #{userId} AND mg.course_view_type_ = 1
     </select>
 
     <!-- 获取报名相关数据 -->
@@ -1526,9 +1534,4 @@
           AND paying_status_ = 2
           AND music_group_status_ = 'NORMAL'
     </select>
-    <select id="checkHasMemberGroup" resultType="java.lang.Boolean">
-        SELECT COUNT(sr.id_) > 0 FROM student_registration sr
-        LEFT JOIN music_group mg ON mg.id_ = sr.music_group_id_
-        WHERE sr.music_group_id_ != #{musicGroupId} AND sr.music_group_status_ != 'QUIT' AND sr.user_id_ = #{userId} AND mg.course_view_type_ = 1
-    </select>
 </mapper>

mec-client-api/src/main/java/com/ym/mec/task/TaskRemoteService.java

@@ -205,6 +205,6 @@ public interface TaskRemoteService {
 	void autoCleanPreCourseTask();
 
 	//每天10点推送排课、续费、退团提醒
-	@GetMapping("task/autoCleanPreCourseTask")
+	@GetMapping("task/musicSchoolTermPush")
     void musicSchoolTermPush();
 }

mec-student/src/main/java/com/ym/mec/student/controller/StudentOrderController.java

@@ -1,5 +1,47 @@
 package com.ym.mec.student.controller;
 
+import com.ym.mec.biz.dal.enums.CourseViewTypeEnum;
+import com.ym.mec.biz.dal.page.StudentPaymentOrderQueryInfo;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+
+import java.io.IOException;
+import java.math.BigDecimal;
+import java.net.URLEncoder;
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Calendar;
+import java.util.Comparator;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import java.util.stream.Collectors;
+
+import javax.servlet.http.HttpServletResponse;
+
+import org.apache.commons.lang3.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.http.HttpStatus;
+import org.springframework.scheduling.annotation.EnableScheduling;
+import org.springframework.util.CollectionUtils;
+import org.springframework.util.DigestUtils;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.ModelAttribute;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.ym.mec.auth.api.client.SysUserFeignService;
@@ -11,8 +53,8 @@ import com.ym.mec.biz.dal.enums.CourseViewTypeEnum;
 import com.ym.mec.biz.dal.enums.DealStatusEnum;
 import com.ym.mec.biz.dal.enums.GroupType;
 import com.ym.mec.biz.dal.enums.OrderTypeEnum;
-import com.ym.mec.biz.dal.page.StudentPaymentOrderQueryInfo;
 import com.ym.mec.biz.service.*;
+import com.ym.mec.biz.dal.page.StudentPaymentOrderQueryInfo;
 import com.ym.mec.common.controller.BaseController;
 import com.ym.mec.common.entity.HttpResponseResult;
 import com.ym.mec.common.page.PageInfo;
@@ -86,11 +128,16 @@ public class StudentOrderController extends BaseController {
     private ReplacementInstrumentActivityDao replacementInstrumentActivityDao;
     @Autowired
     private ChildrenDayDegreeDetailDao childrenDayDegreeDetailDao;
+
     @Autowired
     private CloudTeacherOrderService cloudTeacherOrderService;
     @Autowired
     private StudentRegistrationDao studentRegistrationDao;
 
+	@Autowired
+	private MemberRankPrivilegesService memberRankPrivilegesService;
+
+
     @Value("${spring.profiles.active:dev}")
     private String profiles;
 

mec-web/src/main/java/com/ym/mec/web/controller/MusicGroupSchoolTermCourseDetailController.java

@@ -26,10 +26,4 @@ public class MusicGroupSchoolTermCourseDetailController extends BaseController {
 	public HttpResponseResult upset(MusicGroupSchoolTermCourseDetail musicGroupSchoolTermCourseDetail) {
 		return musicGroupSchoolTermCourseDetailService.upset(musicGroupSchoolTermCourseDetail);
 	}
-
-	@ApiOperation("每天10点推送排课、续费、退团提醒")
-	@GetMapping(value = "musicSchoolTermPush")
-	public HttpResponseResult musicSchoolTermPush() {
-		return musicGroupSchoolTermCourseDetailService.musicSchoolTermPush();
-	}
 }

mec-web/src/main/java/com/ym/mec/web/controller/TaskController.java

@@ -1,16 +1,18 @@
 package com.ym.mec.web.controller;
 
-import com.alibaba.fastjson.JSONObject;
 import com.ym.mec.biz.dal.dao.MusicGroupSchoolTermCourseDetailDao;
 import com.ym.mec.biz.dal.entity.MusicGroupSchoolTermCourseDetail;
 import com.ym.mec.biz.dal.entity.MusicGroupSchoolTermStudentCourseDetail;
+import com.alibaba.fastjson.JSONObject;
 import com.ym.mec.biz.dal.enums.IndexDataType;
 import com.ym.mec.biz.event.source.CourseEventSource;
 import com.ym.mec.biz.service.*;
 import com.ym.mec.common.controller.BaseController;
+import com.ym.mec.common.entity.HttpResponseResult;
 import com.ym.mec.common.entity.UploadReturnBean;
 import com.ym.mec.common.exception.BizException;
 import com.ym.mec.common.redis.service.RedisCache;
+import io.swagger.annotations.ApiOperation;
 import com.ym.mec.im.ImFeignService;
 import com.ym.mec.util.date.DateUtil;
 import com.yonge.log.service.HistoryMessageService;
@@ -157,6 +159,9 @@ public class TaskController extends BaseController {
 	}
 
 
+	@Autowired
+	private MusicGroupSchoolTermCourseDetailService musicGroupSchoolTermCourseDetailService;
+
 	@GetMapping(value = "/autoAffirmReceiveTask")
 	// 自动确认收货
 	public void affirmReceive(){
@@ -467,4 +472,11 @@ public class TaskController extends BaseController {
 			}
 		}
 	}
+
+	@ApiOperation("每天10点推送排课、续费、退团提醒")
+	@GetMapping(value = "/musicSchoolTermPush")
+	public HttpResponseResult musicSchoolTermPush() {
+		musicGroupSchoolTermCourseDetailService.musicSchoolTermPush();
+		return succeed();
+	}
 }