页面修改

Edu.Model/ViewModel/Course/RB_Order_ViewModel.cs

@@ -127,6 +127,9 @@ namespace Edu.Model.ViewModel.Course
         /// </summary>
         public string CourseName { get; set; }
 
-
+        /// <summary>
+        /// 开班时间
+        /// </summary>
+        public DateTime OpenTime { get; set; }
     }
 }
\ No newline at end of file

Edu.Model/ViewModel/Reserve/RB_Reserve_Class_Extend.cs

@@ -10,5 +10,9 @@ namespace Edu.Model.ViewModel.Reserve
     /// </summary>
     public class RB_Reserve_Class_Extend : RB_Reserve_Class
     {
+        /// <summary>
+        /// 创建人
+        /// </summary>
+        public string CreateByName { get; set; }
     }
 }

Edu.Model/ViewModel/Reserve/RB_Visitor_Reserve_Extend.cs

@@ -10,5 +10,9 @@ namespace Edu.Model.ViewModel.Reserve
     /// </summary>
     public class RB_Visitor_Reserve_Extend : RB_Visitor_Reserve
     {
+        /// <summary>
+        /// 创建人
+        /// </summary>
+        public string CreateByName { get; set; }
     }
 }

Edu.Module.Course/OrderModule.cs

@@ -761,7 +761,12 @@ namespace Edu.Module.Course
             {
                 if (model.OrderType == Common.Enum.Sale.OrderTypeEnum.CourseOrder)
                 {
-                    model.ClassName = classRepository.GetEntity(model.ClassId)?.ClassName ?? "";
+                    var classModel= classRepository.GetEntity(model.ClassId);
+                    if (classModel != null)
+                    {
+                        model.ClassName = classModel?.ClassName ?? "";
+                        model.OpenTime = classModel.OpenTime;
+                    }
                 }
                 else if (model.OrderType == Common.Enum.Sale.OrderTypeEnum.StudyabroadOrder)
                 {

Edu.Module.User/obj/Debug/netcoreapp3.0/Edu.Module.User.AssemblyInfo.cs

 //------------------------------------------------------------------------------
 // <auto-generated>
-//     此代码由工具生成。
-//     运行时版本:4.0.30319.42000
+//     This code was generated by a tool.
 //
-//     对此文件的更改可能会导致不正确的行为，并且如果
-//     重新生成代码，这些更改将会丢失。
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
 // </auto-generated>
 //------------------------------------------------------------------------------
 

Edu.Repository/Course/RB_OrderRepository.cs

@@ -223,7 +223,7 @@ ORDER BY {orderBy}
             }
 
             string sql = $@" 
-select o.*,c.ClassName,c.School_Id as ClassSchoolId,t.TeacherName,t.TeacherIcon,IFNULL(course.CourseName,'') AS CourseName
+select o.*,c.ClassName,c.School_Id as ClassSchoolId,t.TeacherName,t.TeacherIcon,IFNULL(course.CourseName,'') AS CourseName,C.OpenTime
 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

@@ -561,6 +561,7 @@ namespace Edu.WebApi.Controllers.Course
                 model.OrderType,
                 model.SourceId,
                 OrderTypeName = Common.Plugin.EnumHelper.ToName(model.OrderType),
+                OpenTime=Common.ConvertHelper.FormatDate(model.OpenTime),
             });
         }
 
@@ -1230,6 +1231,10 @@ namespace Edu.WebApi.Controllers.Course
                     x.SourceId,
                     x.ClassSchoolId,
                     x.ClassName,
+                    OpenTime=Common.ConvertHelper.FormatDate(x.OpenTime),
+                    x.IsChaBan,
+                    x.StartClassHours,
+                    x.CourseName,
                     x.TradeWay,
                     x.Class_Price,
                     x.Unit_Price,

Edu.WebApi/Controllers/Duty/VisitorReserveController.cs

@@ -44,10 +44,10 @@ namespace Edu.WebApi.Controllers.Duty
             var list = visitorReserveModule.GetVisitorReservePageModule(pageModel.PageIndex, pageModel.PageSize, out long rowsCount, query);
             foreach (var item in list)
             {
-                //if (item.CreateBy > 0)
-                //{
-                //    item.CreateByName = UserReidsCache.GetUserLoginInfo(item.CreateBy)?.AccountName ?? "";
-                //}
+                if (item.CreateBy > 0)
+                {
+                    item.CreateByName = UserReidsCache.GetUserLoginInfo(item.CreateBy)?.AccountName ?? "";
+                }
             }
             pageModel.PageData = list;
             pageModel.Count = rowsCount;
@@ -144,10 +144,10 @@ namespace Edu.WebApi.Controllers.Duty
             var list = visitorReserveModule.GetReserveClassPageModule(pageModel.PageIndex, pageModel.PageSize, out long rowsCount, query);
             foreach (var item in list)
             {
-                //if (item.CreateBy > 0)
-                //{
-                //    item.CreateByName = UserReidsCache.GetUserLoginInfo(item.CreateBy)?.AccountName ?? "";
-                //}
+                if (item.CreateBy > 0)
+                {
+                    item.CreateByName = UserReidsCache.GetUserLoginInfo(item.CreateBy)?.AccountName ?? "";
+                }
             }
             pageModel.PageData = list;
             pageModel.Count = rowsCount;