页面修改

Edu.Model/Entity/Course/RB_Order.cs

@@ -209,5 +209,10 @@ namespace Edu.Model.Entity.Course
         /// 插班开始课时
         /// </summary>
         public int StartClassHours { get; set; }
+
+        /// <summary>
+        /// 是否插班报入
+        /// </summary>
+        public int IsChaBan { get; set; }
     }
 }

Edu.Model/ViewModel/Course/RB_Order_Guest_ViewModel.cs

-using System;
+using Edu.Common.Enum.Sale;
+using System;
 using System.Collections.Generic;
 
 namespace Edu.Model.ViewModel.Course
@@ -69,5 +70,30 @@ namespace Edu.Model.ViewModel.Course
         {
             get;set;
         }
+
+        /// <summary>
+        /// 课程名称
+        /// </summary>
+        public string CourseName { get; set; }
+
+        /// <summary>
+        /// 课程编号
+        /// </summary>
+        public int CourseId { get; set; }
+
+        /// <summary>
+        /// 订单类型
+        /// </summary>
+        public OrderTypeEnum OrderType { get; set; }
+
+        /// <summary>
+        /// 开始课时
+        /// </summary>
+        public int StartClassHours { get; set; }
+
+        /// <summary>
+        /// 是否插班报入(1-是)
+        /// </summary>
+        public int IsChaBan { get; set; }
     }
 }
\ No newline at end of file

Edu.Model/ViewModel/Course/RB_Order_ViewModel.cs

@@ -44,11 +44,6 @@ namespace Edu.Model.ViewModel.Course
         /// </summary>
         public string GuestName { get; set; }
 
-        /// <summary>
-        /// 课程id
-        /// </summary>
-        public int CouseId { get; set; }
-
         /// <summary>
         /// 订单查询状态  1正常  2取消
         /// </summary>
@@ -126,5 +121,12 @@ namespace Edu.Model.ViewModel.Course
         /// 协助人员姓名
         /// </summary>
         public string HelpEnterName { get; set; }
+
+        /// <summary>
+        /// 课程名称
+        /// </summary>
+        public string CourseName { get; set; }
+
+
     }
 }
\ No newline at end of file

Edu.Module.Course/OrderModule.cs

