zouxuan пре 4 година
родитељ
комит
b80b596ac9

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

@@ -771,8 +771,7 @@
     </select>
     <select id="queryAutoCreateStudentMap" resultType="java.util.Map">
         SELECT GROUP_CONCAT(s.user_id_) 'value',s.member_music_group_id_ 'key' FROM student s
-        LEFT JOIN cloud_teacher_order cto ON cto.student_id_ = s.user_id_ AND cto.status_ = 1 AND cto.music_group_id_ IS NOT NULL
-        WHERE DATEDIFF(s.music_membership_end_time_,NOW()) = #{pushMemberRenew} AND cto.music_group_id_ = s.member_music_group_id_ AND cto.id_ IS NULL
+        WHERE DATEDIFF(s.music_membership_end_time_,NOW()) = #{pushMemberRenew}
         GROUP BY s.member_music_group_id_
     </select>
 

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

@@ -23,6 +23,7 @@ import org.springframework.web.bind.annotation.RestController;
 import java.io.File;
 import java.net.URL;
 import java.util.*;
+import java.util.concurrent.TimeUnit;
 import java.util.stream.Collectors;
 
 @RequestMapping("task")
@@ -471,7 +472,12 @@ public class TaskController extends BaseController {
 	@ApiOperation("每天10点推送排课、续费提醒")
 	@GetMapping(value = "/musicSchoolTermPush")
 	public void musicSchoolTermPush() {
-		musicGroupSchoolTermCourseDetailService.musicSchoolTermPush();
+//		Boolean success = redisCache.getRedisTemplate().opsForValue().setIfAbsent("musicSchoolTermPush","musicSchoolTermPush",
+//				23,
+//				TimeUnit.HOURS);
+//		if(success){
+			musicGroupSchoolTermCourseDetailService.musicSchoolTermPush();
+//		}
 	}
 
 	@ApiOperation("会员到期后清空会员信息")