Merge remote-tracking branch 'origin/master'

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

@@ -69,8 +69,9 @@ public class CourseScheduleTeacherSalaryServiceImpl extends BaseServiceImpl<Long
                                                      BigDecimal offlineTeacherSalary) {
 
         School school = schoolService.get(vipGroup.getTeacherSchoolId());
-        if (Objects.isNull(school)) {
-            throw new BizException("未找到该教学点");
+        BigDecimal subsidy = new BigDecimal(0);
+        if (Objects.nonNull(school)) {
+            subsidy=school.getSubsidy();
         }
 
         //获取活动信息
@@ -95,7 +96,7 @@ public class CourseScheduleTeacherSalaryServiceImpl extends BaseServiceImpl<Long
                 courseScheduleTeacherSalary.setTeacherRole(TeachTypeEnum.BISHOP);
                 courseScheduleTeacherSalary.setUserId(courseSchedules.get(i).getActualTeacherId().intValue());
                 courseScheduleTeacherSalary.setClassGroupId(courseSchedules.get(i).getClassGroupId());
-                courseScheduleTeacherSalary.setSubsidy(school.getSubsidy());
+                courseScheduleTeacherSalary.setSubsidy(subsidy);
 
                 if (vipGroupActivity.getType() == VipGroupActivityTypeEnum.GIVE_CLASS
                         && vipGroup.getGiveTeachMode() == teachModeEnum

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

@@ -335,11 +335,11 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
 		memo.put("vipGroupId",vipGroupApplyBaseInfoDto.getId());
 
 		Set<Integer> userIds = musicGroupDao.queryUserIdByRoleId(roleIds,sysUser.getOrganId());
-		if (vipGroup.getVipGroupApplyBaseInfo().getUserId() != null){
-			sysMessageService.batchSeoMessage(userIds,MessageTypeEnum.BACKSTAGE_VIP_COURSE_APPLY, JSONObject.toJSONString(memo),sysUser.getUsername(),sysUser.getUsername());
-		}else {
-			sysMessageService.batchSeoMessage(userIds,MessageTypeEnum.BACKSTAGE_TEACHER_APPLY_VIP, JSONObject.toJSONString(memo),sysUser.getUsername());
-		}
+//		if (vipGroup.getVipGroupApplyBaseInfo().getUserId() != null){
+//			sysMessageService.batchSeoMessage(userIds,MessageTypeEnum.BACKSTAGE_VIP_COURSE_APPLY, JSONObject.toJSONString(memo),sysUser.getUsername(),sysUser.getUsername());
+//		}else {
+		sysMessageService.batchSeoMessage(userIds,MessageTypeEnum.BACKSTAGE_TEACHER_APPLY_VIP, JSONObject.toJSONString(memo),sysUser.getUsername());
+//		}
 	}
 
 	@Override

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

@@ -1522,8 +1522,9 @@
         SELECT cssp.user_id_,cs.actual_teacher_id_ teacher_id_,
         cs.id_ course_schedule_id_,cs.class_group_id_,cs.music_group_id_,cs.group_type_,cg.current_class_times_
         FROM course_schedule_student_payment cssp
-        LEFT JOIN course_schedule cs ON cssp.course_schedule_id_ = cs.id_ LEFT JOIN class_group cg ON cg.id_=cs.class_group_id_
-        LEFT JOIN student_attendance sa ON sa.course_schedule_id_= cssp.course_schedule_id_ AND cssp.user_id_=sa.user_id_
+        LEFT JOIN course_schedule cs ON cssp.course_schedule_id_ = cs.id_
+        LEFT JOIN class_group cg ON cg.id_=cs.class_group_id_
+        LEFT JOIN student_attendance sa ON sa.course_schedule_id_ = cssp.course_schedule_id_ AND cssp.user_id_ = sa.user_id_
         WHERE CONCAT(cs.class_date_,' ',cs.end_class_time_) <= now() AND sa.id_ IS NULL
     </select>
     <select id="getNextCourseSchedule" resultMap="CourseSchedule">

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

@@ -49,7 +49,7 @@ public class MusicGroupRegisterController extends BaseController {
         if (hasReg != null) {
             return failed("该乐团您已报名");
         }
-        if (DateUtil.daysBetween(musicGroup.getApplyExpireDate(),date) > 0) {
+        if (DateUtil.daysBetween(musicGroup.getApplyExpireDate(),date) > 1) {
             return failed("乐团已截止报名");
         }
 

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

@@ -63,7 +63,7 @@ public class VipGroupManageController extends BaseController {
         if(Objects.isNull(sysUser)){
             return failed("请指定指导老师!");
         }
-        vipGroupApplyDto.getVipGroupApplyBaseInfo().setOrganIdList(sysUser.getOrganId().toString());
+        vipGroupApplyDto.getVipGroupApplyBaseInfo().setOrganIdList(sysUser.getOrganId());
         sysUser = sysUserFeignService.queryUserInfo();
         if (sysUser == null) {
             return failed("用户信息获取失败");