提交代码

Mall.Model/Entity/Point/RB_Point_TeacherCourseOrder.cs

@@ -29,7 +29,7 @@ namespace Mall.Model.Entity.Point
         /// <summary>
         /// 课程Id
         /// </summary>
-        public string CourseId { get; set; }
+        public int CourseId { get; set; }
 
 
 

Mall.Module.Education/PointModule.cs

@@ -657,6 +657,24 @@ namespace Mall.Module.Education
 
 
 
+        #endregion
+
+
+        #region 公用
+        public bool GetTimeSpan(DateTime timeStr, string StartTime, string EndTime)
+        {
+            //判断当前时间是否在工作时间段内
+
+            TimeSpan dspWorkingDayAM = DateTime.Parse(StartTime).TimeOfDay;
+            TimeSpan dspWorkingDayPM = DateTime.Parse(EndTime).TimeOfDay;
+            TimeSpan dspNow = timeStr.TimeOfDay;
+            if (dspNow > dspWorkingDayAM && dspNow < dspWorkingDayPM)
+            {
+                return true;
+            }
+            return false;
+        }
+
         #endregion
     }
 }

Mall.WebApi/Controllers/Education/AppletPointController.cs

@@ -34,7 +34,8 @@ namespace Mall.WebApi.Controllers.Education
         /// </summary>
         /// <returns></returns>
         [HttpPost]
-        public ApiResult GetAppletUserPointDetailPageList() {
+        public ApiResult GetAppletUserPointDetailPageList()
+        {
             var parms = RequestParm;
             var userInfo = AppletUserInfo;
             ResultPageModel pagelist = JsonConvert.DeserializeObject<ResultPageModel>(RequestParm.msg.ToString());
@@ -62,5 +63,99 @@ namespace Mall.WebApi.Controllers.Education
             return ApiResult.Success("", pagelist);
         }
         #endregion
+
+
+        #region 课程订单下单
+        /// <summary>
+        /// 保存课程分类信息
+        /// </summary>
+        /// <returns></returns>
+        public ApiResult SetTeacherCourseOrder()
+        {
+            var parms = RequestParm;
+            var userInfo = AppletUserInfo;
+            var query = JsonConvert.DeserializeObject<RB_Point_TeacherCourseOrder_Extend>(RequestParm.msg.ToString());
+            query.TenantId = userInfo.TenantId;
+            query.MallBaseId = userInfo.MallBaseId;
+            if (query == null)
+            {
+                return ApiResult.Failed("请传入课程订单信息");
+            }
+            else
+            {
+                if (query.CourseId == 0)
+                {
+                    return ApiResult.Failed("请选择您要购买的课程");
+                }
+                if (query.ID == 0)
+                {
+                    query.CreateDate = System.DateTime.Now;
+
+                }
+                //查询课程信息
+                var courseModel = pointModule.GetTeacherCourseList(new RB_Point_TeacherCourse_Extend { TeacherId = query.TeacherId, ID = query.CourseId, TenantId = userInfo.TenantId, MallBaseId = userInfo.MallBaseId }).FirstOrDefault();
+                var courseClassModel = pointModule.GetPointCourseClassList(new RB_Point_CourseClass_Extend { ID = query.CourseClassId, TenantId = userInfo.TenantId, MallBaseId = userInfo.MallBaseId }).FirstOrDefault();
+                courseModel.StudyStartTime = Convert.ToDateTime(courseModel.StudyDate.ToString("yyyy-MM-dd") + " " + courseModel.StudyStartDate);
+
+
+                if (courseModel.StudentNumType == Common.Enum.Point.StudentNumTypeEnum.OneToMany)//一对多的时候判断开始时间是否和课程一样
+                {
+                    if (courseModel.StudyDate != courseModel.StudyStartTime)
+                    {
+                        return ApiResult.Failed("预约时间与课程时间不一致");
+                    }
+                }
+                else
+                { //判断同一时间是否重复预约
+                    var orderList = pointModule.GetPointOrderList(new RB_Point_TeacherCourseOrder_Extend { TeacherId = query.TeacherId, CourseId = query.CourseId, TenantId = userInfo.TenantId, MallBaseId = userInfo.MallBaseId });
+
+                    DateTime nowOrderDate = query.StudyDate;
+
+                    if (query.DurationUnit == Common.Enum.Point.DurationUnitEnum.Hour)
+                    {
+
+                    }
+                    else
+                    {
+                        nowOrderDate = query.StudyDate.AddMinutes(Convert.ToDouble(query.TotalStudyDuration));
+                    }
+
+                    foreach (var item in orderList)
+                    {
+                        DateTime endTime = item.StudyDate;
+                      
+                        if (item.DurationUnit == Common.Enum.Point.DurationUnitEnum.Hour)
+                        {
+
+                        }
+                        else
+                        {
+                            endTime = item.StudyDate.AddMinutes(Convert.ToDouble(item.TotalStudyDuration));
+                        }
+                        if (pointModule.GetTimeSpan(query.StudyDate, item.StudyDate.ToString("HH:mm"), endTime.ToString("HH:mm")))
+                        {
+                            return ApiResult.Failed("当前预约时间已预约");
+                        }
+                        if (pointModule.GetTimeSpan(nowOrderDate, item.StudyDate.ToString("HH:mm"), endTime.ToString("HH:mm")))
+                        {
+                            return ApiResult.Failed("当前预约时间已预约");
+                        }
+                    }
+                }
+                query.State = 0;
+                query.UpdateDate = System.DateTime.Now;
+                bool result = pointModule.SetTeacherCourseOrder(query);
+                if (result)
+                {
+                    return ApiResult.Success("课程分类信息保存成功");
+                }
+                else
+                {
+                    return ApiResult.Failed("课程分类信息保存失败");
+                }
+            }
+        }
+
+        #endregion
     }
 }

