Merge branch 'master' of http://gitlab.oytour.com/Kui2/education

Edu.Module.Course/OrderModule.cs

@@ -3120,6 +3120,18 @@ namespace Edu.Module.Course
                 {
                     model.ClassName = studyAbroadRepository.GetEntity(model.SourceId)?.Name ?? "";
                 }
+                model.ClassList = new List<RB_Class_ViewModel>();
+                List<RB_Class_ViewModel> classList = new List<RB_Class_ViewModel>();
+                //获取订单的课程信息
+                var orderCourseList = order_CourseRepository.GetOrderCourseListRepository(new RB_Order_Course_ViewModel { OrderId = model.OrderId });
+
+                string Q_ClassIds = model.ClassId > 0 ? model.ClassId.ToString() : "";
+                Q_ClassIds += ((!string.IsNullOrWhiteSpace(Q_ClassIds) && orderCourseList != null && orderCourseList.Any()) ? "," : "") + string.Join(",", orderCourseList.Select(x => x.ClassId));
+                if (!string.IsNullOrWhiteSpace(Q_ClassIds))
+                {
+                    model.ClassList = classRepository.GetClassListRepository(new RB_Class_ViewModel { Q_ClassIds = Q_ClassIds, ClassScrollType = 0 });
+                }
+
             }
             return model;
         }

Edu.WebApi/Controllers/Course/OrderController.cs

@@ -1251,6 +1251,7 @@ namespace Edu.WebApi.Controllers.Course
             {
                 OrderInfo = new
                 {
+                    ClassList = model.ClassList?.Select(z => new { z.ClassScrollType, z.ClassId, z.ClassName, z.CouseId, z.CourseSubjectName, z.CourseName, z.TeacherName, z.Teacher_Id, OpenTimeStr = StringHelper.FormatDate(z.OpenTime) }),
                     model.OrderId,
                     model.ClassId,
                     model.GuestNum,