系统收费

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

@@ -372,9 +372,4 @@ public interface MusicGroupService extends BaseService<String, MusicGroup> {
 	 * @return
 	 */
 	List<MusicGroup> findByCooperationId(Integer cooperationId);
-
-	/**
-	 * 会员到期后学员自动退团
-	 */
-    void memberEndAutoQuitMusic();
 }

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

@@ -3222,19 +3222,4 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
     public List<MusicGroup> findByCooperationId(Integer cooperationId) {
         return musicGroupDao.findByCooperationId(cooperationId);
     }
-
-    @Override
-    public void memberEndAutoQuitMusic() {
-        String memberEndAutoQuitMusic = sysConfigDao.findConfigValue(SysConfigService.MEMBER_END_AUTO_QUIT_MUSIC);
-        if(StringUtils.isEmpty(memberEndAutoQuitMusic)){
-            memberEndAutoQuitMusic = "3";
-        }
-        //获取所有在会员团，但是没有会员，并且没有待生效的学员
-        List<StudentRegistration> registrations = studentRegistrationDao.queryMemberEndAutoQuitMusic(memberEndAutoQuitMusic);
-        if(registrations.size() > 0){
-//            registrations.forEach(e->{
-//                directQuitMusicGroup(e.getMusicGroupId(),e.getUserId(),"会员到期自动退团",);
-//            });
-        }
-    }
 }

mec-task/src/main/java/com/ym/mec/task/jobs/MemberEndAutoQuitMusicTask.java

@@ -1,19 +0,0 @@
-package com.ym.mec.task.jobs;
-
-import com.ym.mec.task.TaskRemoteService;
-import com.ym.mec.task.core.BaseTask;
-import com.ym.mec.task.core.TaskException;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-@Service
-public class MemberEndAutoQuitMusicTask extends BaseTask {
-
-	@Autowired
-	private TaskRemoteService taskRemoteService;
-
-	@Override
-	public void execute() throws TaskException {
-		taskRemoteService.memberEndAutoQuitMusic();
-	}
-}

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

@@ -1,21 +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;
+import io.swagger.annotations.ApiOperation;
 import org.apache.commons.io.FileUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -26,7 +23,6 @@ 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")
@@ -134,9 +130,6 @@ public class TaskController extends BaseController {
 	@Autowired
 	private MusicGroupSchoolTermCourseDetailService musicGroupSchoolTermCourseDetailService;
 
-	@Autowired
-	private MusicGroupService musicGroupService;
-
 	@GetMapping(value = "/syncImHistoryMessageTask")
 	// 同步即时通讯聊天记录
 	public void syncImHistoryMessageTask(String date) throws Exception {
@@ -481,12 +474,6 @@ public class TaskController extends BaseController {
 		musicGroupSchoolTermCourseDetailService.musicSchoolTermPush();
 	}
 
-	@ApiOperation("会员结束后第三天自动退团")
-	@GetMapping(value = "/memberEndAutoQuitMusic")
-	public void memberEndAutoQuitMusic() {
-//		musicGroupService.memberEndAutoQuitMusic();
-	}
-
 	@ApiOperation("会员到期后清空会员信息")
 	@GetMapping(value = "/cleanStudentMember")
 	public void cleanStudentMember() {