Merge branch 'system_fee' of http://git.dayaedu.com/yonge/mec

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

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

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/ClassGroupServiceImpl.java

@@ -156,7 +156,7 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
     @Autowired
     private MusicGroupSchoolTermCourseDetailDao musicGroupSchoolTermCourseDetailDao;
     @Autowired
-    private CloudTeacherOrderDao cloudTeacherOrderDao;
+    private CloudTeacherOrderService cloudTeacherOrderService;
 
     @Override
     public BaseDAO<Integer, ClassGroup> getDAO() {
@@ -2682,6 +2682,7 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
         if (!CollectionUtils.isEmpty(teacherAttendances)) {
             teacherAttendanceDao.batchInsert(teacherAttendances);
         }
+        cloudTeacherOrderService.checkCloudOrderStart();
         imUserFriendService.refreshGroupImUserFriend(termCourseDetail.getMusicGroupId(),MUSIC);
     }
 
@@ -3494,7 +3495,7 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
         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()));
+            preMinutesMap = MapUtil.convertIntegerMap(courseScheduleDao.countPreMinutesByClassGroupId(classGroupSet));
         }
         Map<Integer, Long> currentNumMap = MapUtil.convertIntegerMap(courseScheduleDao.countExpendNumByClassGroupId(classGroupSet));
 

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

@@ -218,7 +218,7 @@ public class MusicGroupSchoolTermCourseDetailServiceImpl extends BaseServiceImpl
 					"STUDENT",pushMemberRenew);
 		}
 		//会员结束前5天提醒学员续费(退团提醒)
-		String pushMemberRenewQuit = sysConfigDao.findConfigValue(SysConfigService.PUSH_MEMBER_RENEW_QUIT);
+		/*String pushMemberRenewQuit = sysConfigDao.findConfigValue(SysConfigService.PUSH_MEMBER_RENEW_QUIT);
 		if(StringUtils.isEmpty(pushMemberRenewQuit)){
 			pushMemberRenewQuit = "5";
 		}
@@ -251,7 +251,7 @@ public class MusicGroupSchoolTermCourseDetailServiceImpl extends BaseServiceImpl
 					0,
 					null,
 					"STUDENT",pushMemberRenewQuit,memberEndAutoQuitMusic);
-		}
+		}*/
 	}
 
 	private MusicGroupSchoolTermCourseDetail getCourseDetail(MusicGroupSchoolTermCourseDetail courseDetail){

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-biz/src/main/java/com/ym/mec/biz/service/impl/StudentRegistrationServiceImpl.java

@@ -1355,7 +1355,11 @@ public class StudentRegistrationServiceImpl extends BaseServiceImpl<Long, Studen
                 musicGroupPaymentCalenderDetail.setExpectAmount(musicGroupPaymentCalender.getPaymentAmount());
                 musicGroupPaymentCalenderDetail.setPaymentStatus(MusicGroupStudentFee.PaymentStatus.NON_PAYMENT);
             }
-            musicGroupPaymentCalenderDetail.setExpectAmount(musicGroupPaymentCalenderDetail.getExpectAmount().add(musicGroupPaymentCalender.getMemberPaymentAmount()));
+            if(orderDetailTypes.contains(OrderDetailTypeEnum.CLOUD_TEACHER) || orderDetailTypes.contains(OrderDetailTypeEnum.CLOUD_TEACHER_PLUS)){
+            	musicGroupPaymentCalenderDetail.setExpectAmount(musicGroupPaymentCalenderDetail.getExpectAmount().add(musicGroupPaymentCalender.getMemberPaymentAmount()));
+            	musicGroupPaymentCalenderDetail.setActualAmount(musicGroupPaymentCalenderDetail.getActualAmount().add(musicGroupPaymentCalender.getMemberPaymentAmount()));
+            }
+            
             musicGroupPaymentCalenderDetail.setUserStatus(null);
             musicGroupPaymentCalenderDetail.setDeadlinePaymentDate(musicGroupPaymentCalender.getDeadlinePaymentDate());
             musicGroupPaymentCalenderDetail.setStartPaymentDate(musicGroupPaymentCalender.getStartPaymentDate());

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

@@ -3801,7 +3801,7 @@
         <foreach collection="ids" item="id" open="(" close=")" separator=",">
             #{id}
         </foreach>
-        AND group_type_='MUSIC' AND DATE_FORMAT(NOW(),'%Y-%m-%d') >= class_date_ AND member_flag_ = 1
+        AND group_type_='MUSIC' AND DATE_FORMAT(NOW(),'%Y-%m-%d') >= class_date_ AND member_flag_ = 1 AND pre_course_flag_ = 0
         GROUP BY music_group_id_
     </select>
 
@@ -3915,15 +3915,14 @@
         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
+        SELECT class_group_id_ 'key',SUM(ROUND((UNIX_TIMESTAMP(CONCAT(class_date_,' ',end_class_time_)) - UNIX_TIMESTAMP(CONCAT(class_date_,' ',start_class_time_)))/60)) 'value'
+        FROM course_schedule
+        WHERE 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_
+        group_type_ = 'MUSIC' AND pre_course_flag_ = 1
+        GROUP BY 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

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() {