@@ -238,7 +238,8 @@ namespace Edu.Module.Course
             var courseModel = courseRepository.GetEntity(classModel.CouseId);
             if (courseModel != null && courseModel.CourseId > 0)
             {
-                fileds.Add("currentCourse", new {
+                fileds.Add("currentCourse", new
+                {
                     courseModel.CourseId,
                     courseModel.CourseName,
                     courseModel.ClassHours,
@@ -248,7 +249,7 @@ namespace Edu.Module.Course
             var courseList = class_CourseRepository.GetClassCourseListRepository(new RB_Class_Course_Extend() { ClassId = classId });
             if (courseList != null)
             {
-                fileds.Add("otherCourse", courseList.Select(qitem=> new{qitem.CourseId,qitem.CourseName,qitem.ClassHours,qitem.SellPrice }));
+                fileds.Add("otherCourse", courseList.Select(qitem => new { qitem.CourseId, qitem.CourseName, qitem.ClassHours, qitem.SellPrice }));
             }
             return fileds;
         }
@@ -283,24 +284,29 @@ namespace Edu.Module.Course
         /// <param name="userInfo"></param>
         /// <returns></returns>
         [TransactionCallHandler]
-        public virtual bool SetClassOrder(RB_Order_ViewModel demodel, UserInfo userInfo,bool isEditOrder, out string message)
+        public virtual bool SetClassOrder(RB_Order_ViewModel demodel, UserInfo userInfo, bool isEditOrder, out string message)
         {
             bool flag = false;
             message = "";
             //查询班级信息
             var classModel = classRepository.GetEntity(demodel.ClassId);
-            var courseModel = courseRepository.GetEntity(classModel.CouseId);
+            
             if (classModel == null)
             {
                 flag = false;
                 message = "班级不存在";
                 return flag;
             }
+            if (demodel.IsChaBan == 0)
+            {
+                demodel.CourseId = classModel.CouseId;
+            }
+            var courseModel = courseRepository.GetEntity(demodel.CourseId);
             #region 计算订单优惠信息
             //获取课程优惠
             var coursePreferentialList = course_PreferentialRepository.GetCoursePreferentialListRepostory(new RB_Course_Preferential_Extend()
             {
-                CourseId = classModel.CouseId
+                CourseId = demodel.CourseId
             });
             if (demodel.IsLessPrice == 1 && demodel.LessPrice > 0)
             {
@@ -425,7 +431,7 @@ namespace Edu.Module.Course
                         return flag;
                     }
                 }
-    
+
                 Dictionary<string, object> keyValues = new Dictionary<string, object>()
                 {
                     { nameof(RB_Order_ViewModel.GuestNum),demodel.GuestNum},
@@ -510,18 +516,18 @@ namespace Edu.Module.Course
             }
             else
             {
-                if (classModel.ClassStatus != Common.Enum.Course.ClassStatusEnum.NonOpenClass)
+                if (classModel.ClassStatus == Common.Enum.Course.ClassStatusEnum.EndClass || classModel.ClassStatus == Common.Enum.Course.ClassStatusEnum.CancelClass)
                 {
                     flag = false;
                     message = "班级状态不正确";
                     return flag;
                 }
-                if (classModel.EndOrderTime < Convert.ToDateTime(DateTime.Now.ToString("yyyy-MM-dd")))
-                {
-                    flag = false;
-                    message = "已过期，无法报名";
-                    return flag;
-                }
+                //if (classModel.EndOrderTime < Convert.ToDateTime(DateTime.Now.ToString("yyyy-MM-dd")))
+                //{
+                //    flag = false;
+                //    message = "已过期，无法报名";
+                //    return flag;
+                //}
                 int BNum = orderRepository.GetClassOrderPeopleNum(demodel.ClassId.ToString()).FirstOrDefault()?.GuestNum ?? 0;
                 if (BNum + demodel.GuestNum > classModel.ClassPersion)
                 {
@@ -555,7 +561,7 @@ namespace Edu.Module.Course
                         return flag;
                     }
                 }
-               
+
                 int OrderId = orderRepository.Insert(demodel);
                 flag = OrderId > 0;
                 if (flag)
@@ -778,7 +784,7 @@ namespace Edu.Module.Course
             return model;
         }
 
- 
+
 
         /// <summary>
         /// 获取订单阶梯价格
@@ -919,6 +925,7 @@ namespace Edu.Module.Course
             ClassInfo = new { };
             //获取订单列表
             var orderList = new List<RB_Order_ViewModel>();
+            int courseId = 0;
             if (classId > 0)
             {
                 var cModel = classRepository.GetEntity(classId);
@@ -926,6 +933,7 @@ namespace Edu.Module.Course
                 {
                     return new List<RB_Order_ViewModel>();
                 }
+                courseId = cModel.CouseId;
                 //获取班级教师
                 var tModel = teacherRepository.GetEntity(cModel.Teacher_Id);
                 var zModel = assistRepository.GetEntity(cModel.Assist_Id);
@@ -1396,18 +1404,6 @@ namespace Edu.Module.Course
             var orderList = orderRepository.GetList(new RB_Order_ViewModel() { Group_Id = groupId, ClassId = classId, SourceId = SourceId });
             return orderList;
         }
-        /// <summary>
-        /// 获取班级订单列表
-        /// </summary>
-        /// <param name="classId"></param>
-        /// <param name="groupId"></param>
-        /// <returns></returns>
-        public List<RB_Order_ViewModel> GetClassOrderList_V3(int orderId, int groupId)
-        {
-            //获取订单列表
-            var orderList = orderRepository.GetList(new RB_Order_ViewModel() { Group_Id = groupId, OrderId = orderId });
-            return orderList;
-        }
 
         #endregion
 
@@ -2125,16 +2121,19 @@ namespace Edu.Module.Course
             if (list.Any())
             {
                 var model = list.FirstOrDefault();
-                Dictionary<string, object> keyValues = new Dictionary<string, object>() {
+                Dictionary<string, object> keyValues = new Dictionary<string, object>() 
+                {
                     { nameof(RB_Education_ContractAdjust_ViewModel.AdjustPrice),dmodel.AdjustPrice},
                     { nameof(RB_Education_ContractAdjust_ViewModel.UpdateBy),userInfo.Id},
                     { nameof(RB_Education_ContractAdjust_ViewModel.UpdateTime),DateTime.Now},
                 };
-                List<WhereHelper> wheres = new List<WhereHelper>() {
-                    new WhereHelper(){
+                List<WhereHelper> wheres = new List<WhereHelper>() 
+                {
+                    new WhereHelper()
+                    {
                          FiledName=nameof(RB_Education_ContractAdjust_ViewModel.Id),
-                          FiledValue= model.Id,
-                           OperatorEnum=OperatorEnum.Equal
+                         FiledValue= model.Id,
+                         OperatorEnum=OperatorEnum.Equal
                     }
                 };
                 return education_ContractAdjustRepository.Update(keyValues, wheres);
@@ -2154,7 +2153,6 @@ namespace Edu.Module.Course
                 }) > 0;
             }
         }
-
         #endregion
     }
-}
+}
\ No newline at end of file