Mall.WebApi/Controllers/Education/PointController.cs

@@ -159,7 +159,8 @@ namespace Mall.WebApi.Controllers.Education
         /// </summary>
         /// <returns></returns>
         [HttpPost]
-        public ApiResult GetAppletUserPointDetailPageList() {
+        public ApiResult GetAppletUserPointDetailPageList()
+        {
             var parms = RequestParm;
             var userInfo = AppletUserInfo;
             ResultPageModel pagelist = JsonConvert.DeserializeObject<ResultPageModel>(RequestParm.msg.ToString());
@@ -567,10 +568,14 @@ namespace Mall.WebApi.Controllers.Education
                 {
                     return ApiResult.Failed("请选择老师");
                 }
-                if (query.PointNum == 0)
+                if (query.IsPublic == 0)
                 {
-                    return ApiResult.Failed("请输入点数");
+                    if (query.PointNum == 0)
+                    {
+                        return ApiResult.Failed("请输入点数");
+                    }
                 }
+              
                 if (query.StudyDuration == 0)
                 {
                     return ApiResult.Failed("请输入课时时长");
@@ -602,7 +607,7 @@ namespace Mall.WebApi.Controllers.Education
                 oldPointGoodsList.ForEach(x => x.StudyEndTime = Convert.ToDateTime(x.StudyDate.ToString("yyyy-MM-dd") + " " + x.StudyEndDate));
                 foreach (var item in oldPointGoodsList)
                 {
-                    if (GetTimeSpan(query.StudyStartTime, item.StudyStartDate, item.StudyEndDate))
+                    if (pointModule.GetTimeSpan(query.StudyStartTime, item.StudyStartDate, item.StudyEndDate))
                     {
                         return ApiResult.Failed("排课时间不能交叉，已存在" + item.StudyStartDate + "~" + item.StudyEndDate);
                     }
@@ -625,19 +630,7 @@ namespace Mall.WebApi.Controllers.Education
 
 
 
-        public bool GetTimeSpan(DateTime timeStr, string StartTime, string EndTime)
-        {
-            //判断当前时间是否在工作时间段内
 
-            TimeSpan dspWorkingDayAM = DateTime.Parse(StartTime).TimeOfDay;
-            TimeSpan dspWorkingDayPM = DateTime.Parse(EndTime).TimeOfDay;
-            TimeSpan dspNow = timeStr.TimeOfDay;
-            if (dspNow > dspWorkingDayAM && dspNow < dspWorkingDayPM)
-            {
-                return true;
-            }
-            return false;
-        }
 
 
         /// <summary>