Merge branch 'master' into feature-goods-river

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/dao/MusicGroupStudentFeeDao.java

@@ -1,5 +1,6 @@
 package com.ym.mec.biz.dal.dao;
 
+import com.ym.mec.biz.dal.dto.UpdateStudentFeeDto;
 import com.ym.mec.biz.dal.entity.MusicGroupStudentFee;
 import com.ym.mec.common.dal.BaseDAO;
 import org.apache.ibatis.annotations.Param;
@@ -32,7 +33,7 @@ public interface MusicGroupStudentFeeDao extends BaseDAO<Long, MusicGroupStudent
 	 * @param musicGroupId
 	 * @return
 	 */
-	int deleteByMusicGroupId(String musicGroupId);
+	int deleteByMusicGroupId(@Param("musicGroupId") String musicGroupId,@Param("isLock") Integer isLock);
 
 	/**
 	 * @describe 根据学生编号和乐团编号更新旷课次数
@@ -128,4 +129,17 @@ public interface MusicGroupStudentFeeDao extends BaseDAO<Long, MusicGroupStudent
 	 * @return
 	 */
 	List<Map<Integer, String>> findPaymentStatusMap(String musicGroupId);
+
+	/**
+	 * 修改单个学员缴费周期
+	 * @param fee
+	 */
+    void updateStudentFee(@Param("fee") UpdateStudentFeeDto fee);
+
+	/**
+	 * 根据乐团编号获取fee表
+	 * @param musicGroupId
+	 * @return
+	 */
+	List<MusicGroupStudentFee> queryByMusicGroupId(String musicGroupId);
 }

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/dto/UpdateStudentFeeDto.java

@@ -1,16 +1,33 @@
 package com.ym.mec.biz.dal.dto;
 
+import io.swagger.annotations.ApiModelProperty;
+
 import java.math.BigDecimal;
 import java.util.List;
 
 public class UpdateStudentFeeDto {
+    @ApiModelProperty(value = "学员编号",required = false)
     private Integer studentId;
 
+    @ApiModelProperty(value = "乐团编号",required = false)
+    private String musicGroupId;
+
+    @ApiModelProperty(value = "缴费月份",required = false)
     private List<Integer> month;
 
-    private Integer isLock;
+    @ApiModelProperty(value = "是否锁定1是0否",required = false)
+    private Integer isLock = 0;
+
+    @ApiModelProperty(value = "课程费用",required = false)
+    private BigDecimal amount = BigDecimal.ZERO;
 
-    private BigDecimal amount;
+    public String getMusicGroupId() {
+        return musicGroupId;
+    }
+
+    public void setMusicGroupId(String musicGroupId) {
+        this.musicGroupId = musicGroupId;
+    }
 
     public Integer getStudentId() {
         return studentId;

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

@@ -67,6 +67,12 @@ public class MusicGroupStudentFee {
 
 	private BigDecimal temporaryCourseFee;
 
+	//是否锁定1是，0否
+	private Integer isLock;
+
+	//缴费周期，用逗号分隔
+	private String paymentPeriodList;
+
 	/**  */
 	private java.util.Date createTime;
 
@@ -88,6 +94,22 @@ public class MusicGroupStudentFee {
 	public MusicGroupStudentFee() {
 	}
 
+	public Integer getIsLock() {
+		return isLock;
+	}
+
+	public void setIsLock(Integer isLock) {
+		this.isLock = isLock;
+	}
+
+	public String getPaymentPeriodList() {
+		return paymentPeriodList;
+	}
+
+	public void setPaymentPeriodList(String paymentPeriodList) {
+		this.paymentPeriodList = paymentPeriodList;
+	}
+
 	public Date getNextPaymentDate() {
 		return nextPaymentDate;
 	}

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

@@ -1,6 +1,7 @@
 package com.ym.mec.biz.service;
 
 import com.ym.mec.biz.dal.entity.MusicGroupPaymentCalender;
+import com.ym.mec.biz.dal.entity.MusicGroupStudentFee;
 import com.ym.mec.common.service.BaseService;
 
 import java.util.Date;
@@ -20,5 +21,5 @@ public interface MusicGroupPaymentCalenderService extends BaseService<Long, Musi
 	 * @param latestPaidDate
 	 * @return
 	 */
-	Date getNextPaymentDate(String musicGroupId, Date latestPaidDate);
+	Date getNextPaymentDate(String musicGroupId, Date latestPaidDate, MusicGroupStudentFee fee);
 }

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

@@ -269,5 +269,5 @@ public interface MusicGroupService extends BaseService<String, MusicGroup> {
 	 * 补全musicGroupStudentFee表数据
 	 * @param musicGroupIds
 	 */
-	void musicGroupStudentFeePatch(List<String> musicGroupIds);
+//	void musicGroupStudentFeePatch(List<String> musicGroupIds);
 }

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

@@ -17,4 +17,12 @@ public interface MusicGroupStudentFeeService extends BaseService<Long, MusicGrou
 	 * @param studentFeeDto
 	 */
     void updateStudentFee(UpdateStudentFeeDto studentFeeDto);
+
+	/**
+	 * 获取学员费用
+	 * @param userId
+	 * @param musicGroupId
+	 * @return
+	 */
+	MusicGroupStudentFee findByUser(Integer userId,String musicGroupId);
 }

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

@@ -148,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)) {
@@ -217,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());
 
