页面修改

Edu.Module.Course/OrderModule.cs

@@ -228,6 +228,7 @@ namespace Edu.Module.Course
         /// <returns></returns>
         public Dictionary<string, object> GetClassCourseListModule(int classId, int Group_Id)
         {
+            List<object> newCourseList = new List<object>();
             Dictionary<string, object> fileds = new Dictionary<string, object>();
             var planList = class_PlanRepository.GetClassPlanListExtRepository(new RB_Class_Plan_ViewModel() { ClassId = classId, EndTime = Common.ConvertHelper.FormatDate(DateTime.Now) });
             var totalMinutes = planList?.Sum(qitem => qitem.ClassMinutes) ?? 0;
@@ -239,7 +240,7 @@ namespace Edu.Module.Course
             var courseModel = courseRepository.GetEntity(classModel.CouseId);
             if (courseModel != null && courseModel.CourseId > 0)
             {
-                fileds.Add("currentCourse", new
+                newCourseList.Add(new
                 {
                     courseModel.CourseId,
                     courseModel.CourseName,
@@ -257,10 +258,16 @@ namespace Edu.Module.Course
                 });
                 foreach (var item in courseList)
                 {
-                    item.CoursePriceList = coursePriceList?.Where(qitem => qitem.CourseId == item.CourseId)?.ToList() ?? new List<RB_Course_Preferential_Extend>();
+                    newCourseList.Add(new
+                    {
+                        item.CourseId,
+                        item.CourseName,
+                        item.ClassHours,
+                        item.SellPrice
+                    });
                 }
-                fileds.Add("otherCourse", courseList.Select(qitem => new { qitem.CourseId, qitem.CourseName, qitem.ClassHours, qitem.SellPrice ,qitem.CoursePriceList}));
             }
+            fileds.Add("otherCourse", newCourseList);
             return fileds;
         }
 

Edu.WebApi/Controllers/Course/OrderController.cs

@@ -58,7 +58,7 @@ namespace Edu.WebApi.Controllers.Course
             {
                 int IsChaBan = 0;//不能插班报入
                 int SurplusNum = x.ClassPersion - x.OrderStudentCount;
-                if (x.ClassStatus == ClassStatusEnum.StudyIng && SurplusNum > 0 && x.OtherCourseList != null && x.OtherCourseList.Count > 0)
+                if (x.ClassStatus == ClassStatusEnum.StudyIng && SurplusNum > 0)
                 {
                     IsChaBan = 1;//可以插班报入
                 }

Edu.WebApi/Timers/TimerJobj.cs

@@ -16,10 +16,12 @@ namespace Edu.WebApi.Timers
         /// </summary>
         private static readonly DutyPlanModule dutyPlanModule = AOP.AOPHelper.CreateAOPObject<DutyPlanModule>();
 
-        static System.Timers.Timer timer1;  //计时器
+        static System.Timers.Timer timer1;//计时器
 
         static System.Timers.Timer timer2;//定期处理未值班数据
 
+        static System.Timers.Timer timer3;//定时处理订单生效日期
+
         public static void RunTimer()
         {
             timer1 = new System.Timers.Timer
@@ -110,5 +112,15 @@ namespace Edu.WebApi.Timers
                 Interlocked.Exchange(ref inTimer2, 0);
             }
         }
+
+        /// <summary>
+        /// 定时处理订单生效日期
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        public static void DealOrderEffectStatus(object sender, System.Timers.ElapsedEventArgs e)
+        { 
+             
+        }
     }
 }
\ No newline at end of file