Merge branch 'master' of http://git.dayaedu.com/yonge/mec into zouxuan

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

@@ -783,6 +783,17 @@ public interface CourseScheduleDao extends BaseDAO<Long, CourseSchedule> {
     List<CourseSchedule> findClassGroupCourseSchedules(@Param("classGroupId") Integer classGroupId);
 
     /**
+     * @describe 获取指定班级上指定日期之后的课程
+     * @author Joburgess
+     * @date 2020/1/2
+     * @param classGroupIds: 班级编号，多个逗号分隔
+     * @param fromDate: 开始时间
+     * @return java.util.List<com.ym.mec.biz.dal.entity.CourseSchedule>
+     */
+    List<CourseSchedule> findClassGroupCourseSchedulesWithDate(@Param("classGroupIds") String classGroupIds,
+                                                               @Param("fromDate") Date fromDate);
+
+    /**
      * @describe 批量修改乐团下所有课程上的教学点
      * @author Joburgess
      * @date 2019/12/11

mec-biz/src/main/java/com/ym/mec/biz/dal/dto/CoursePostponeDto.java

@@ -0,0 +1,56 @@
+package com.ym.mec.biz.dal.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+
+import java.util.Date;
+
+/**
+ * @Author Joburgess
+ * @Date 2020/1/2
+ */
+public class CoursePostponeDto {
+
+    @ApiModelProperty(value = "班级编号，逗号分隔")
+    private String classGroupIds;
+
+    @ApiModelProperty(value = "课程暂停时间")
+    private Date pauseDate;
+
+    @ApiModelProperty(value = "课程恢复时间")
+    private Date recoveryDate;
+
+    @ApiModelProperty(value = "跳过节假日")
+    private boolean skipHoliday;
+
+    public String getClassGroupIds() {
+        return classGroupIds;
+    }
+
+    public void setClassGroupIds(String classGroupIds) {
+        this.classGroupIds = classGroupIds;
+    }
+
+    public Date getPauseDate() {
+        return pauseDate;
+    }
+
+    public void setPauseDate(Date pauseDate) {
+        this.pauseDate = pauseDate;
+    }
+
+    public Date getRecoveryDate() {
+        return recoveryDate;
+    }
+
+    public void setRecoveryDate(Date recoveryDate) {
+        this.recoveryDate = recoveryDate;
+    }
+
+    public boolean isSkipHoliday() {
+        return skipHoliday;
+    }
+
+    public void setSkipHoliday(boolean skipHoliday) {
+        this.skipHoliday = skipHoliday;
+    }
+}

mec-biz/src/main/java/com/ym/mec/biz/dal/entity/VipGroup.java

@@ -118,6 +118,17 @@ public class VipGroup {
 
 	private String courseSchedulesJson;
 
+	@ApiModelProperty(value = "指定学员列表")
+	private String studentIdList;
+
+	public String getStudentIdList() {
+		return studentIdList;
+	}
+
+	public void setStudentIdList(String studentIdList) {
+		this.studentIdList = studentIdList;
+	}
+
 	public String getCourseSchedulesJson() {
 		return courseSchedulesJson;
 	}

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

@@ -195,6 +195,15 @@ public interface CourseScheduleService extends BaseService<Long, CourseSchedule>
 	void vipCourseAdjust(VipGroupCourseAdjustInfoDto vipGroupCourseAdjustInfo);
 
 	/**
+	 * @describe 课程顺延
+	 * @author Joburgess
+	 * @date 2020/1/2
+	 * @param coursePostPoneInfo:
+	 * @return void
+	 */
+	void coursePostpone(CoursePostponeDto coursePostPoneInfo);
+
+	/**
 	 * @describe vip课批量新增-后端处理
 	 * @author Joburgess
 	 * @date 2019/12/12

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

@@ -1904,31 +1904,37 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
 //            Map<Integer, String> classGroupNames = MapUtil.convertMybatisMap(classGroupDao.findNameById(mixClassGroupIdsStr));
 
             //主教老师
-            List<CourseScheduleTeacherSalary> bishopTeachers = courseScheduleTeacherSalaryDao.findByCourseScheduleIdsAndTeacherRole(couseScheduleIds, "BISHOP");
-            Map<Long, List<CourseScheduleTeacherSalary>> courseScheduleBishopTeacherMaps = bishopTeachers.stream().collect(Collectors.groupingBy(CourseScheduleTeacherSalary::getCourseScheduleId));
+            Map<Long, List<CourseScheduleTeacherSalary>> courseScheduleBishopTeacherMaps=new HashMap<>();
 
             //助教老师
-            List<CourseScheduleTeacherSalary> teachingTeachers = courseScheduleTeacherSalaryDao.findByCourseScheduleIdsAndTeacherRole(couseScheduleIds, "TEACHING");
-            Map<Long, List<CourseScheduleTeacherSalary>> courseScheduleTeachingTeacherMaps = teachingTeachers.stream().collect(Collectors.groupingBy(CourseScheduleTeacherSalary::getCourseScheduleId));
+            Map<Long, List<CourseScheduleTeacherSalary>> courseScheduleTeachingTeacherMaps=new HashMap<>();
+            if(!CollectionUtils.isEmpty(couseScheduleIds)){
+                List<CourseScheduleTeacherSalary> bishopTeachers = courseScheduleTeacherSalaryDao.findByCourseScheduleIdsAndTeacherRole(couseScheduleIds, "BISHOP");
+                courseScheduleBishopTeacherMaps = bishopTeachers.stream().collect(Collectors.groupingBy(CourseScheduleTeacherSalary::getCourseScheduleId));
+
+                //助教老师
+                List<CourseScheduleTeacherSalary> teachingTeachers = courseScheduleTeacherSalaryDao.findByCourseScheduleIdsAndTeacherRole(couseScheduleIds, "TEACHING");
+                courseScheduleTeachingTeacherMaps = teachingTeachers.stream().collect(Collectors.groupingBy(CourseScheduleTeacherSalary::getCourseScheduleId));
+            }
 
-            dataList.forEach(e -> {
+            for(int i=0;i<dataList.size();i++){
 //                e.setMixClassGroupName(classGroupNames.get(e.getMixClassGroupId()));
-                List<CourseScheduleTeacherSalary> currentBishopTeacher = courseScheduleBishopTeacherMaps.get(e.getCourseScheduleId().longValue());
+                List<CourseScheduleTeacherSalary> currentBishopTeacher = courseScheduleBishopTeacherMaps.get(dataList.get(i).getCourseScheduleId().longValue());
                 List<CourseScheduleTeacherSalary> TeachingTeachers = new ArrayList<>();
                 if (!Objects.isNull(currentBishopTeacher) && !CollectionUtils.isEmpty(currentBishopTeacher)) {
-                    e.setMasterTeacherId(currentBishopTeacher.get(0).getUserId());
-                    e.setMasterTeacherName(currentBishopTeacher.get(0).getUserName());
+                    dataList.get(i).setMasterTeacherId(currentBishopTeacher.get(0).getUserId());
+                    dataList.get(i).setMasterTeacherName(currentBishopTeacher.get(0).getUserName());
                 } else {
                     currentBishopTeacher = new ArrayList<>();
                 }
                 TeachingTeachers.addAll(currentBishopTeacher);
-                List<CourseScheduleTeacherSalary> currentCourseTeachingTeachers = courseScheduleTeachingTeacherMaps.get(e.getCourseScheduleId().longValue());
+                List<CourseScheduleTeacherSalary> currentCourseTeachingTeachers = courseScheduleTeachingTeacherMaps.get(dataList.get(i).getCourseScheduleId().longValue());
                 if (Objects.isNull(currentCourseTeachingTeachers) || CollectionUtils.isEmpty(currentCourseTeachingTeachers)) {
                     currentCourseTeachingTeachers = new ArrayList<>();
                 }
                 TeachingTeachers.addAll(currentCourseTeachingTeachers);
-                e.setTeachingTeachers(TeachingTeachers);
-                e.setTeacherNum(TeachingTeachers.size());
+                dataList.get(i).setTeachingTeachers(TeachingTeachers);
+                dataList.get(i).setTeacherNum(TeachingTeachers.size());
                 /*if (CollectionUtils.isEmpty(currentCourseTeachingTeachers) && !CollectionUtils.isEmpty(currentBishopTeacher)) {
                     currentCourseTeachingTeachers = new ArrayList<>();
                     if (currentBishopTeacher != null) {
@@ -1942,7 +1948,7 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
                     }
                     e.setTeachingTeachers(currentCourseTeachingTeachers);
                 }*/
-            });
+            }
         }
         if (count == 0) {
             dataList = new ArrayList<>();

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

@@ -116,11 +116,16 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
         if (Objects.isNull(currentCourseDetail)) {
             throw new BizException("课程不存在");
         }
-        YesOrNoEnum yesOrNoEnum = enableOnlyNormalAttendance(currentCourseDetail.getStartClassTime(),
-                user.getId().longValue(),
-                true,
-                currentCourseDetail.getSchoolId().intValue());
-        currentCourseDetail.setOnlyNormal(yesOrNoEnum);
+        if(Objects.nonNull(currentCourseDetail.getSchoolId())){
+            YesOrNoEnum yesOrNoEnum = enableOnlyNormalAttendance(currentCourseDetail.getStartClassTime(),
+                    user.getId().longValue(),
+                    true,
+                    currentCourseDetail.getSchoolId().intValue());
+            currentCourseDetail.setOnlyNormal(yesOrNoEnum);
+        }else{
+            currentCourseDetail.setOnlyNormal(YesOrNoEnum.NO);
+        }
+
         currentCourseDetail.setCurrentClassTimes(courseScheduleDao.countClassGroupOverCourseNum(currentCourseDetail.getClassId()));
         SysConfig sysConfig = sysConfigService.findByParamName(SysConfigService.ENABLE_STUDENT_ATTENDANCE_TIME_RANGE);
         currentCourseDetail.setEnableStudentAttendanceTimeRange(sysConfig.getParanValue(Integer.class));
@@ -143,7 +148,9 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
         Integer classGroupId = null;
         if (!CollectionUtils.isEmpty(courseScheduleIds)) {
             CourseSchedule courseSchedule = courseScheduleDao.get(courseScheduleIds.get(0));
-            classGroupId = courseSchedule.getClassGroupId();
+            if(Objects.nonNull(courseSchedule)){
+                classGroupId = courseSchedule.getClassGroupId();
+            }
         }
         List<Long> enableDeleteIds = courseScheduleDao.filterNotStartCourseIdsWithIds(courseScheduleIds);
         if (!CollectionUtils.isEmpty(enableDeleteIds)) {
@@ -212,13 +219,16 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
     @Transactional(rollbackFor = Exception.class)
     public void createCourseSchedules(CreateCourseScheduleDto createCourseScheduleDto) {
         List<CourseSchedule> courseSchedules = createCourseScheduleDto.getCourseSchedules();
-        //添加课程计划
-        batchAddCourseSchedule(courseSchedules);
-        //更新课次
-        List<Integer> classGroupIds = courseSchedules.stream().map(CourseSchedule::getClassGroupId).collect(Collectors.toList());
-        classGroupService.batchUpdateClassCourseTimes(classGroupIds);
-        //创建学生单节课的缴费记录，乐团课的缴费为0
-        courseScheduleStudentPaymentService.createCourseScheduleStudentPaymentByCourseSchedules(courseSchedules);
+
+        if(!CollectionUtils.isEmpty(courseSchedules)){
+            //添加课程计划
+            batchAddCourseSchedule(courseSchedules);
+            //更新课次
+            List<Integer> classGroupIds = courseSchedules.stream().map(CourseSchedule::getClassGroupId).collect(Collectors.toList());
+            classGroupService.batchUpdateClassCourseTimes(classGroupIds);
+            //创建学生单节课的缴费记录，乐团课的缴费为0
+            courseScheduleStudentPaymentService.createCourseScheduleStudentPaymentByCourseSchedules(courseSchedules);
+        }
 
         MusicGroup musicGroup = musicGroupService.get(createCourseScheduleDto.getMusicGroupID());
 
@@ -993,9 +1003,14 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
         Map<String, Integer> holidayDays = new HashMap<>();
         Map<Integer, Map<String, Integer>> holiday = new HashMap<>();
 
-        if (vipGroupCourseAdjustInfo.isHoliday()) {
-            holiday = jiaRiFeignService.query(calendar.get(Calendar.YEAR));
-            holidayDays = holiday.get(calendar.get(Calendar.YEAR));
+        try {
+            if (vipGroupCourseAdjustInfo.isHoliday()) {
+                holiday = jiaRiFeignService.query(calendar.get(Calendar.YEAR));
+                holidayDays = holiday.get(calendar.get(Calendar.YEAR));
+            }
+        } catch (DecodeException e) {
+            LOGGER.error("节假日解析错误");
+            vipGroupCourseAdjustInfo.setHoliday(false);
         }
 
         while (true) {
@@ -1079,6 +1094,59 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
 
     @Override
     @Transactional(rollbackFor = Exception.class)
+    public void coursePostpone(CoursePostponeDto coursePostPoneInfo) {
+        if(StringUtils.isBlank(coursePostPoneInfo.getClassGroupIds())){
+            throw new BizException("请指定班级");
+        }
+        if(Objects.isNull(coursePostPoneInfo.getPauseDate())){
+            throw new BizException("请指定课程暂停时间");
+        }
+        if(Objects.isNull(coursePostPoneInfo.getRecoveryDate())){
+            throw new BizException("请指定课程恢复时间");
+        }
+        //间隔天数
+        int betweenDays = DateUtil.daysBetween(coursePostPoneInfo.getPauseDate(), coursePostPoneInfo.getRecoveryDate());
+        List<CourseSchedule> classGroupCourseSchedulesWithDate = courseScheduleDao.findClassGroupCourseSchedulesWithDate(coursePostPoneInfo.getClassGroupIds(), coursePostPoneInfo.getPauseDate());
+
+        if(CollectionUtils.isEmpty(classGroupCourseSchedulesWithDate)){
+            throw new BizException("选择的班级上在指定日期之后不存在需要调整的课程");
+        }
+
+        Calendar calendar = Calendar.getInstance();
+        calendar.setTime(coursePostPoneInfo.getRecoveryDate());
+
+        Map<String, Integer> holidayDays = new HashMap<>();
+        Map<Integer, Map<String, Integer>> holiday = new HashMap<>();
+
+        classGroupCourseSchedulesWithDate.sort(Comparator.comparing(CourseSchedule::getStartClassTime));
+        for (int i=0;i<classGroupCourseSchedulesWithDate.size();i++) {
+            CourseSchedule courseSchedule=classGroupCourseSchedulesWithDate.get(i);
+            calendar.setTime(courseSchedule.getClassDate());
+            calendar.add(Calendar.DATE, betweenDays);
+            try {
+                if (coursePostPoneInfo.isSkipHoliday() && !holiday.containsKey(calendar.get(Calendar.YEAR))) {
+                    holiday = jiaRiFeignService.query(calendar.get(Calendar.YEAR));
+                    holidayDays = holiday.get(calendar.get(Calendar.YEAR));
+                }
+            } catch (Exception e) {
+                LOGGER.error("节假日解析错误");
+                coursePostPoneInfo.setSkipHoliday(false);
+            }
+
+            if (coursePostPoneInfo.isSkipHoliday() && holidayDays.containsKey(DateUtil.format(calendar.getTime(), "MMdd"))) {
+                betweenDays=betweenDays+7;
+                calendar.add(Calendar.DATE, betweenDays);
+                i=i-1;
+                continue;
+            }
+            classGroupCourseSchedulesWithDate.get(i).setClassDate(calendar.getTime());
+        }
+        checkNewCourseSchedules(classGroupCourseSchedulesWithDate,false);
+        courseScheduleDao.batchUpdate(classGroupCourseSchedulesWithDate);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
     public void batchAppendVipGroupCourses(VipGroupCourseAdjustInfoDto vipGroupCourseAdjustInfo) {
         if (Objects.isNull(vipGroupCourseAdjustInfo.getVipGroupId())) {
             throw new BizException("请指定小课");
@@ -1122,7 +1190,7 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
 
         Map<String, Integer> holidayDays = new HashMap<>();
         Map<Integer, Map<String, Integer>> holiday = new HashMap<>();
-        ;
+
         try {
             if (vipGroupCourseAdjustInfo.isHoliday()) {
                 holiday = jiaRiFeignService.query(calendar.get(Calendar.YEAR));
@@ -1130,7 +1198,6 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
             }
         } catch (DecodeException e) {
             LOGGER.error("节假日解析错误");
-        } finally {
             vipGroupCourseAdjustInfo.setHoliday(false);
         }
 
@@ -1215,19 +1282,13 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
             if (Objects.nonNull(isSettlement) && isSettlement > 0) {
                 throw new BizException("调整的课程中存在已结算的课程");
             }
-            CourseSchedule oldCourseSchedule = null;
+            List<CourseSchedule> oldCourseSchedules = oldCourseScheduleMap.get(newCourseSchedule.getId());
+            oldCourseSchedules.sort(Comparator.comparing(CourseSchedule::getStartClassTime).reversed());
+            CourseSchedule oldCourseSchedule = oldCourseSchedules.get(0);
             if (Objects.isNull(newCourseSchedule.getActualTeacherId())) {
-                List<CourseSchedule> oldCourseSchedules = oldCourseScheduleMap.get(newCourseSchedule.getId());
-                oldCourseSchedules.sort(Comparator.comparing(CourseSchedule::getStartClassTime).reversed());
-                oldCourseSchedule = oldCourseSchedules.get(0);
                 newCourseSchedule.setActualTeacherId(oldCourseSchedule.getActualTeacherId());
             }
             if (Objects.isNull(newCourseSchedule.getSchoolId())) {
-                if (Objects.isNull(oldCourseSchedule)) {
-                    List<CourseSchedule> oldCourseSchedules = oldCourseScheduleMap.get(newCourseSchedule.getId());
-                    oldCourseSchedules.sort(Comparator.comparing(CourseSchedule::getStartClassTime).reversed());
-                    oldCourseSchedule = oldCourseSchedules.get(0);
-                }
                 newCourseSchedule.setSchoolId(oldCourseSchedule.getSchoolId());
             }
             if (oldCourseSchedule.getType().equals(CourseSchedule.CourseScheduleType.VIP)) {
@@ -2029,10 +2090,15 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
 
         Map<String, Integer> holidayDays = new HashMap<>();
         Map<Integer, Map<String, Integer>> holiday = new HashMap<>();
-        ;
-        if (courseGenerateInfo.isSkipHoliday()) {
-            holiday = jiaRiFeignService.query(calendar.get(Calendar.YEAR));
-            holidayDays = holiday.get(calendar.get(Calendar.YEAR));
+
+        try {
+            if (courseGenerateInfo.isSkipHoliday()) {
+                holiday = jiaRiFeignService.query(calendar.get(Calendar.YEAR));
+                holidayDays = holiday.get(calendar.get(Calendar.YEAR));
+            }
+        } catch (DecodeException e) {
+            LOGGER.error("节假日解析错误");
+            courseGenerateInfo.setSkipHoliday(false);
         }
 
         List<CourseSchedule> courseSchedules = new ArrayList<>();

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

@@ -263,6 +263,7 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
                         //修改为已缴费
                         studentRegistrationList.forEach(e->e.setPaymentStatus(PaymentStatusEnum.YES));
                     }
+                    musicGroupSubjectPlans.forEach(e->e.setPaidStudentNum(e.getApplyStudentNum()));
                 }
             }
             if (studentRegistrationList.size() > 0) {
@@ -832,7 +833,9 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
     @Transactional(rollbackFor = Exception.class)
     public void updateExpectedStudentNum(List<UpdateExpectedNumDto> updateExpectedNumDtos) {
         updateExpectedNumDtos.forEach(e->{
-            musicGroupSubjectPlanDao.updateExpectedStudentNum(e.getExpectedStudentNum(),e.getMusicGroupSubjectPlanId());
+            MusicGroupSubjectPlan musicGroupSubjectPlan = musicGroupSubjectPlanDao.get(e.getMusicGroupSubjectPlanId());
+            musicGroupSubjectPlan.setExpectedStudentNum(e.getExpectedStudentNum());
+            musicGroupSubjectPlanDao.update(musicGroupSubjectPlan);
         });
     }
 
@@ -1247,7 +1250,7 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
 			List<Integer> classGroupIdList = classGroupStudentMapperDao.queryClassGroupIdList(musicGroupId, userId, GroupType.MUSIC);
 			if (classGroupIdList != null && classGroupIdList.size() > 0) {
 				//更新班级人数
-				classGroupDao.batchUpdateStudentNumMinusOne(classGroupIdList);
+				//classGroupDao.batchUpdateStudentNumMinusOne(classGroupIdList);
 
                 List<ImGroupModel> imGroupModels = new ArrayList<>();
                 ImGroupMember[] imGroupMember = {new ImGroupMember(userId.toString())};
@@ -1355,7 +1358,7 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
 		List<Integer> classGroupIdList = classGroupStudentMapperDao.queryClassGroupIdList(musicGroupId, userId, GroupType.MUSIC);
 		if (classGroupIdList != null && classGroupIdList.size() > 0) {
 			//更新班级人数
-			classGroupDao.batchUpdateStudentNumMinusOne(classGroupIdList);
+			//classGroupDao.batchUpdateStudentNumMinusOne(classGroupIdList);
 
 			//删除融云群
 			List<ImGroupModel> imGroupModels = new ArrayList<ImGroupModel>();

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

@@ -115,7 +115,7 @@ public class PayServiceImpl implements PayService {
             for (SysAccount account : accounts) {
                 Map<String, Object> routingList = new HashMap<>();
                 routingList.put("routingMerNo", account.getRoutingMerNo());//分佣账户
-                routingList.put("routingFee", account.getRoutingFee().subtract((account.getRoutingFee().multiply(new BigDecimal(0.28)).divide(new BigDecimal(100))).setScale(2, BigDecimal.ROUND_HALF_UP))); //分佣金额
+                routingList.put("routingFee", account.getRoutingFee().subtract((account.getRoutingFee().multiply(new BigDecimal("0.28")).divide(new BigDecimal(100))).setScale(2, BigDecimal.ROUND_HALF_UP))); //分佣金额
                 tempRoutingList.add(routingList);
             }
             if(accounts.size() ==1 && routingAccount.getMerNo().equals(routingAccount.getRoutingMerNo())){

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

@@ -187,10 +187,13 @@ public class StudentAttendanceServiceImpl extends BaseServiceImpl<Long, StudentA
 			return;
 		}
 
-		YesOrNoEnum yesOrNoEnum = courseScheduleService.enableOnlyNormalAttendance(courseSchedule.getStartClassTime(),
-				sysUser.getId().longValue(),
-				true,
-				courseSchedule.getSchoolId().intValue());
+		YesOrNoEnum yesOrNoEnum = YesOrNoEnum.NO;
+		if(Objects.nonNull(courseSchedule.getSchoolId())){
+			yesOrNoEnum = courseScheduleService.enableOnlyNormalAttendance(courseSchedule.getStartClassTime(),
+					sysUser.getId().longValue(),
+					true,
+					courseSchedule.getSchoolId().intValue());
+		}
 		teacherAttendance.setSignInTime(date);
 		teacherAttendance.setSignInStatus(YesOrNoEnum.YES);
 		teacherAttendance.setSignOutTime(date);

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

@@ -7,6 +7,7 @@ import com.ym.mec.biz.dal.dao.*;
 import com.ym.mec.biz.dal.dto.*;
 import com.ym.mec.biz.dal.entity.StudentRegistration;
 import com.ym.mec.biz.dal.entity.SysUserCashAccount;
+import com.ym.mec.biz.dal.entity.VipGroup;
 import com.ym.mec.biz.dal.page.*;
 import com.ym.mec.biz.service.StudentManageService;
 import com.ym.mec.common.entity.ImResult;

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

@@ -155,10 +155,13 @@ public class TeacherAttendanceServiceImpl extends BaseServiceImpl<Long, TeacherA
 				throw new BizException("该课程已结束，不能进行签到!");
 			}
 
-			YesOrNoEnum yesOrNoEnum = courseScheduleService.enableOnlyNormalAttendance(currentCourseDetail.getStartClassTime(),
-					user.getId().longValue(),
-					true,
-					currentCourseDetail.getSchoolId().intValue());
+			YesOrNoEnum yesOrNoEnum = YesOrNoEnum.NO;
+			if(Objects.nonNull(courseSchedule.getSchoolId())){
+				yesOrNoEnum = courseScheduleService.enableOnlyNormalAttendance(currentCourseDetail.getStartClassTime(),
+						user.getId().longValue(),
+						true,
+						currentCourseDetail.getSchoolId().intValue());
+			}
 			teacherAttendance.setSignInTime(date);
 			teacherAttendance.setSignInStatus(YesOrNoEnum.YES);
 			result.put("signInStatus",0);
@@ -267,7 +270,7 @@ public class TeacherAttendanceServiceImpl extends BaseServiceImpl<Long, TeacherA
 		Date classEndDateAdd60Minutes = DateUtil.addMinutes(classEndDateTime, 60);
 		Date classEndDateCut10Minutes = DateUtil.addMinutes(classEndDateTime, -10);
 //		Date add20Minutes = DateUtil.addMinutes(classStartDateTime, advanceSignMinutes * -1);
-		Date add60Minutes = DateUtil.addMinutes(classStartDateTime, -60);
+//		Date add60Minutes = DateUtil.addMinutes(classStartDateTime, -60);
 		//签到
 		if(teacherAttendance.getSignInTime() == null && SignStatusEnum.SIGN_IN.equals(signStatus)){
 			//是否连堂课
@@ -281,8 +284,8 @@ public class TeacherAttendanceServiceImpl extends BaseServiceImpl<Long, TeacherA
 			boolean isSign = false;
 			if(yesOrNoEnum == YesOrNoEnum.YES){
 				isSign = true;
-			}else if(DateUtil.minutesBetween(add60Minutes,date) > 0 && DateUtil.minutesBetween(date,classStartDateTime) > 0){
-				//正常签到范围(开始前60分钟  ~  开始之前)
+			}else if(DateUtil.minutesBetween(date,classStartDateTime) > 0){
+				//正常签到范围(开始之前)
 				isSign = true;
 			}else if(DateUtil.minutesBetween(classStartDateTime,date) > 0){
 				//异常签到范围(开始之后)

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

@@ -461,7 +461,6 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
 		List dataList = null;
 		int count = vipGroupDao.countVipGorups(params);
 		if (count > 0) {
-
 			pageInfo.setTotal(count);
 			params.put("offset", pageInfo.getOffset());
 			dataList = vipGroupDao.findVipGroups(params);

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

@@ -1926,4 +1926,31 @@
             LEFT JOIN sys_user su ON csts.user_id_ = su.id_
         WHERE real_name_ LIKE CONCAT('%',#{search},'%') OR su.id_=#{search}
     </select>
+    <select id="findClassGroupCourseSchedulesWithDate" resultMap="CourseSchedule">
+        SELECT
+            cs.id_,
+            cs.class_group_id_,
+            cs.status_,
+            cs.subsidy_,
+            cs.class_date_,
+            CONCAT(cs.class_date_,' ',cs.start_class_time_) start_class_time_,
+            CONCAT(cs.class_date_,' ',cs.end_class_time_) end_class_time_,
+            cs.start_class_time_ start_class_time_str_,
+            cs.end_class_time_ end_class_time_str_,
+            cs.teacher_id_,
+            cs.actual_teacher_id_,
+            cs.create_time_,
+            cs.update_time_,
+            cs.teach_mode_,
+            cs.type_,
+            cs.name_,
+            cs.student_num_,
+            cs.leave_student_num_,
+            cs.schoole_id_
+        FROM course_schedule cs
+        WHERE FIND_IN_SET(cs.class_group_id_,#{classGroupIds})
+        AND CONCAT(cs.class_date_,' ',cs.start_class_time_)&gt;NOW()
+        AND cs.class_date_&gt;=DATE_FORMAT(#{fromDate},"%Y-%m-%d")
+        AND (cs.del_flag_ IS NULL OR cs.del_flag_=0)
+    </select>
 </mapper>

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

@@ -207,7 +207,7 @@
 		LEFT JOIN music_group mg ON sr.music_group_id_ = mg.id_
 		LEFT JOIN `subject` s ON sr.actual_subject_id_ = s.id_
 		LEFT JOIN sys_user su ON  su.id_ = sr.user_id_
-		WHERE sr.user_id_ = #{userId} AND mg.status_ IN ('APPLY','PAY','PREPARE','PROGRESS')
+		WHERE sr.user_id_ = #{userId} AND mg.status_ IN ('APPLY','PAY','PREPARE','PROGRESS') AND sr.music_group_status_ != 'QUIT'
 		ORDER BY mg.create_time_ DESC
 	</select>
 

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

@@ -193,7 +193,7 @@
         LEFT JOIN music_group mg ON sr.music_group_id_ = mg.id_
         LEFT JOIN `subject` s ON s.id_ = sr.actual_subject_id_
         LEFT JOIN music_group_subject_plan mgsp ON mg.id_ = mgsp.music_group_id_ AND s.id_ = mgsp.subject_id_
-        WHERE sr.user_id_=#{userId} AND sr.music_group_status_ != 'QUIT'
+        WHERE sr.user_id_=#{userId} AND (sr.music_group_status_ != 'QUIT' OR (sr.music_group_status_ = 'QUIT' AND mgsp.id_ IS NOT NULL))
         ORDER BY mg.create_time_ DESC
     </select>
 
@@ -520,7 +520,7 @@
         LEFT JOIN vip_group vg ON cg.music_group_id_ = vg.id_
         LEFT JOIN class_group_teacher_mapper cgtm ON cgtm.class_group_id_ = cg.id_
         LEFT JOIN vip_group_activity vgc ON vgc.id_ = vg.vip_group_activity_id_
-        WHERE cg.group_type_ = 'VIP' AND cgtm.teacher_role_ = 'BISHOP' AND cgsm.status_ != 'QUIT' AND cgsm.user_id_ = #{studentId}
+        WHERE cg.group_type_ = 'VIP' AND cgtm.teacher_role_ = 'BISHOP' AND cgsm.user_id_ = #{studentId} AND vg.status_ != 3
         <if test="vipGroupName != null">
             AND vg.name_ LIKE CONCAT('%',#{vipGroupName},'%')
         </if>
@@ -535,7 +535,7 @@
         LEFT JOIN class_group cg ON cgsm.class_group_id_ = cg.id_
         LEFT JOIN vip_group vg ON cg.music_group_id_ = vg.id_
         LEFT JOIN class_group_teacher_mapper cgtm ON cgtm.class_group_id_ = cg.id_
-        WHERE cg.group_type_ = 'VIP' AND cgtm.teacher_role_ = 'BISHOP' AND cgsm.status_ != 'QUIT' AND cgsm.user_id_ = #{studentId}
+        WHERE cg.group_type_ = 'VIP' AND cgtm.teacher_role_ = 'BISHOP' AND cgsm.user_id_ = #{studentId} AND vg.status_ != 3
         <if test="vipGroupName != null">
             AND vg.name_ LIKE CONCAT('%',#{vipGroupName},'%')
         </if>

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

@@ -37,6 +37,7 @@
         <result column="stop_reason_" property="stopReason"/>
         <result column="courses_start_date" property="courseStartDate"/>
         <result column="course_schedules_json_" property="courseSchedulesJson"/>
+        <result column="student_id_list_" property="studentIdList"/>
 
         <result column="organ_name_" property="organName" />
         <result column="school_name_" property="schoolName" />
@@ -179,7 +180,7 @@
 		SELECT
             vg.*,
             vga.name_ vip_group_activity_name_,
-            su.username_
+            su.real_name_ username_
         FROM
             vip_group vg
             LEFT JOIN sys_user su ON vg.user_id_=su.id_
@@ -206,8 +207,8 @@
         </selectKey>
         -->
         INSERT INTO vip_group
-        (id_,user_id_,single_class_minutes_,payment_expire_date_,courses_expire_date_,create_time_,update_time_,teacher_school_id_,online_classes_num_,offline_classes_num_,registration_start_time_,name_,organ_id_list_,vip_group_activity_id_,status_,online_classes_unit_price_,offline_classes_unit_price_,total_price_,give_teach_mode_,vip_group_category_id_,organ_id_,stop_reason_,audit_status_,courses_start_date,course_schedules_json_)
-        VALUES(#{id},#{userId},#{singleClassMinutes},#{paymentExpireDate},#{coursesExpireDate},now(),now(),#{teacherSchoolId},#{onlineClassesNum},#{offlineClassesNum},#{registrationStartTime},#{name},#{organIdList},#{vipGroupActivityId},#{status,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{onlineClassesUnitPrice},#{offlineClassesUnitPrice},#{totalPrice},#{giveTeachMode},#{vipGroupCategoryId},#{organId},#{stopReason},#{auditStatus,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{courseStartDate},#{courseSchedulesJson})
+        (id_,user_id_,single_class_minutes_,payment_expire_date_,courses_expire_date_,create_time_,update_time_,teacher_school_id_,online_classes_num_,offline_classes_num_,registration_start_time_,name_,organ_id_list_,vip_group_activity_id_,status_,online_classes_unit_price_,offline_classes_unit_price_,total_price_,give_teach_mode_,vip_group_category_id_,organ_id_,stop_reason_,audit_status_,courses_start_date,course_schedules_json_,student_id_list_)
+        VALUES(#{id},#{userId},#{singleClassMinutes},#{paymentExpireDate},#{coursesExpireDate},now(),now(),#{teacherSchoolId},#{onlineClassesNum},#{offlineClassesNum},#{registrationStartTime},#{name},#{organIdList},#{vipGroupActivityId},#{status,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{onlineClassesUnitPrice},#{offlineClassesUnitPrice},#{totalPrice},#{giveTeachMode},#{vipGroupCategoryId},#{organId},#{stopReason},#{auditStatus,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{courseStartDate},#{courseSchedulesJson},#{studentIdList})
     </insert>
 
     <!-- 根据主键查询一条记录 -->
@@ -280,6 +281,9 @@
             <if test="courseSchedulesJson!=null">
                 course_schedules_json_=#{courseSchedulesJson},
             </if>
+            <if test="studentIdList!=null">
+                student_id_list_=#{studentIdList},
+            </if>
         </set>
         WHERE id_ = #{id}
     </update>
@@ -312,6 +316,7 @@
             AND vg.courses_start_date &gt; NOW()
             AND (select count(1) as num from student_payment_order where vg.id_ = music_group_id_ AND user_id_=#{userId} AND status_='SUCCESS') = 0
             AND vg.organ_id_ = #{organId}
+            AND (vg.student_id_list_ IS NULL or FIND_IN_SET(#{userId}, vg.student_id_list_))
             <if test="subjectId!=null">
                AND FIND_IN_SET(#{subjectId},cg.subject_id_list_)
             </if>
@@ -878,6 +883,9 @@
 	            <if test="item.courseSchedulesJson!=null">
 	                course_schedules_json_=#{item.courseSchedulesJson},
 	            </if>
+	            <if test="item.studentIdList!=null">
+                    student_id_list_=#{item.studentIdList},
+	            </if>
 	        </set>
 	        WHERE id_ = #{item.id}
         </foreach>

mec-education/src/main/java/com/ym/mec/education/service/impl/TeacherServiceImpl.java

@@ -82,7 +82,7 @@ public class TeacherServiceImpl extends ServiceImpl<TeacherMapper, Teacher> impl
     public PageResponse teacherList(TeacherReq req) {
         PageResponse response = new PageResponse();
         QueryWrapper<SysUser> userQueryWrapper = new QueryWrapper<>();
-        if (Objects.isNull(req.getUserId())) {
+        if (Objects.isNull(req)||Objects.isNull(req.getUserId())) {
             return PageResponse.errorParam();
         }
         Teacher teacher = getById(req.getUserId());
@@ -255,7 +255,7 @@ public class TeacherServiceImpl extends ServiceImpl<TeacherMapper, Teacher> impl
     public PageResponse teacherVipClass(TeacherReq req) {
 
         PageResponse response = new PageResponse();
-        if (req == null && req.getUserId() == null) {
+        if (req == null || req.getUserId() == null) {
             return PageResponse.errorParam();
         }
 

mec-student/src/main/java/com/ym/mec/student/controller/CourseController.java

@@ -50,7 +50,7 @@ public class CourseController extends BaseController {
         if(null == groupId){
             return failed("参数校验错误");
         }
-        return succeed(classGroupService.get(groupId));
+        return succeed(classGroupService.findGroupById(groupId));
     }
 
     @ApiOperation(value = "分页获取学员购买记录")

mec-student/src/main/java/com/ym/mec/student/controller/MusicGroupController.java

@@ -162,6 +162,7 @@ public class MusicGroupController extends BaseController {
         model.put("amount", amount);
         model.put("nextPaymentDate", musicGroupStudentFee.getNextPaymentDate());
         model.put("musicGroupSubjectPlan", musicGroupSubjectPlan);
+        model.put("balance",studentRegistration.getBalance());
 
         return succeed(model);
     }

mec-student/src/main/java/com/ym/mec/student/controller/StudentManageController.java

@@ -96,7 +96,7 @@ public class StudentManageController extends BaseController {
     @GetMapping("userCashAccountDetail/queryPage")
     public Object queryPage(CashAccountDetail queryInfo) {
         SysUser user = sysUserFeignService.queryUserInfo();
-        if(user == null && user.getId() != null){
+        if(user == null || user.getId() != null){
             return failed("请重新登录");
         }
         queryInfo.setUserId(user.getId());

mec-teacher/src/main/java/com/ym/mec/teacher/controller/TeacherManageController.java

@@ -9,12 +9,13 @@ import com.ym.mec.biz.service.*;
 import com.ym.mec.common.controller.BaseController;
 import com.ym.mec.common.entity.UploadReturnBean;
 import com.ym.mec.util.upload.UploadUtil;
-import io.swagger.annotations.*;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestParam;
@@ -100,7 +101,7 @@ public class TeacherManageController extends BaseController {
     @GetMapping("userCashAccountDetail/queryPage")
     public Object queryPage(CashAccountDetail queryInfo) {
         SysUser user = sysUserFeignService.queryUserInfo();
-        if(user == null && user.getId() != null){
+        if(user == null || user.getId() != null){
             return failed("请重新登录");
         }
         queryInfo.setUserId(user.getId());

mec-thirdparty/src/main/java/com/ym/mec/thirdparty/yqpay/YqPayUtil.java

@@ -44,7 +44,7 @@ public class YqPayUtil {
         List<Map> tempRoutingList = new ArrayList();
         Map<String, Object> routingList = new HashMap<>();
         routingList.put("routingMerNo", routingMerNo);//分佣账户
-        routingList.put("routingFee", amount.subtract((amount.multiply(new BigDecimal(0.28)).divide(new BigDecimal(100))).setScale(2, BigDecimal.ROUND_HALF_UP))); //分佣金额
+        routingList.put("routingFee", amount.subtract((amount.multiply(new BigDecimal("0.28")).divide(new BigDecimal(100))).setScale(2, BigDecimal.ROUND_HALF_UP))); //分佣金额
         tempRoutingList.add(routingList);
 
         Map<String, Object> contentMap = new LinkedHashMap<>();

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

@@ -3,6 +3,7 @@ package com.ym.mec.web.controller;
 import com.ym.mec.auth.api.client.SysUserFeignService;
 import com.ym.mec.auth.api.entity.SysUser;
 import com.ym.mec.biz.dal.dao.ClassGroupTeacherMapperDao;
+import com.ym.mec.biz.dal.dto.CoursePostponeDto;
 import com.ym.mec.biz.dal.dto.CreateCourseScheduleDto;
 import com.ym.mec.biz.dal.dto.VipGroupCourseAdjustInfoDto;
 import com.ym.mec.biz.dal.entity.ClassGroupTeacherMapper;
@@ -277,4 +278,12 @@ public class CourseScheduleController extends BaseController {
         return succeed(scheduleService.endFindCourseSchedules(queryInfo));
     }
 
+    @ApiOperation(value = "课程顺延")
+    @PostMapping("/coursePostpone")
+    @PreAuthorize("@pcs.hasPermissions('courseSchedule/coursePostpone')")
+    public Object coursePostpone(CoursePostponeDto coursePostPoneInfo){
+        scheduleService.coursePostpone(coursePostPoneInfo);
+        return succeed();
+    }
+
 }

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

@@ -186,7 +186,7 @@ public class ExportController extends BaseController {
             if (row.getActualAmount() == null) {
                 row.setActualAmount(BigDecimal.ZERO);
             }
-            BigDecimal transferFee = (row.getActualAmount().multiply(new BigDecimal(0.28)).divide(new BigDecimal(100))).setScale(2, BigDecimal.ROUND_HALF_UP);
+            BigDecimal transferFee = (row.getActualAmount().multiply(new BigDecimal("0.28")).divide(new BigDecimal(100))).setScale(2, BigDecimal.ROUND_HALF_UP);
             row.setTransferFee(transferFee);
             BigDecimal musicalFee = BigDecimal.ZERO;
             BigDecimal teachingFee = BigDecimal.ZERO;

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

@@ -4,17 +4,13 @@ import com.ym.mec.auth.api.client.SysUserFeignService;
 import com.ym.mec.auth.api.entity.SysUser;
 import com.ym.mec.biz.dal.dao.SysConfigDao;
 import com.ym.mec.biz.dal.dto.CashAccountDetail;
-import com.ym.mec.biz.dal.entity.StudentPaymentOrder;
 import com.ym.mec.biz.dal.entity.SysUserCashAccountDetail;
 import com.ym.mec.biz.service.SysUserCashAccountDetailService;
 import com.ym.mec.common.controller.BaseController;
-
 import com.ym.mec.common.page.PageInfo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
-
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -47,7 +43,7 @@ public class SysUserCashAccountDetailController extends BaseController {
     @PreAuthorize("@pcs.hasPermissions('userCashAccountDetail/queryPage')")
     public Object queryPage(CashAccountDetail queryInfo) {
         SysUser user = sysUserFeignService.queryUserInfo();
-        if (user == null && user.getId() != null) {
+        if (user == null || user.getId() != null) {
             return failed("请重新登录");
         }
         queryInfo.setUserId(user.getId());