@@ -998,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) {
@@ -1084,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("请指定小课");
@@ -1127,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));
@@ -1135,7 +1198,6 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
             }
         } catch (DecodeException e) {
             LOGGER.error("节假日解析错误");
-        } finally {
             vipGroupCourseAdjustInfo.setHoliday(false);
         }
 
@@ -1220,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)) {
@@ -2034,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/MusicGroupPaymentCalenderServiceImpl.java

@@ -1,9 +1,12 @@
 package com.ym.mec.biz.service.impl;
 
-import java.util.Date;
-import java.util.List;
+import java.io.Serializable;
+import java.util.*;
 import java.util.stream.Collectors;
 
+import com.ym.mec.biz.dal.entity.MusicGroupStudentFee;
+import io.swagger.models.auth.In;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -38,37 +41,46 @@ public class MusicGroupPaymentCalenderServiceImpl extends BaseServiceImpl<Long,
 	}
 
 	@Override
-	public Date getNextPaymentDate(String musicGroupId, Date latestPaidDate) {
-		List<MusicGroupPaymentCalender> musicGroupPaymentCalenderList = musicGroupPaymentCalenderDao.findByMusicGroupId(musicGroupId);
-		if (musicGroupPaymentCalenderList != null && musicGroupPaymentCalenderList.size() > 0) {
+	public Date getNextPaymentDate(String musicGroupId, Date latestPaidDate, MusicGroupStudentFee fee) {
+		List<Integer> months = null;
+		if(fee != null){
+			String paymentPeriodList = fee.getPaymentPeriodList();
+			if(StringUtils.isEmpty(paymentPeriodList)){
+				return null;
+			}else {
+				months = new ArrayList(Arrays.asList(paymentPeriodList.split(",")));
+				Collections.sort(months);
+			}
+		}else {
+			List<MusicGroupPaymentCalender> musicGroupPaymentCalenderList = musicGroupPaymentCalenderDao.findByMusicGroupId(musicGroupId);
+			if (musicGroupPaymentCalenderList != null && musicGroupPaymentCalenderList.size() > 0) {
+				months = musicGroupPaymentCalenderList.stream().map(e -> e.getPaymentMonth()).sorted().collect(Collectors.toList());
+			}
+		}
+		if (months != null && months.size() > 0) {
 			Date date = latestPaidDate;
 			if (date == null) {
 				date = new Date();
 			}
-			List<Integer> months = musicGroupPaymentCalenderList.stream().map(e -> e.getPaymentMonth()).sorted().collect(Collectors.toList());
-
-			if (months.size() > 0) {
-
-				// 获取当前月份
-				int currentMonth = Integer.parseInt(DateUtil.getMonth(date));
-				int nextMonth = months.get(0);
-				for (int i = 0; i < months.size(); i++) {
-					if (currentMonth < months.get(i)) {
-						nextMonth = months.get(i);
-						break;
-					}
-				}
-				// 修改学员付费周期
-				Date nextPaymentDate = null;
-				if (nextMonth > currentMonth) {
-					nextPaymentDate = DateUtil.addMonths(date, nextMonth - currentMonth);
-				} else if (nextMonth < currentMonth) {
-					nextPaymentDate = DateUtil.addMonths(date, 12 - currentMonth + nextMonth);
-				} else {
-					nextPaymentDate = DateUtil.addMonths(date, 12);
+			// 获取当前月份
+			int currentMonth = Integer.parseInt(DateUtil.getMonth(date));
+			int nextMonth = months.get(0);
+			for (int i = 0; i < months.size(); i++) {
+				if (currentMonth < months.get(i)) {
+					nextMonth = months.get(i);
+					break;
 				}
-				return DateUtil.getFirstDayOfMonth(nextPaymentDate);
 			}
+			// 修改学员付费周期
+			Date nextPaymentDate = null;
+			if (nextMonth > currentMonth) {
+				nextPaymentDate = DateUtil.addMonths(date, nextMonth - currentMonth);
+			} else if (nextMonth < currentMonth) {
+				nextPaymentDate = DateUtil.addMonths(date, 12 - currentMonth + nextMonth);
+			} else {
+				nextPaymentDate = DateUtil.addMonths(date, 12);
+			}
+			return DateUtil.getFirstDayOfMonth(nextPaymentDate);
 		}
 		return null;
 	}

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

@@ -270,11 +270,11 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
                 studentRegistrationDao.batchInsert(studentRegistrationList);
             }
             musicGroupDao.update(musicGroup);
-            List<MusicGroupStudentFee> musicGroupStudentFees = musicGroupStudentFeeDao.initMusicGroupStudentFee(musicGroupId);
-            if(musicGroupStudentFees != null && musicGroupStudentFees.size() > 0){
-                Date nextPaymentDate = musicGroupPaymentCalenderService.getNextPaymentDate(musicGroupId, null);
-                musicGroupStudentFeeDao.batchInsert(musicGroupStudentFees,nextPaymentDate,"PAID_COMPLETED");
-            }
+//            List<MusicGroupStudentFee> musicGroupStudentFees = musicGroupStudentFeeDao.initMusicGroupStudentFee(musicGroupId);
+//            if(musicGroupStudentFees != null && musicGroupStudentFees.size() > 0){
+//                Date nextPaymentDate = musicGroupPaymentCalenderService.getNextPaymentDate(musicGroupId, null,null);
+//                musicGroupStudentFeeDao.batchInsert(musicGroupStudentFees,nextPaymentDate,"PAID_COMPLETED");
+//            }
             musicGroupBuildLogDao.insert(new MusicGroupBuildLog(musicGroupId, "跨团调整", sysUser.getId(),""));
         }
 
@@ -544,7 +544,7 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
         	if(userCashAccount == null){
         		throw new BizException("用户账户找不到");
         	}
-        	if(userCashAccount.getBalance().subtract(amount).doubleValue() > 0){
+        	if(userCashAccount.getBalance().subtract(amount).doubleValue() >= 0){
         		// 更新订单信息
         		studentPaymentOrder.setBalancePaymentAmount(amount);
         		studentPaymentOrder.setOrganId(musicGroup.getOrganId());
@@ -742,7 +742,7 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
         		throw new BizException("用户账户找不到");
         	}
             studentPaymentOrder.setPaymentChannel("BALANCE");
-        	if(userCashAccount.getBalance().subtract(amount).doubleValue() > 0){
+        	if(userCashAccount.getBalance().subtract(amount).doubleValue() >= 0){
         		// 更新订单信息
         		studentPaymentOrder.setBalancePaymentAmount(amount);
         		studentPaymentOrder.setOrganId(musicGroup.getOrganId());
@@ -843,13 +843,13 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
             //删除原有的声部商品组合
             musicGroupSubjectGoodsGroupDao.delByMusicGroupId(subFeeSettingDto.getMusicGroupId());
             //如果是进行中，补充缴费信息
-            if(musicGroup.getStatus() == MusicGroupStatusEnum.PROGRESS){
-                List<MusicGroupStudentFee> musicGroupStudentFees = musicGroupStudentFeeDao.initMusicGroupStudentFee(musicGroupId);
-                if(musicGroupStudentFees != null && musicGroupStudentFees.size() > 0){
-                    Date nextPaymentDate = musicGroupPaymentCalenderService.getNextPaymentDate(musicGroupId, null);
-                    musicGroupStudentFeeDao.batchInsert(musicGroupStudentFees,nextPaymentDate,"PAID_COMPLETED");
-                }
-            }
+//            if(musicGroup.getStatus() == MusicGroupStatusEnum.PROGRESS){
+//                List<MusicGroupStudentFee> musicGroupStudentFees = musicGroupStudentFeeDao.initMusicGroupStudentFee(musicGroupId);
+//                if(musicGroupStudentFees != null && musicGroupStudentFees.size() > 0){
+//                    Date nextPaymentDate = musicGroupPaymentCalenderService.getNextPaymentDate(musicGroupId, null,null);
+//                    musicGroupStudentFeeDao.batchInsert(musicGroupStudentFees,nextPaymentDate,"PAID_COMPLETED");
+//                }
+//            }
             List<MusicGroupSubjectPlan> musicGroupSubjectPlans = subFeeSettingDto.getMusicGroupSubjectPlans();
             if (musicGroupSubjectPlans != null && musicGroupSubjectPlans.size() > 0) {
                 musicGroupSubjectPlans.forEach(e->{
@@ -901,7 +901,7 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
         //生成学员费用表
         List<MusicGroupStudentFee> musicGroupStudentFees = musicGroupStudentFeeDao.initMusicGroupStudentFee(musicGroupId);
         if(musicGroupStudentFees != null && musicGroupStudentFees.size() > 0){
-            musicGroupStudentFeeDao.batchInsert(musicGroupStudentFees,musicGroupPaymentCalenderService.getNextPaymentDate(musicGroupId, null),"PAID_COMPLETED");
+            musicGroupStudentFeeDao.batchInsert(musicGroupStudentFees,musicGroupPaymentCalenderService.getNextPaymentDate(musicGroupId, null,null),"PAID_COMPLETED");
         }
         //记录操作日志
         musicGroupBuildLogDao.insert(new MusicGroupBuildLog(musicGroupId,"确认开团(筹备中 -> 进行中)",sysUser.getId(),""));
@@ -1009,18 +1009,18 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
         }
     }
 
-    @Override
-    public void musicGroupStudentFeePatch(List<String> musicGroupIds) {
-        if(musicGroupIds != null && musicGroupIds.size() > 0){
-            List<MusicGroupStudentFee> musicGroupStudentFees = null;
-            for (String musicGroupId: musicGroupIds) {
-                musicGroupStudentFees = musicGroupStudentFeeDao.initMusicGroupStudentFee(musicGroupId);
-                if(musicGroupStudentFees != null && musicGroupStudentFees.size() > 0){
-                    musicGroupStudentFeeDao.batchInsert(musicGroupStudentFees,musicGroupPaymentCalenderService.getNextPaymentDate(musicGroupId, null),"PAID_COMPLETED");
-                }
-            }
-        }
-    }
+//    @Override
+//    public void musicGroupStudentFeePatch(List<String> musicGroupIds) {
+//        if(musicGroupIds != null && musicGroupIds.size() > 0){
+//            List<MusicGroupStudentFee> musicGroupStudentFees = null;
+//            for (String musicGroupId: musicGroupIds) {
+//                musicGroupStudentFees = musicGroupStudentFeeDao.initMusicGroupStudentFee(musicGroupId);
+//                if(musicGroupStudentFees != null && musicGroupStudentFees.size() > 0){
+//                    musicGroupStudentFeeDao.batchInsert(musicGroupStudentFees,musicGroupPaymentCalenderService.getNextPaymentDate(musicGroupId, null,null),"PAID_COMPLETED");
+//                }
+//            }
+//        }
+//    }
 
     @Override
     public List<MusicCardDto> queryUserMusicGroups(Integer userId) {
@@ -1083,7 +1083,7 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
         }
 
         //删除续费记录
-        musicGroupStudentFeeDao.deleteByMusicGroupId(musicGroupId);
+        musicGroupStudentFeeDao.deleteByMusicGroupId(musicGroupId,null);
 
 		// 删除课表
 		courseScheduleDao.deleteCourseSchedulesByMusicGroupID(musicGroupId, GroupType.MUSIC);
@@ -1175,7 +1175,14 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
         musicGroupDao.update(musicGroup);
 
         // 重新设置下次缴费时间
-        musicGroupStudentFeeDao.updateNextPaymentDate(musicGroupId, musicGroupPaymentCalenderService.getNextPaymentDate(musicGroupId, null));
+        List<MusicGroupStudentFee> fees = musicGroupStudentFeeDao.queryByMusicGroupId(musicGroupId);
+        Date date = new Date();
+        fees.forEach(e->{
+            e.setNextPaymentDate(musicGroupPaymentCalenderService.getNextPaymentDate(musicGroupId, null,e));
+            e.setUpdateTime(date);
+        });
+        musicGroupStudentFeeDao.batchUpdate(fees);
+//        musicGroupStudentFeeDao.updateNextPaymentDate(musicGroupId, musicGroupPaymentCalenderService.getNextPaymentDate(musicGroupId, null));
         musicGroupBuildLogDao.insert(new MusicGroupBuildLog(musicGroupId,"恢复乐团",sysUser.getId(),""));
 
         //恢复课表
@@ -1539,7 +1546,7 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
                 musicGroupStudentFee.setLatestPaidTime(date);
                 musicGroupStudentFee.setPaymentStatus(PaymentStatus.PAID_COMPLETED);
                 musicGroupStudentFee.setTemporaryCourseFee(new BigDecimal(0));
-                musicGroupStudentFee.setNextPaymentDate(musicGroupPaymentCalenderService.getNextPaymentDate(musicGroupId, musicGroupStudentFee.getNextPaymentDate()));
+                musicGroupStudentFee.setNextPaymentDate(musicGroupPaymentCalenderService.getNextPaymentDate(musicGroupId, musicGroupStudentFee.getNextPaymentDate(),musicGroupStudentFee));
                 musicGroupStudentFeeDao.update(musicGroupStudentFee);
         		return null;
         	}else{
@@ -1614,7 +1621,7 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
             musicGroupStudentFee.setLatestPaidTime(date);
             musicGroupStudentFee.setPaymentStatus(PaymentStatus.PAID_COMPLETED);
             musicGroupStudentFee.setTemporaryCourseFee(new BigDecimal(0));
-            musicGroupStudentFee.setNextPaymentDate(musicGroupPaymentCalenderService.getNextPaymentDate(musicGroupId, musicGroupStudentFee.getNextPaymentDate()));
+            musicGroupStudentFee.setNextPaymentDate(musicGroupPaymentCalenderService.getNextPaymentDate(musicGroupId, musicGroupStudentFee.getNextPaymentDate(),musicGroupStudentFee));
             musicGroupStudentFeeDao.update(musicGroupStudentFee);
 
             //插入交易明细
@@ -1803,41 +1810,42 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
         List<Integer> months = subFeeSettingDto.getMonths();
 
         //判断缴费日历是否修改
-		boolean isModifiedOfCalender = false;
-
-		List<MusicGroupPaymentCalender> calenderList = musicGroupPaymentCalenderDao.findByMusicGroupId(musicGroupId);
-		if (months.size() == calenderList.size()) {
-			for (MusicGroupPaymentCalender cal : calenderList) {
-				if (!months.contains(cal.getPaymentMonth())) {
-					isModifiedOfCalender = true;
-					break;
-				}
-			}
-		} else {
-			isModifiedOfCalender = true;
-		}
+        boolean isModifiedOfCalender = false;
 
-		if (isModifiedOfCalender) {
+        List<MusicGroupPaymentCalender> calenderList = musicGroupPaymentCalenderDao.findByMusicGroupId(musicGroupId);
+        if (months.size() == calenderList.size()) {
+            for (MusicGroupPaymentCalender cal : calenderList) {
+                if (!months.contains(cal.getPaymentMonth())) {
+                    isModifiedOfCalender = true;
+                    break;
+                }
+            }
+        } else {
+            isModifiedOfCalender = true;
+        }
 
-			Integer num = musicGroupStudentFeeDao.countStudentNoPayNum(musicGroupId);
-			if (num > 0) {
-				throw new BizException("缴费周期更新失败，当前乐团有未缴费的学员");
-			}
+        if (isModifiedOfCalender) {
 
-			// 删除乐团相关付费周期
-			musicGroupPaymentCalenderDao.delByGroupId(musicGroupId);
-			musicGroupStudentFeeDao.deleteByMusicGroupId(musicGroupId);
-			if (months != null && months.size() > 0) {
-				// 批量插入
-				musicGroupPaymentCalenderDao.batchAdd(months, musicGroupId);
-			}
+            Integer num = musicGroupStudentFeeDao.countStudentNoPayNum(musicGroupId);
+            if (num > 0) {
+                throw new BizException("缴费周期更新失败，当前乐团有未缴费的学员");
+            }
 
-			//生成学员费用表
-	        List<MusicGroupStudentFee> musicGroupStudentFees = musicGroupStudentFeeDao.initMusicGroupStudentFee(musicGroupId);
-	        if(musicGroupStudentFees != null && musicGroupStudentFees.size() > 0){
-	            musicGroupStudentFeeDao.batchInsert(musicGroupStudentFees,musicGroupPaymentCalenderService.getNextPaymentDate(musicGroupId, null),"PAID_COMPLETED");
-	        }
-		}
+            // 删除乐团相关付费周期
+            musicGroupPaymentCalenderDao.delByGroupId(musicGroupId);
+            musicGroupStudentFeeDao.deleteByMusicGroupId(musicGroupId,0);
+            if (months != null && months.size() > 0) {
+                // 批量插入
+                musicGroupPaymentCalenderDao.batchAdd(months, musicGroupId);
+            }
+            if(musicGroup.getStatus() == MusicGroupStatusEnum.PROGRESS){
+                //生成学员费用表
+                List<MusicGroupStudentFee> musicGroupStudentFees = musicGroupStudentFeeDao.initMusicGroupStudentFee(musicGroupId);
+                if(musicGroupStudentFees != null && musicGroupStudentFees.size() > 0){
+                    musicGroupStudentFeeDao.batchInsert(musicGroupStudentFees,musicGroupPaymentCalenderService.getNextPaymentDate(musicGroupId, null,null),"PAID_COMPLETED");
+                }
+            }
+        }
         musicGroupDao.update(musicGroup);
         //修改课程里面的教学点
         if(!musicGroup.getSchoolId().equals(musicGroup.getSchoolId())){

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

@@ -1,18 +1,9 @@
 package com.ym.mec.biz.service.impl;
 
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import com.ym.mec.biz.dal.dto.UpdateStudentFeeDto;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
 import com.ym.mec.biz.dal.dao.MusicGroupDao;
 import com.ym.mec.biz.dal.dao.MusicGroupStudentFeeDao;
 import com.ym.mec.biz.dal.dao.SysConfigDao;
+import com.ym.mec.biz.dal.dto.UpdateStudentFeeDto;
 import com.ym.mec.biz.dal.entity.MusicGroup;
 import com.ym.mec.biz.dal.entity.MusicGroupStudentFee;
 import com.ym.mec.biz.dal.entity.MusicGroupStudentFee.PaymentStatus;
@@ -23,6 +14,12 @@ import com.ym.mec.biz.service.SysMessageService;
 import com.ym.mec.common.dal.BaseDAO;
 import com.ym.mec.common.service.impl.BaseServiceImpl;
 import com.ym.mec.thirdparty.message.MessageSenderPluginContext.MessageSender;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.math.BigDecimal;
+import java.util.*;
+import java.util.stream.Collectors;
 
 @Service
 public class MusicGroupStudentFeeServiceImpl extends BaseServiceImpl<Long, MusicGroupStudentFee> implements MusicGroupStudentFeeService {
@@ -54,9 +51,10 @@ public class MusicGroupStudentFeeServiceImpl extends BaseServiceImpl<Long, Music
 		List<MusicGroupStudentFee> updateList = new ArrayList<MusicGroupStudentFee>();
 
 		List<MusicGroupStudentFee> musicGroupStudentFeeList = musicGroupStudentFeeDao.queryWillRenewList(days);
-
 		for (MusicGroupStudentFee musicGroupStudentFee : musicGroupStudentFeeList) {
-			if (musicGroupStudentFee.getPaymentStatus() == PaymentStatus.PAID_COMPLETED && (musicGroupStudentFee.getCourseFee() != null && musicGroupStudentFee.getCourseFee().doubleValue() > 0)) {
+			//课程费用为空，或者课程费用为0，只更新下次缴费时间
+			if (musicGroupStudentFee.getPaymentStatus() == PaymentStatus.PAID_COMPLETED &&
+					(musicGroupStudentFee.getCourseFee() != null && musicGroupStudentFee.getCourseFee().doubleValue() > 0)) {
 				musicGroupStudentFee.setPaymentStatus(PaymentStatus.NON_PAYMENT);
 				musicGroupStudentFee.setUpdateTime(date);
 				updateList.add(musicGroupStudentFee);
@@ -66,7 +64,7 @@ public class MusicGroupStudentFeeServiceImpl extends BaseServiceImpl<Long, Music
 		if (updateList.size() > 0) {
 			musicGroupStudentFeeDao.batchUpdate(updateList);
 			MusicGroup musicGroup = musicGroupDao.get(updateList.get(0).getMusicGroupId());
-			Map<Integer, String> push = new HashMap<Integer, String>();
+			Map<Integer, String> push = new HashMap<>();
 			for (MusicGroupStudentFee sf : updateList) {
 				push.put(sf.getUserId(), sf.getUserId() + "");
 			}
@@ -83,7 +81,13 @@ public class MusicGroupStudentFeeServiceImpl extends BaseServiceImpl<Long, Music
 
 	@Override
 	public void updateStudentFee(UpdateStudentFeeDto studentFeeDto) {
+		//修改学员缴费周期和是否锁定
+		musicGroupStudentFeeDao.updateStudentFee(studentFeeDto);
+	}
 
+	@Override
+	public MusicGroupStudentFee findByUser(Integer userId, String musicGroupId) {
+		return musicGroupStudentFeeDao.findByUser(userId,musicGroupId);
 	}
 
 }

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

@@ -570,10 +570,6 @@ public class StudentRegistrationServiceImpl extends BaseServiceImpl<Long, Studen
                 sysUserCashAccountDao.insert(new SysUserCashAccount(userId, "CNY"));
                 //添加用户电子签章账户
 //                contractService.register(userId, sysUser.getRealName(), sysUser.getIdCardNo(), sysUser.getPhone());
-                //注册到融云
-//                if (StringUtils.isEmpty(sysUser.getAvatar())) {
-//                    sysUser.setAvatar(sysConfigDao.findConfigValue(SysConfigService.USER_DEFAULT_HEAD_URL));
-//                }
                 ImResult register = imFeignService.register(new ImUserModel(userId.toString(), sysUser.getUsername(), null));
                 sysUser.setImToken(register.getToken());
                 teacherDao.updateUser(sysUser);
@@ -610,7 +606,7 @@ public class StudentRegistrationServiceImpl extends BaseServiceImpl<Long, Studen
                 MusicGroupSubjectPlan musicOneSubjectClassPlan = musicGroupSubjectPlanDao.getMusicOneSubjectClassPlan(musicGroupId, studentRegistration.getActualSubjectId());
                 studentAddDto.setCourseFee(musicOneSubjectClassPlan.getFee());
             }
-            Date nextPaymentDate = musicGroupPaymentCalenderService.getNextPaymentDate(musicGroupId, null);
+            Date nextPaymentDate = musicGroupPaymentCalenderService.getNextPaymentDate(musicGroupId, null,null);
 
             StudentPaymentOrder waitPayOrder = studentPaymentOrderService.findMusicGroupApplyOrderByStatus(userId, studentRegistration.getMusicGroupId(), DealStatusEnum.WAIT_PAY);
 

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/MusicGroupStudentFeeMapper.xml

@@ -19,6 +19,8 @@
         <result column="update_time_" property="updateTime"/>
         <result column="payment_status_" property="paymentStatus" typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler"/>
         <result column="temporary_course_fee_" property="temporaryCourseFee"/>
+        <result column="is_lock_" property="isLock"/>
+        <result column="payment_period_list_" property="paymentPeriodList"/>
     </resultMap>
 
     <!-- 根据主键查询一条记录 -->
@@ -34,15 +36,15 @@
     <!-- 向数据库增加一条记录 -->
     <insert id="insert" parameterType="com.ym.mec.biz.dal.entity.MusicGroupStudentFee" useGeneratedKeys="true"
             keyColumn="id" keyProperty="id">
-		INSERT INTO music_group_student_fee_ (id_,music_group_id_,user_id_,course_fee_,create_time_,update_time_,next_payment_date_,latest_paid_time_,continuous_absenteeism_times_,subject_id_,payment_status_,temporary_course_fee_)
-		VALUES(#{id},#{musicGroupId},#{userId},#{courseFee},now(),now(),#{nextPaymentDate},#{latestPaidTime},#{continuousAbsenteeismTimes},#{subjectId},#{paymentStatus,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{temporaryCourseFee})
+		INSERT INTO music_group_student_fee_ (id_,music_group_id_,user_id_,course_fee_,create_time_,update_time_,next_payment_date_,latest_paid_time_,continuous_absenteeism_times_,subject_id_,payment_status_,temporary_course_fee_,is_lock_,payment_period_list_)
+		VALUES(#{id},#{musicGroupId},#{userId},#{courseFee},now(),now(),#{nextPaymentDate},#{latestPaidTime},#{continuousAbsenteeismTimes},#{subjectId},#{paymentStatus,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{temporaryCourseFee},#{isLock},#{paymentPeriodList})
 	</insert>
 
     <insert id="batchInsert" parameterType="com.ym.mec.biz.dal.entity.MusicGroupStudentFee">
-        INSERT INTO music_group_student_fee_ (music_group_id_,user_id_,create_time_,update_time_,next_payment_date_,subject_id_,payment_status_,course_fee_)
+        INSERT INTO music_group_student_fee_ (music_group_id_,user_id_,create_time_,update_time_,next_payment_date_,subject_id_,payment_status_,course_fee_,payment_period_list_)
 		VALUES
 		<foreach collection="musicGroupStudentFees" item="item" separator=",">
-            (#{item.musicGroupId},#{item.userId},NOW(),NOW(),#{nextPaymentDate},#{item.subjectId},#{paymentStatus},#{item.courseFee})
+            (#{item.musicGroupId},#{item.userId},NOW(),NOW(),#{nextPaymentDate},#{item.subjectId},#{paymentStatus},#{item.courseFee},#{item.paymentPeriodList})
         </foreach>
     </insert>
 
@@ -80,6 +82,12 @@
             <if test="temporaryCourseFee != null">
                 temporary_course_fee_ = #{temporaryCourseFee},
             </if>
+            <if test="isLock != null">
+                is_lock_ = #{isLock},
+            </if>
+            <if test="paymentPeriodList != null">
+                payment_period_list_ = #{paymentPeriodList},
+            </if>
         </set>
         WHERE id_ = #{id}
     </update>
@@ -106,6 +114,9 @@
 	
     <delete id="deleteByMusicGroupId" parameterType="map">
 		DELETE FROM music_group_student_fee_ WHERE music_group_id_ = #{musicGroupId}
+		<if test="isLock != null">
+            AND is_lock_ = #{isLock}
+        </if>
 	</delete>
 
     <!-- 分页查询 -->
@@ -128,7 +139,9 @@
     </update>
 
     <select id="queryWillRenewList" resultMap="MusicGroupStudentFee">
-        SELECT * FROM music_group_student_fee_ WHERE next_payment_date_ IS NOT NULL AND payment_status_ = 'PAID_COMPLETED' and date_add(now(), interval #{days} day) >= next_payment_date_
+        SELECT * FROM music_group_student_fee_
+        WHERE next_payment_date_ IS NOT NULL AND payment_status_ = 'PAID_COMPLETED'
+        and date_add(now(), interval #{days} day) >= next_payment_date_
     </select>
 
     <select id="countContinuosAbsenteeismStudentNum" resultType="java.util.Map">
@@ -176,6 +189,9 @@
     <select id="findPaymentStatusMap" resultType="java.util.Map">
         SELECT user_id_ 'key',payment_status_ 'value' FROM music_group_student_fee_ WHERE music_group_id_ = #{musicGroupId}
     </select>
+    <select id="queryByMusicGroupId" resultMap="MusicGroupStudentFee">
+        SELECT * FROM music_group_student_fee_ WHERE music_group_id_ = #{musicGroupId}
+    </select>
 
     <update id="batchUpdate" parameterType="java.util.List">
     	<foreach collection="list" item="item" index="index" open="" close="" separator=";">
@@ -211,11 +227,20 @@
             <if test="item.temporaryCourseFee != null">
                 temporary_course_fee_ = #{item.temporaryCourseFee},
             </if>
+            <if test="item.paymentPeriodList != null">
+                payment_period_list_ = #{item.paymentPeriodList},
+            </if>
         </set>
         WHERE id_ = #{item.id}
         </foreach>
     </update>
     <update id="updateCourseFee">
-        UPDATE music_group_student_fee_ SET course_fee_ = #{courseFee} WHERE music_group_id_ = #{musicGroupId} AND subject_id_ = #{subjectId}
+        UPDATE music_group_student_fee_ SET course_fee_ = #{courseFee}
+        WHERE music_group_id_ = #{musicGroupId} AND subject_id_ = #{subjectId} AND is_lock_ = 0
+    </update>
+    <update id="updateStudentFee">
+        UPDATE music_group_student_fee_
+        SET course_fee_ = #{courseFee},is_lock_ = #{isLock},payment_period_list_ = #{paymentPeriodList}
+        WHERE music_group_id_ = #{musicGroupId} AND user_id_ = #{userId}
     </update>
 </mapper>

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" />
@@ -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-student/src/main/java/com/ym/mec/student/controller/MusicGroupController.java

@@ -240,7 +240,7 @@ public class MusicGroupController extends BaseController {
             return failed(HttpStatus.CREATED, "恭喜您,报名成功!");
         }
 
-        return succeed(musicGroupService.rePay(registerPayDto));
+        return succeed(payMap);
     }
 
     @ApiOperation(value = "订单状态查询")

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

@@ -63,12 +63,12 @@ public class MusicGroupController extends BaseController {
 		return succeed(musicGroupService.findMusicGroupSubjectInfo(musicGroupId));
 	}
 
-	@ApiOperation(value = "用户费用表，数据补全")
-	@PostMapping("/musicGroupStudentFeePatch")
-	public Object musicGroupStudentFeePatch(@RequestBody List<String> musicGroupIds){
-		musicGroupService.musicGroupStudentFeePatch(musicGroupIds);
-		return succeed();
-	}
+//	@ApiOperation(value = "用户费用表，数据补全")
+//	@PostMapping("/musicGroupStudentFeePatch")
+//	public Object musicGroupStudentFeePatch(@RequestBody List<String> musicGroupIds){
+//		musicGroupService.musicGroupStudentFeePatch(musicGroupIds);
+//		return succeed();
+//	}
 
 	@ApiOperation(value = "修改乐团声部信息")
 	@PostMapping("/updateSubjectInfo")

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

@@ -68,5 +68,4 @@ public class MusicGroupPaymentCalenderController extends BaseController {
     public Object queryPage(QueryInfo queryInfo) {
         return succeed(musicGroupPaymentCalenderService.queryPage(queryInfo));
     }
-
 }

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

@@ -10,8 +10,11 @@ import com.ym.mec.biz.service.MusicGroupStudentFeeService;
 import com.ym.mec.biz.service.StudentManageService;
 import com.ym.mec.biz.service.StudentRegistrationService;
 import com.ym.mec.common.controller.BaseController;
+import com.ym.mec.common.exception.BizException;
 import io.swagger.annotations.*;
 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.*;
@@ -35,6 +38,7 @@ public class StudentManageController extends BaseController {
     private MusicGroupStudentFeeService musicGroupStudentFeeService;
     @Autowired
     private EmployeeDao employeeDao;
+    private final Logger LOGGER = LoggerFactory.getLogger(this.getClass());
 
     @ApiOperation(value = "获取学生列表")
     @GetMapping("/queryStudentList")
@@ -189,7 +193,29 @@ public class StudentManageController extends BaseController {
     @GetMapping(value = "/updateStudentFee")
     @PreAuthorize("@pcs.hasPermissions('studentManage/updateStudentFee')")
     public Object updateStudentFee(@RequestBody UpdateStudentFeeDto studentFeeDto) {
+        SysUser sysUser = sysUserFeignService.queryUserInfo();
+        if(sysUser == null){
+            throw new BizException("用户信息获取失败");
+        }
+        LOGGER.info("修改学员缴费金额和缴费周期,user:{},参数:{}",sysUser.getId(),studentFeeDto);
         musicGroupStudentFeeService.updateStudentFee(studentFeeDto);
         return succeed();
     }
+
+    /**
+     * 获取学员缴费日历信息
+     * @return
+     */
+    @GetMapping(value = "/findMusicGroupStudentFee")
+    @PreAuthorize("@pcs.hasPermissions('studentManage/findMusicGroupStudentFee')")
+    public Object findMusicGroupStudentFee(Integer studentId,String musicGroupId) {
+        if(studentId == null || StringUtils.isEmpty(musicGroupId)){
+            throw new BizException("参数校验异常");
+        }
+        SysUser sysUser = sysUserFeignService.queryUserInfo();
+        if(sysUser == null){
+            throw new BizException("用户信息获取失败");
+        }
+        return succeed(musicGroupStudentFeeService.findByUser(studentId,musicGroupId));
+    }
 }