系统收费推送

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

@@ -217,41 +217,6 @@ public class MusicGroupSchoolTermCourseDetailServiceImpl extends BaseServiceImpl
 					null,
 					"STUDENT",pushMemberRenew);
 		}
-		//会员结束前5天提醒学员续费(退团提醒)
-		/*String pushMemberRenewQuit = sysConfigDao.findConfigValue(SysConfigService.PUSH_MEMBER_RENEW_QUIT);
-		if(StringUtils.isEmpty(pushMemberRenewQuit)){
-			pushMemberRenewQuit = "5";
-		}
-		//会员结束后3天学员自动退团
-		String memberEndAutoQuitMusic = sysConfigDao.findConfigValue(SysConfigService.MEMBER_END_AUTO_QUIT_MUSIC);
-		if(StringUtils.isEmpty(memberEndAutoQuitMusic)){
-			memberEndAutoQuitMusic = "3";
-		}
-		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,pushMemberRenewQuit,memberEndAutoQuitMusic);
-
-			sysMessageService.batchSendMessage(MessageSenderPluginContext.MessageSender.JIGUANG,
-					MessageTypeEnum.STUDENT_MEMBER_RENEW_QUIT_MESSAGE,
-					userMap1,
-					null,
-					0,
-					null,
-					"STUDENT",pushMemberRenewQuit,memberEndAutoQuitMusic);
-		}*/
 	}
 
 	private MusicGroupSchoolTermCourseDetail getCourseDetail(MusicGroupSchoolTermCourseDetail courseDetail){

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

@@ -94,6 +94,6 @@
 	</select>
     <select id="queryPushCourseTermMusicIds" resultType="java.lang.String">
 		SELECT music_group_id_ FROM music_group_school_term_course_detail
-		GROUP BY music_group_id_ HAVING DATEDIFF(MAX(end_school_term_),NOW()) = #{remindCourseTime}
+		GROUP BY music_group_id_ HAVING DATEDIFF(NOW(),MAX(end_school_term_)) = #{remindCourseTime}
 	</select>
 </mapper>

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

@@ -735,7 +735,10 @@
         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 s.user_id_ FROM student s
+        LEFT JOIN cloud_teacher_order cto ON cto.student_id_ = s.user_id_ AND cto.status_ IN (1,2)
+        GROUP BY s.user_id_ HAVING (MAX(cto.id_) IS NULL OR MIN(cto.status_) > 1)
+        AND DATEDIFF(MAX(cto.end_time_),NOW()) = #{pushMemberRenew}
     </select>
 
     <update id="updateGrade"><![CDATA[

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

@@ -468,7 +468,7 @@ public class TaskController extends BaseController {
 		}
 	}
 
-	@ApiOperation("每天10点推送排课、续费、退团提醒")
+	@ApiOperation("每天10点推送排课、续费提醒")
 	@GetMapping(value = "/musicSchoolTermPush")
 	public void musicSchoolTermPush() {
 		musicGroupSchoolTermCourseDetailService.musicSchoolTermPush();