update

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

@@ -285,5 +285,15 @@ public interface VipGroupService extends BaseService<Long, VipGroup> {
      * @return void
      */
     void stopVipGroupWithNoCreate();
+
+    /**
+     * @describe 添加vip课学员
+     * @author Joburgess
+     * @date 2019/11/15
+     * @param vipGroupId:
+     * @param studentIds:
+     * @return void
+     */
+    void addVipGroupStudents(Long vipGroupId,List<Integer> studentIds);
     
 }

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

@@ -843,6 +843,7 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
 	}
 
 	@Override
+	@Transactional(rollbackFor = Exception.class)
 	public void courseScheduleCommplaint(CourseScheduleComplaints courseScheduleComplaints) {
 		SysUser user = sysUserFeignService.queryUserInfo();
 
@@ -851,11 +852,11 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
 		}
 
 		if(Objects.isNull(courseScheduleComplaints.getCourseScheduleId())){
-			throw new BizException("请指定需要投诉的课程");
+			throw new BizException("请指定需要评价的课程");
 		}
 
 		if(StringUtils.isBlank(courseScheduleComplaints.getReason())){
-			throw new BizException("请说明投诉原因");
+			throw new BizException("请说明写下您的评价");
 		}
 
 		if(StringUtils.length(courseScheduleComplaints.getReason())>150){
@@ -866,7 +867,7 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
 
 		CourseScheduleComplaints byUserAndCourse = courseScheduleComplaintsDao.findByUserAndCourse(courseScheduleComplaints.getUserId().longValue(), courseScheduleComplaints.getCourseScheduleId());
 		if(byUserAndCourse!=null){
-			throw new BizException("您已经对该课程进行过申诉操作!");
+			throw new BizException("您已经对该课程做出了评价!");
 		}
 
 		CourseScheduleDto courseSchedules = courseScheduleDao.getCourseSchedules(courseScheduleComplaints.getCourseScheduleId());
@@ -886,7 +887,7 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
 		Set<Integer> roleIds = new HashSet<>(1);
 		roleIds.add(SysUserRole.EDUCATIONAL_TEACHER);
 		Map<String,Long> memo = new HashMap<>(1);
-		memo.put("courseScheduleComplaintsId",byUserAndCourse.getId());
+		memo.put("courseScheduleComplaintsId",courseScheduleComplaints.getId());
 		sysMessageService.batchSeoMessage(musicGroupDao.queryUserIdByRoleId(roleIds),MessageTypeEnum.BACKSTAGE_STUDENT_APPEAL, JSONObject.toJSONString(memo),courseSchedule.getName(),user.getUsername());
 	}
 

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

@@ -541,6 +541,10 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
 		StudentVipGroupDetailDto vipGroupDetail = vipGroupDao.getVipGroupDetail(vipGroupId);
 		if(StringUtils.isNotEmpty(vipGroup.getCourseSchedulesJson())){
 			vipGroupDetail.setCourseSchedules(JSON.parseArray(vipGroup.getCourseSchedulesJson(),CourseSchedule.class));
+			List<CourseSchedule> collect = vipGroupDetail.getCourseSchedules().stream()
+					.sorted(Comparator.comparing(CourseSchedule::getStartClassTime))
+					.collect(Collectors.toList());
+			vipGroupDetail.setCourseSchedules(collect);
 		}
 
         vipGroupDetail.setNumberOfClasses(vipGroupDao.countTeacherVipGroups(vipGroupDetail.getTeacherId().longValue()));
@@ -1370,6 +1374,17 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
 	}
 
 	@Override
+	public void addVipGroupStudents(Long vipGroupId, List<Integer> studentIds) {
+		if(CollectionUtils.isEmpty(studentIds)){
+			throw new BizException("请选择学生");
+		}
+		if(Objects.isNull(vipGroupId)){
+			throw new BizException("请指定班级");
+		}
+
+	}
+
+	@Override
 	public void stopVipGroupWithNoCreate() {
 		List<VipGroup> noCreateSuccessVipGroups = vipGroupDao.findNoCreateSuccessVipGroup();
 		if(CollectionUtils.isEmpty(noCreateSuccessVipGroups)){

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

@@ -86,7 +86,7 @@
             LEFT JOIN class_group cg ON vgcgm.class_group_id_=cg.id_
             WHERE vgcgm.vip_group_id_ IN
             <foreach collection="vipGroupIds" item="vipGroupId" open="(" close=")" separator=",">
-                #{vipGroupIds}
+                #{vipGroupId}
             </foreach>
     </select>
 </mapper>