Edu.Repository/Course/RB_ClassRepository.cs

@@ -39,7 +39,6 @@ WHERE 1=1
                 {
                     builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_Class_ViewModel.Group_Id), query.Group_Id);
                 }
-
                 if (query.ClassId > 0)
                 {
                     builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_Class_ViewModel.ClassId), query.ClassId);

Edu.Repository/Course/RB_OrderRepository.cs

@@ -97,12 +97,15 @@ namespace Edu.Repository.Course
                 orderBy = " o.CreateTime desc";
             }
 
-            string sql = $@" select o.*,c.ClassName,t.TeacherName,t.TeacherIcon 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
-where {where} order by {orderBy}
+            string sql = $@" 
+SELECT o.*,c.ClassName,t.TeacherName,t.TeacherIcon,IFNULL(course.CourseName,'') AS CourseName
+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
+    LEFT JOIN rb_course AS course ON (o.CourseId=course.CourseId AND o.CourseId>0 AND o.OrderType=1) 
+WHERE {where}
+ORDER BY {orderBy}
 ";
-
             return Get<RB_Order_ViewModel>(sql).ToList();
         }
 
@@ -180,9 +183,9 @@ where {where} order by {orderBy}
                     where += $@" and o.OrderId in (select OrderId from rb_order_guest where Status =0 and GuestName like '%{demodel.GuestName}%')";
                 }
             }
-            if (demodel.CouseId > 0)
+            if (demodel.CourseId > 0)
             {
-                where += $@" and c.{nameof(RB_Class.CouseId)} ={demodel.CouseId}";
+                where += $@" and c.{nameof(RB_Class.CouseId)} ={demodel.CourseId}";
             }
             if (!string.IsNullOrEmpty(demodel.StartTime))
             {
@@ -282,9 +285,9 @@ where {where} order by {orderBy}
                     where += $@" and o.OrderId in (select OrderId from rb_order_guest where Status =0 and GuestName like '%{demodel.GuestName}%')";
                 }
             }
