Merge remote-tracking branch 'origin/master'

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

@@ -3689,6 +3689,7 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
 					if(Objects.nonNull(mainTeacherSalary)&&!mainTeacherSalary.getEnableChangeSalary()){
 						ts.setExpectSalary(mainTeacherSalary.getExpectSalary());
 						ts.setSubsidy(mainTeacherSalary.getSubsidy());
+						ts.setEnableChangeSalary(mainTeacherSalary.getEnableChangeSalary());
 					}else{
 						// 重新生成课酬
 						if (newCourseSchedule.getGroupType() == GroupType.MUSIC) {

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

@@ -1515,7 +1515,7 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
 
 		if(Objects.nonNull(vipGroupActivity)&&Objects.nonNull(vipGroupActivity.getStudentMaxUsedTimes())&&vipGroupActivity.getStudentMaxUsedTimes()!=-1){
 			int useNum = vipGroupDao.countStudentUseingActivityNum(vipGroup.getVipGroupActivityId(), Integer.valueOf(user.getId()));
-			if(useNum>vipGroupActivity.getStudentMaxUsedTimes()){
+			if(useNum>=vipGroupActivity.getStudentMaxUsedTimes()){
 				throw new BizException("您已超过该活动购买次数限制", vipGroupActivity.getStudentMaxUsedTimes());
 			}
 		}
@@ -2913,7 +2913,7 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
 		if(Objects.nonNull(vipGroupActivity)&&Objects.nonNull(vipGroupActivity.getStudentMaxUsedTimes())&&vipGroupActivity.getStudentMaxUsedTimes()!=-1&&!CollectionUtils.isEmpty(studentIds)){
 			for (Integer studentId : studentIds) {
 				int useNum = vipGroupDao.countStudentUseingActivityNum(vipGroup.getVipGroupActivityId(), Integer.valueOf(studentId));
-				if(useNum>vipGroupActivity.getStudentMaxUsedTimes()){
+				if(useNum>=vipGroupActivity.getStudentMaxUsedTimes()){
 					SysUser student = teacherDao.getUser(studentId);
 					throw new BizException("{}学员已超过该活动购买次数限制", student.getUsername());
 				}