系统收费

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

@@ -2946,6 +2946,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);
 

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>

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

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

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

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

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

@@ -7,7 +7,9 @@ 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.redis.service.RedisCache;
+import io.swagger.annotations.ApiOperation;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -113,6 +115,9 @@ public class TaskController extends BaseController {
 	@Autowired
 	private MusicGroupSchoolTermCourseDetailDao musicGroupSchoolTermCourseDetailDao;
 
+	@Autowired
+	private MusicGroupSchoolTermCourseDetailService musicGroupSchoolTermCourseDetailService;
+
 	@GetMapping(value = "/autoAffirmReceiveTask")
 	// 自动确认收货
 	public void affirmReceive(){
@@ -423,4 +428,11 @@ public class TaskController extends BaseController {
 			}
 		}
 	}
+
+	@ApiOperation("每天10点推送排课、续费、退团提醒")
+	@GetMapping(value = "/musicSchoolTermPush")
+	public HttpResponseResult musicSchoolTermPush() {
+		musicGroupSchoolTermCourseDetailService.musicSchoolTermPush();
+		return succeed();
+	}
 }