update

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

@@ -659,6 +659,9 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
 				}
 				newCourseSchedule.setSchoolId(oldCourseSchedule.getSchoolId());
 			}
+			if(Objects.isNull(newCourseSchedule.getTeachMode())){
+				newCourseSchedule.setTeachMode(oldCourseSchedule.getTeachMode());
+			}
 		});
 		//课程冲突检测
 		checkNewCourseSchedules(newCourseSchedules,false);
@@ -719,7 +722,7 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
 				boolean oldSchoolIsNull=Objects.isNull(oldCourseSchedule.getSchoolId());
 				boolean newSchoolIsNull=Objects.isNull(newCourseSchedule.getSchoolId());
 				boolean teacherIsChange=oldTeacherIsNull||(!newTeacherIsNull&&!oldCourseSchedule.getActualTeacherId().equals(newCourseSchedule.getActualTeacherId()));
-				boolean schoolIsChange=oldSchoolIsNull||(!newSchoolIsNull&&oldCourseSchedule.getSchoolId().equals(newCourseSchedule.getSchoolId()));
+				boolean schoolIsChange=oldSchoolIsNull||(newSchoolIsNull&&!oldCourseSchedule.getSchoolId().equals(newCourseSchedule.getSchoolId()));
 
 				if(teacherIsChange||schoolIsChange){
 					VipGroup byCourseSchedule = vipGroupDao.findByCourseSchedule(newCourseSchedule.getId().intValue());

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

@@ -7,6 +7,7 @@ import com.ym.mec.biz.dal.entity.Goods;
 import com.ym.mec.biz.dal.entity.MusicGroup;
 import com.ym.mec.biz.dal.entity.StudentPaymentOrder;
 import com.ym.mec.biz.dal.enums.DealStatusEnum;
+import com.ym.mec.biz.dal.enums.GroupType;
 import com.ym.mec.biz.dal.enums.OrderTypeEnum;
 import com.ym.mec.biz.service.*;
 import com.ym.mec.common.controller.BaseController;
@@ -94,12 +95,15 @@ public class StudentOrderController extends BaseController {
         if (Objects.isNull(orderByOrderNo)) {
             return failed("未找到指定订单");
         }
-        MusicGroup musicGroup = musicGroupService.get(orderByOrderNo.getMusicGroupId());
-        List<Goods> goodsList = studentPaymentOrderDetailService.findApplyOrderGoods(orderByOrderNo.getId());
         HashMap<String, Object> orderDetail = new HashMap<>();
         orderDetail.put("order",orderByOrderNo);
-        orderDetail.put("goods",goodsList);
-        orderDetail.put("course",musicGroup.getCourseForm());
+        orderDetail.put("groupType",orderByOrderNo.getGroupType());
+        if(orderByOrderNo.getGroupType().equals(GroupType.MUSIC)){
+            MusicGroup musicGroup = musicGroupService.get(orderByOrderNo.getMusicGroupId());
+            List<Goods> goodsList = studentPaymentOrderDetailService.findApplyOrderGoods(orderByOrderNo.getId());
+            orderDetail.put("goods",goodsList);
+            orderDetail.put("course",musicGroup.getCourseForm());
+        }
 
         return succeed(orderDetail);
     }