-            if (demodel.CouseId > 0)
+            if (demodel.CourseId > 0)
             {
-                where += $@" and c.{nameof(RB_Class.CouseId)} ={demodel.CouseId}";
+                where += $@" and c.{nameof(RB_Class.CouseId)} ={demodel.CourseId}";
             }
             if (!string.IsNullOrEmpty(demodel.StartTime))
             {

Edu.Repository/Course/RB_Order_GuestRepository.cs

@@ -74,38 +74,42 @@ namespace Edu.Repository.Course
         /// <returns></returns>
         public List<RB_Order_Guest_ViewModel> GetPageList(int pageIndex, int pageSize, out long rowsCount, RB_Order_Guest_ViewModel demodel)
         {
-            string where = $@" 1=1 and Status=0";
+            StringBuilder builder = new StringBuilder();
+            builder.AppendFormat(@"
+SELECT A.* ,IFNULL(course.CourseName,'') AS CourseName,tOrder.CourseId,tOrder.OrderType,tOrder.StartClassHours,tOrder.IsChaBan
+FROM RB_Order_Guest AS A LEFT  JOIN RB_Order as tOrder ON A.OrderId=tOrder.OrderId
+     LEFT JOIN rb_course AS course ON (tOrder.CourseId=course.CourseId AND tOrder.CourseId>0 AND tOrder.OrderType=1)
+WHERE 1=1 AND A.Status=0
+");
             if (demodel.Group_Id > 0)
             {
-                where += $@" and {nameof(RB_Order_Guest_ViewModel.Group_Id)} ={demodel.Group_Id}";
+                builder.AppendFormat($@" AND A.{nameof(RB_Order_Guest_ViewModel.Group_Id)} ={demodel.Group_Id}");
             }
             if (demodel.School_Id > 0)
             {
-                where += $@" and {nameof(RB_Order_Guest_ViewModel.School_Id)} ={demodel.School_Id}";
+                builder.AppendFormat($@" AND A.{nameof(RB_Order_Guest_ViewModel.School_Id)} ={demodel.School_Id}");
             }
             if (demodel.OrderId > 0)
             {
-                where += $@" and {nameof(RB_Order_Guest_ViewModel.OrderId)} ={demodel.OrderId}";
+                builder.AppendFormat($@" AND A.{nameof(RB_Order_Guest_ViewModel.OrderId)} ={demodel.OrderId}");
             }
             if (demodel.ClassId > 0)
             {
-                where += $@" and {nameof(RB_Order_Guest_ViewModel.ClassId)} ={demodel.ClassId}";
+                builder.AppendFormat($@" AND A.{nameof(RB_Order_Guest_ViewModel.ClassId)} ={demodel.ClassId}");
             }
             if (demodel.SourceId > 0)
             {
-                where += $@" and {nameof(RB_Order_Guest_ViewModel.SourceId)} ={demodel.SourceId}";
+                builder.AppendFormat($@" AND A.{nameof(RB_Order_Guest_ViewModel.SourceId)} ={demodel.SourceId}");
             }
             if (!string.IsNullOrEmpty(demodel.GuestName))
             {
-                where += $@" and {nameof(RB_Order_Guest_ViewModel.GuestName)} like '%{demodel.GuestName}%'";
+                builder.AppendFormat($@" AND A.{nameof(RB_Order_Guest_ViewModel.GuestName)} like '%{demodel.GuestName}%'");
             }
             if (demodel.GuestState > 0)
             {
-                where += $@" and {nameof(RB_Order_Guest_ViewModel.GuestState)} ={demodel.GuestState}";
+                builder.AppendFormat($@" AND A.{nameof(RB_Order_Guest_ViewModel.GuestState)} ={demodel.GuestState}");
             }
-
-            string sql = $@" select * from RB_Order_Guest where {where}";
-            return GetPage<RB_Order_Guest_ViewModel>(pageIndex, pageSize, out rowsCount, sql).ToList();
+            return GetPage<RB_Order_Guest_ViewModel>(pageIndex, pageSize, out rowsCount, builder.ToString()).ToList();
         }
 
 
@@ -145,7 +149,6 @@ namespace Edu.Repository.Course
             {
                 where += $@" and {nameof(RB_Order_Guest_ViewModel.GuestState)} ={demodel.GuestState}";
             }
-
             string sql = $@" select count(0) from RB_Order_Guest where {where}";
             var obj = ExecuteScalar(sql);
             if (obj == null)