1、课程调整增加课时变化调整

2、VIP课状态更新定时任务调整
3、乐团课课酬结算调整
4、去除签退时的经纬度判断

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

@@ -293,7 +293,7 @@ public interface VipGroupDao extends BaseDAO<Long, VipGroup> {
 	 * @param vipGroupList
 	 * @return
 	 */
-	int batchUpdate(List<VipGroup> vipGroupList);
+	int batchUpdate(@Param("vipGroupList") List<VipGroup> vipGroupList);
 
 	/**
 	 * @describe

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

@@ -737,6 +737,14 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
                 throw new BizException("不能调整今天及以前的课程");
             }
 
+            boolean courseTimeIsChange = false;
+			int newCourseTime = DateUtil.minutesBetween(newCourseSchedule.getStartClassTime(), newCourseSchedule.getEndClassTime());
+			int oldCourseTime = DateUtil.minutesBetween(oldCourseSchedule.getStartClassTime(), oldCourseSchedule.getEndClassTime());
+
+			if(newCourseTime!=oldCourseTime){
+				courseTimeIsChange = true;
+			}
+
 			oldCourseSchedule.setClassDate(newCourseSchedule.getClassDate());
 			oldCourseSchedule.setStartClassTime(newCourseSchedule.getStartClassTime());
 			oldCourseSchedule.setEndClassTime(newCourseSchedule.getEndClassTime());
@@ -786,8 +794,9 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
 					}
 				}
 			}else{
-				if(Objects.nonNull(newCourseSchedule.getActualTeacherId())&&(Objects.isNull(oldCourseSchedule.getActualTeacherId())
-						||!oldCourseSchedule.getActualTeacherId().equals(newCourseSchedule.getActualTeacherId()))){
+				if(courseTimeIsChange||(Objects.nonNull(newCourseSchedule.getActualTeacherId())
+						&&(Objects.isNull(oldCourseSchedule.getActualTeacherId())
+						||!oldCourseSchedule.getActualTeacherId().equals(newCourseSchedule.getActualTeacherId())))){
 					if(Objects.nonNull(oldCourseSchedule.getActualTeacherId())){
 						beReplaceTeacherIds.add(oldCourseSchedule.getActualTeacherId().intValue());
 					}

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

@@ -1658,6 +1658,7 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
 		//用户账户资金变动信息列表
 		List<SysUserCashAccountDetail> userCashAccountDetails = new ArrayList<>();
 		for (VipGroup noCreateSuccessVipGroup : noCreateSuccessVipGroups) {
+			noCreateSuccessVipGroup.setStatus(VipGroupStatusEnum.CANCEL);
 			List<StudentPaymentOrder> studentPaymentOrders = studentPaymentOrderDao.queryByDealStatus(noCreateSuccessVipGroup.getId().toString(),
 					OrderTypeEnum.SMALL_CLASS_TO_BUY, DealStatusEnum.SUCCESS);
 
@@ -1689,6 +1690,7 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
 			}
 		}
 		sysUserCashAccountDetailDao.batchInsert(userCashAccountDetails);
+		vipGroupDao.batchUpdate(noCreateSuccessVipGroups);
 	}
 
 	@Override

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

@@ -1303,7 +1303,7 @@
         FROM
             course_schedule cs
         WHERE cs.class_date_=DATE_FORMAT(#{date},'%Y-%m-%d')
-        AND cs.type_!='VIP'
+        AND cs.group_type_='MUSIC'
     </select>
     <select id="findByClassGroup" resultMap="CourseSchedule">
       select

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

@@ -792,7 +792,7 @@
     </select>
 
     <update id="batchUpdate" parameterType="java.util.List">
-    	<foreach collection="list" item="item" index="index" open="" close="" separator=";">
+    	<foreach collection="vipGroupList" item="item" index="index" open="" close="" separator=";">
 	        UPDATE vip_group
 	        <set>
 	            <if test="item.paymentExpireDate != null">

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

@@ -29,6 +29,9 @@ public interface TaskRemoteService {
 	// vip课课酬结算
 	public void vipGroupTeacherSalarySettlement();
 
+	@GetMapping("task/musicGroupTeacherSalarySettlement")
+	void MusicGroupTeacherSalarySettlement();
+
 	@GetMapping("task/studentCoursesScheduleRemind")
 	// 学生有课提醒
 	public void studentCoursesScheduleRemind();

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

@@ -37,6 +37,11 @@ public class TaskRemoteServiceFallback implements TaskRemoteService {
 	}
 
 	@Override
+	public void MusicGroupTeacherSalarySettlement() {
+		logger.info("乐团课课酬结算的服务调用失败");
+	}
+
+	@Override
 	public void studentCoursesScheduleRemind() {
 		logger.info("有课提醒的服务调用失败");
 	}

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

@@ -0,0 +1,19 @@
+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 MusicGroupTeacherSalarySettlementTaskTask extends BaseTask {
+
+	@Autowired
+	private TaskRemoteService taskRemoteService;
+
+	@Override
+	public void execute() throws TaskException {
+		taskRemoteService.MusicGroupTeacherSalarySettlement();
+	}
+}

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

@@ -54,6 +54,12 @@ public class TaskController extends BaseController {
 		courseScheduleTeacherSalaryService.teacherSalarySettlement();
 	}
 
+	// 乐团课课酬结算
+	@GetMapping("/musicGroupTeacherSalarySettlement")
+	public void musicGroupTeacherSalarySettlement() {
+		courseScheduleTeacherSalaryService.musicGroupTeacherSalarySettlement();
+	}
+
 	@GetMapping("/updateCourseScheduleToOverStatus")
 	// 更新课程状态至已结束
 	public void updateCourseScheduleToOverStatus() {