页面修改

Edu.Model/ViewModel/Course/RB_Order_ViewModel.cs

@@ -14,6 +14,11 @@ namespace Edu.Model.ViewModel.Course
         /// </summary>
         public string ClassIds { get; set; }
 
+        /// <summary>
+        /// 课程课时
+        /// </summary>
+        public int ClassHours { get; set; }
+
         /// <summary>
         /// 项目ids
         /// </summary>

Edu.Module.Course/OrderModule.cs

@@ -240,12 +240,14 @@ namespace Edu.Module.Course
             var courseModel = courseRepository.GetEntity(classModel.CouseId);
             if (courseModel != null && courseModel.CourseId > 0)
             {
+                var CoursePriceList = course_PreferentialRepository.GetCoursePreferentialListRepostory(new RB_Course_Preferential_Extend() { CourseId = courseModel.CourseId });
                 newCourseList.Add(new
                 {
                     courseModel.CourseId,
                     courseModel.CourseName,
                     courseModel.ClassHours,
-                    courseModel.SellPrice
+                    courseModel.SellPrice,
+                    CoursePriceList
                 });
             }
             var courseList = class_CourseRepository.GetClassCourseListRepository(new RB_Class_Course_Extend() { ClassId = classId });
@@ -263,7 +265,8 @@ namespace Edu.Module.Course
                         item.CourseId,
                         item.CourseName,
                         item.ClassHours,
-                        item.SellPrice
+                        item.SellPrice,
+                        item.CoursePriceList
                     });
                 }
             }
@@ -1027,10 +1030,10 @@ namespace Edu.Module.Course
         /// <param name="classId"></param>
         /// <param name="groupId"></param>
         /// <returns></returns>
-        public List<RB_Order_ViewModel> GetClassOrderListExtModule(int classId, int groupId)
+        public List<RB_Order_ViewModel> GetClassOrderListExtModule(RB_Order_ViewModel query)
         {
             //获取订单列表
-            var orderList = orderRepository.GetList(new RB_Order_ViewModel() { Group_Id = groupId, ClassId = classId, OrderState = OrderStateEnum.Normal });
+            var orderList = orderRepository.GetList(query);
             var guestList = new List<RB_Order_Guest_ViewModel>();
             if (orderList != null && orderList.Count > 0)
             {

Edu.Repository/Course/RB_OrderRepository.cs

@@ -102,7 +102,7 @@ namespace Edu.Repository.Course
             }
 
             string sql = $@" 
-SELECT o.*,c.ClassName,t.TeacherName,t.TeacherIcon,IFNULL(course.CourseName,'') AS CourseName,c.OpenTime
+SELECT o.*,c.ClassName,t.TeacherName,t.TeacherIcon,IFNULL(course.CourseName,'') AS CourseName,c.OpenTime,IFNULL(course.ClassHours,0) AS ClassHours
 FROM RB_Order o 
     LEFT JOIN rb_class c on o.ClassId = c.ClassId
     LEFT JOIN rb_teacher t on c.Teacher_Id = t.TId

Edu.WebApi/Controllers/Course/OrderController.cs

@@ -358,12 +358,18 @@ namespace Edu.WebApi.Controllers.Course
         {
             JObject parms = JObject.Parse(RequestParm.Msg.ToString());
             var userInfo = base.UserInfo;
-            int ClassId = parms.GetInt("ClassId", 0);
-            if (ClassId <= 0)
+            var query = new RB_Order_ViewModel()
+            {
+                ClassId = parms.GetInt("ClassId", 0),
+                OrderId = parms.GetInt("OrderId"),
+                Group_Id = base.UserInfo.Group_Id,
+                OrderState = OrderStateEnum.Normal
+            };
+            if (query.ClassId <= 0)
             {
                 return ApiResult.ParamIsNull();
             }
-            var orderList = orderModule.GetClassOrderListExtModule(ClassId, userInfo.Group_Id);
+            var orderList = orderModule.GetClassOrderListExtModule(query);
             return ApiResult.Success("", orderList.Select(x => new
             {
                 x.OrderId,
@@ -372,6 +378,8 @@ namespace Edu.WebApi.Controllers.Course
                 x.CourseId,
                 x.CourseName,
                 x.GuestList,
+                x.ClassHours,
+                x.StartClassHours,
             }));
         }