页面修改

Edu.Module.Course/OrderModule.cs

@@ -152,6 +152,12 @@ namespace Edu.Module.Course
         private readonly RB_PlatformAccountRepository platformAccountRepository = new RB_PlatformAccountRepository();
 
 
+        /// <summary>
+        /// 班级关联课程仓储层对象
+        /// </summary>
+        private readonly RB_Class_CourseRepository class_CourseRepository = new RB_Class_CourseRepository();
+
+
 
         #region 日语培训
 
@@ -163,7 +169,7 @@ namespace Edu.Module.Course
         /// <param name="count"></param>
         /// <param name="dmodel"></param>
         /// <returns></returns>
-        public List<RB_Class_ViewModel> GetClassPruductList(int pageIndex, int pageSize, out long count, RB_Class_ViewModel dmodel)
+        public List<RB_Class_ViewModel> GetClassPruductListModule(int pageIndex, int pageSize, out long count, RB_Class_ViewModel dmodel)
         {
             var list = classRepository.GetClassProductPageList(pageIndex, pageSize, out count, dmodel);
             if (list.Any())
@@ -171,6 +177,7 @@ namespace Edu.Module.Course
                 string classIds = string.Join(",", list.Select(x => x.ClassId));
                 //查询阶梯价格
                 var stepList = class_StepPriceRepository.GetClassStepPriceListRepository(new RB_Class_StepPrice_ViewModel() { QClassIds = classIds });
+                var otherCourseList = class_CourseRepository.GetClassCourseListRepository(new RB_Class_Course_Extend() { QClassIds = classIds });
                 List<RB_Class_Plan_ViewModel> PlanFixed = new List<RB_Class_Plan_ViewModel>();
                 string k2classIds = string.Join(",", list.Where(x => x.ClassStyle == Common.Enum.Course.ClassStyleEnum.FixedDate).Select(x => x.ClassId));
                 if (!string.IsNullOrEmpty(k2classIds))
@@ -180,6 +187,7 @@ namespace Edu.Module.Course
                 foreach (var item in list)
                 {
                     item.ClassStepPriceList = stepList.Where(x => x.ClassId == item.ClassId).OrderBy(x => x.PersionNum).ToList();
+                    item.OtherCourseList = otherCourseList?.Where(qitem => qitem.ClassId == item.ClassId)?.ToList() ?? new List<RB_Class_Course_Extend>();
                     item.DefaultTimeList = new List<ClassTimeItem>();
                     if (item.ClassStyle != Common.Enum.Course.ClassStyleEnum.OnLine)
                     {

Edu.WebApi/Controllers/Course/OrderController.cs

@@ -51,7 +51,7 @@ namespace Edu.WebApi.Controllers.Course
                 JoinEndTime = base.ParmJObj.GetStringValue("JoinEndTime")
             };
             dmodel.Group_Id = userInfo.Group_Id;
-            var list = orderModule.GetClassPruductList(pageModel.PageIndex, pageModel.PageSize, out long count, dmodel);
+            var list = orderModule.GetClassPruductListModule(pageModel.PageIndex, pageModel.PageSize, out long count, dmodel);
             pageModel.Count = Convert.ToInt32(count);
             List<object> result = new List<object>();
             foreach (var x in list)
@@ -90,7 +90,8 @@ namespace Edu.WebApi.Controllers.Course
                         ClassDate = x.ClassStyle == Common.Enum.Course.ClassStyleEnum.FixedDate ? z.ClassDate.ToString("yyyy-MM-dd") : ""
                     }),
                     x.SchoolName,
-                    UpdateTime =Common.ConvertHelper.FormatTime(x.UpdateTime)
+                    UpdateTime =Common.ConvertHelper.FormatTime(x.UpdateTime),
+                    x.OtherCourseList,
                 };
                 result.Add(obj);
             }

Edu.WebApi/Controllers/Web/WebController.cs

@@ -466,7 +466,7 @@ namespace Edu.WebApi.Controllers.Web
                 dmodel.Group_Id = groupId;
             }
             dmodel.Saleplat = "2,3";
-            var list = orderModule.GetClassPruductList(pageModel.PageIndex, pageModel.PageSize, out long count, dmodel);
+            var list = orderModule.GetClassPruductListModule(pageModel.PageIndex, pageModel.PageSize, out long count, dmodel);
             pageModel.Count = Convert.ToInt32(count);
             pageModel.PageData = list.Select(x => new
             {