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

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

@@ -258,8 +258,16 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
 		if(Objects.isNull(classDate)){
 			throw new BizException("请选择上课日期!");
 		}
+		Date now=new Date();
 		List<CourseScheduleDto> teacherCourseSchedulesWithDate = courseScheduleDao.getTeacherCourseSchedulesWithDate(classDate, userId.longValue(),type);
 		teacherCourseSchedulesWithDate.forEach(courseScheduleDto -> {
+			if(now.before(courseScheduleDto.getStartClassTime())){
+				courseScheduleDto.setStatus(CourseStatusEnum.NOT_START);
+			}else if(now.after(courseScheduleDto.getEndClassTime())){
+				courseScheduleDto.setStatus(CourseStatusEnum.OVER);
+			}else{
+				courseScheduleDto.setStatus(CourseStatusEnum.UNDERWAY);
+			}
 			if(Objects.nonNull(courseScheduleDto.getClassGroupId())){
 				String[] studentNums = classGroupStudentMapperDao.findStudentNumByClassGroupId(courseScheduleDto.getClassGroupId().longValue());
 				courseScheduleDto.setStudentNames(org.apache.commons.lang3.StringUtils.join(studentNums, ","));
@@ -424,7 +432,8 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
                             errInfo.append("安排的课程存在学生冲突");
                             throw new BizException(errInfo.toString());
                         }
-						System.out.println(j==repeatTimes);
+						System.out.print(j==repeatTimes);
+                        System.out.println(" "+j);
                         if(j==repeatTimes){
                             repeatTimes+=1;
                         }

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

@@ -64,7 +64,7 @@ public class SysMessageServiceImpl extends BaseServiceImpl<Long, SysMessage> imp
 
 	private final int DEFAULT_CODE = 888888;
 
-	@Value("${message.debugMode}")
+//	@Value("${message.debugMode}")
 	private boolean debugMode;
 
 	@Override

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

@@ -637,7 +637,7 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
 			switch (vipGroupSalarySettlementDto.getOnlineSalarySettlement().getSalarySettlementType()){
 				case TEACHER_DEFAULT:
 					if(vipGroup instanceof VipGroupApplyBaseInfoDto&&!useDefaultTeacherSalary
-							&&vipGroupActivity.getSalaryReadonlyFlag().equals("0")){
+							&&vipGroupActivity.getSalaryReadonlyFlag().equals("1")){
 						teacherOnlineSalary=((VipGroupApplyBaseInfoDto) vipGroup).getOnlineTeacherSalary();
 					}
 
@@ -668,7 +668,7 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
 			switch (vipGroupSalarySettlementDto.getOfflineSalarySettlement().getSalarySettlementType()){
 				case TEACHER_DEFAULT:
 					if(vipGroup instanceof VipGroupApplyBaseInfoDto&&!useDefaultTeacherSalary
-							&&vipGroupActivity.getSalaryReadonlyFlag().equals("0")){
+							&&vipGroupActivity.getSalaryReadonlyFlag().equals("1")){
 						teacherOfflineSalary=((VipGroupApplyBaseInfoDto) vipGroup).getOfflineTeacherSalary();
 					}
 					if(Objects.isNull(teacherOfflineSalary)||Objects.isNull(Objects.isNull(teacherDefaultVipGroupSalary))){

mec-common/common-core/src/main/java/com/ym/mec/common/redis/config/RedisConfig.java

@@ -41,7 +41,7 @@ public class RedisConfig {
 	}
 
 	@Bean
-	public RedisTemplate<String, Serializable> redisTemplate(JedisConnectionFactory connectionFactory) {
+	public RedisTemplate<String, Serializable> redisTemplate() {
 		RedisTemplate<String, Serializable> redisTemplate = new RedisTemplate<>();
 		redisTemplate.setKeySerializer(new StringRedisSerializer());
 		redisTemplate.setHashKeySerializer(new StringRedisSerializer());

mec-common/common-core/src/main/java/com/ym/mec/common/service/impl/RedisIdGeneratorService.java

@@ -26,7 +26,7 @@ public class RedisIdGeneratorService implements IdGeneratorService {
 
 	@Autowired
 	private RedisCache<String,Object> redisCache;
-	@Value("${message.debugMode}")
+//	@Value("${message.debugMode}")
 	private boolean debugMode;
 
 	/**

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

@@ -47,7 +47,7 @@ public class MusicGroupRegisterController extends BaseController {
             return failed("乐团已截止报名");
         }
 
-        if(musicGroup.getStatus().equals(MusicGroupStatusEnum.APPLY)||musicGroup.getStatus().equals(MusicGroupStatusEnum.PAY)){
+        if (musicGroup.getStatus().equals(MusicGroupStatusEnum.PAY)) {
             studentRegistration.setPaymentStatus(PaymentStatusEnum.OPEN);
         }
         studentRegistration.setOrganId(musicGroup.getOrganId());