Merge branch 'master' of http://gitlab.oytour.com/Kui2/education

Edu.Model/ViewModel/Grade/RB_Class_ViewModel.cs

@@ -317,6 +317,11 @@ namespace Edu.Model.ViewModel.Grade
         /// </summary>
         public decimal TotalClassHours { get;set; }
 
+        /// <summary>
+        /// 查询vip课程  （1- N1-N5,2-一对一）
+        /// </summary>
+        public int QIsVipCourse {  get; set; }
+
     }
 
     /// <summary>

Edu.Module.Duty/VisitorReserveModule.cs

@@ -337,6 +337,7 @@ namespace Edu.Module.Duty
                             };
                             List<Common.Message.PushMessageModel> pushList = new List<Common.Message.PushMessageModel>() { modelWork };
                             new Common.Message.MessageHelper().SendMessage(pushList);
+                            LogHelper.WriteInfo("学员试听课通知:" + JsonHelper.Serialize(pushList)) ;
                         });
                     }
                     #endregion

Edu.Repository/Grade/RB_ClassRepository.cs

@@ -76,7 +76,8 @@ WHERE 1=1
                 if (query.ClassScrollType > 0)
                 {
                     builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_Class_ViewModel.ClassScrollType), query.ClassScrollType);
-                    if (query.ClassScrollType == 2) {
+                    if (query.ClassScrollType == 2)
+                    {
                         //滚动开班  默认查询当月的
                         builder.AppendFormat(" AND A.{0}='{1}' ", nameof(RB_Class_ViewModel.ScrollMonth), DateTime.Now.ToString("yyyy-MM"));
                     }
@@ -257,7 +258,7 @@ WHERE 1=1
                 {
                     builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_Class_ViewModel.Group_Id), query.Group_Id);
                 }
-                if (query.School_Id >-1)
+                if (query.School_Id > -1)
                 {
                     builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_Class_ViewModel.School_Id), query.School_Id);
                 }
@@ -405,6 +406,18 @@ WHERE 1=1
                 {
                     builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_Class_ViewModel.CouseId), query.CouseId);
                 }
+                if (query.QIsVipCourse > 0)//2024-08-30 add by:w
+                {
+                    if (query.QIsVipCourse == 1)
+                    {
+                        builder.AppendFormat(" and B.CourseRate not IN (10,11) ");
+                    }
+                    else if (query.QIsVipCourse == 2)
+                    {
+                        builder.AppendFormat(" and B.CourseRate IN (10,11) ");
+                    }
+
+                }
                 //课程分类编号
                 if (query.CateId > 0)
                 {
@@ -496,7 +509,7 @@ WHERE 1=1
             return GetPage<RB_Class_ViewModel>(pageIndex, pageSize, out rowsCount, builder.ToString(), parameters).ToList();
         }
 
- 
+
         /// <summary>
         /// 班级类型统计
         /// </summary>

Edu.WebApi/Controllers/Course/OrderController.cs

@@ -54,7 +54,8 @@ namespace Edu.WebApi.Controllers.Course
                 JoinStartTime = base.ParmJObj.GetStringValue("JoinStartTime"),
                 JoinEndTime = base.ParmJObj.GetStringValue("JoinEndTime"),
                 CourseSubject = base.ParmJObj.GetInt("CourseSubject"),
-                ClassScrollType = base.ParmJObj.GetInt("ClassScrollType", 1)
+                ClassScrollType = base.ParmJObj.GetInt("ClassScrollType", 1),
+                QIsVipCourse = base.ParmJObj.GetInt("QIsVipCourse", 0),
             };
             dmodel.School_Id = -1;
             var schoolId = base.ParmJObj.GetStringValue("School_Id");

Edu.WebApi/Controllers/Duty/VisitorReserveController.cs

@@ -161,7 +161,7 @@ namespace Edu.WebApi.Controllers.Duty
             model.UpdateBy = base.UserInfo.Id;
             model.UpdateTime = System.DateTime.Now;
             model.Status = Common.Enum.DateStateEnum.Normal;
-            if (model.TeacherId == 0 || model.ClassRoomId == 0 || model.TrialLessonId == 0 || string.IsNullOrWhiteSpace(model.EndTime) || string.IsNullOrWhiteSpace(model.ClassTime) || model.ClassDate < Convert.ToDateTime(DateTime.Now.ToString("yyyy-MM-dd")))
+            if (model.TeacherId == 0 || model.ClassRoomId == 0 || model.TrialLessonId == 0 || string.IsNullOrWhiteSpace(model.EndTime) || string.IsNullOrWhiteSpace(model.ClassTime) )
             {
                 return ApiResult.ParamIsNull();
             }