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

Mall.Module.Education/PointModule.cs

@@ -396,6 +396,7 @@ namespace Mall.Module.Education
                 DurationUnit = model.DurationUnit.GetEnumName(),
                 OrderList = orderList.Select(x => new
                 {
+                    x.CourseId,
                     x.ID,
                     x.UserId,
                     x.UserName,
@@ -878,7 +879,7 @@ namespace Mall.Module.Education
                     };
 
                 flag = pointTeacherCourseOrderRepository.Update(fileds, auditrecordWhereHelpers, trans);
-              
+
                 if (flag)//推送房间信息
                 {
                     List<string> openidList = new List<string>();

Mall.Module.User/MiniProgramMsgModule.cs

@@ -949,7 +949,7 @@ namespace Mall.Module.User
                                 {
                                     thing1 = new
                                     {
-                                        value = Title
+                                        value = Title.Substring(0, 15)
                                     },
                                     thing2 = new
                                     {

Mall.WebApi/Controllers/Education/AppletPointController.cs

@@ -340,7 +340,7 @@ namespace Mall.WebApi.Controllers.Education
                 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();
                 query.TeacherId = courseModel.TeacherId;
-
+                query.CourseClassId = courseModel.CourseClassId;
                 //判断时长是否一致
                 if ((query.TotalStudyDuration % courseModel.StudyDuration) != 0)
                 {
@@ -702,7 +702,7 @@ namespace Mall.WebApi.Controllers.Education
         /// </summary>
         /// <returns></returns>
         [HttpPost]
-        public ApiResult CompleteTeacherCourseOrder()
+        public ApiResult GetCompleteTeacherCourseOrder()
         {
             var parms = RequestParm;
             var userInfo = AppletUserInfo;
@@ -732,6 +732,21 @@ namespace Mall.WebApi.Controllers.Education
                 oldModel.ActualPointNum = query.ActualPointNum;
                 oldModel.UpdateDate = System.DateTime.Now;
                 oldModel.OrderStaus = Common.Enum.Point.OrderStausEnum.Complete;
+
+                DateTime nowOrderDate = query.StudyDate;
+
+                if (query.DurationUnit == Common.Enum.Point.DurationUnitEnum.Hour)
+                {
+                    nowOrderDate = query.StudyDate.AddMinutes(Convert.ToDouble(query.TotalStudyDuration * 60));
+                }
+                else
+                {
+                    nowOrderDate = query.StudyDate.AddMinutes(Convert.ToDouble(query.TotalStudyDuration));
+                }
+                //if (nowOrderDate > System.DateTime.Now)
+                //{
+                //    return ApiResult.Success("订单预约结束时间不能大于当前时间");
+                //}
                 bool result = pointModule.CompleteTeacherCourseOrder(oldModel);
                 if (result)
                 {
@@ -865,6 +880,8 @@ namespace Mall.WebApi.Controllers.Education
         }
 
 
+
+
         /// <summary>
         /// 课程列表
         /// </summary>
@@ -909,7 +926,17 @@ namespace Mall.WebApi.Controllers.Education
 
                 foreach (var item in nowDayList)
                 {
-                    var nowCourseOrderList = courseOrder.Where(x => item.ID == x.CourseId && x.UserId == userInfo.UserId);
+                    List<RB_Point_TeacherCourseOrder_Extend> nowCourseOrderList = new List<RB_Point_TeacherCourseOrder_Extend>();
+
+                    if (query.TeacherId > 0)
+                    {
+                        nowCourseOrderList = courseOrder.Where(x => item.ID == x.CourseId).ToList();
+                    }
+                    else
+                    {
+                        nowCourseOrderList = courseOrder.Where(x => item.ID == x.CourseId && x.UserId == userInfo.UserId).ToList();
+                    }
+
                     haveCourseCount += nowCourseOrderList.Count();
 
                     List<object> orderList = new List<object>();