解决冲突

Mall.Common/Enum/Point/CourseClassTypeEnum.cs

@@ -26,7 +26,7 @@ namespace Mall.Common.Enum.Point
         /// 公开课
         /// </summary>
         [EnumField("公开课")]
-        Public = 24,
+        Public = 4,
         /// <summary>
         /// 兴趣主题课
         /// </summary>

Mall.Common/Enum/Point/OrderStausEnum.cs

@@ -14,17 +14,17 @@ namespace Mall.Common.Enum.Point
         /// 待付款
         /// </summary>
         [EnumField("待付款")]
-        NoPaid = 0,
+        NoPaid = 1,
         /// <summary>
         /// 待确认
         /// </summary>
         [EnumField("待确认")]
-        Paid = 1,
+        Paid = 2,
         /// <summary>
         /// 待上课
         /// </summary>
         [EnumField("待上课")]
-        NoClass = 2,
+        NoClass = 3,
         /// <summary>
         /// 完成
         /// </summary>

Mall.Model/Entity/Point/RB_Point_TeacherCourseOrder.cs

@@ -21,18 +21,11 @@ namespace Mall.Model.Entity.Point
         /// </summary>
         public int CourseClassId { get; set; }
 
-
-        /// <summary>
-        /// 课程名称
-        /// </summary>
-        public string CourseName { get; set; }
         /// <summary>
         /// 课程Id
         /// </summary>
         public int CourseId { get; set; }
 
-
-
         /// <summary>
         /// 老师id
         /// </summary>

Mall.Model/Extend/Point/RB_Point_TeacherCourseOrder_Extend.cs

@@ -5,8 +5,40 @@ using Mall.Model.Entity.Point;
 
 namespace Mall.Model.Extend.Point
 {
-  public  class RB_Point_TeacherCourseOrder_Extend: RB_Point_TeacherCourseOrder
+    public class RB_Point_TeacherCourseOrder_Extend : RB_Point_TeacherCourseOrder
     {
+        /// <summary>
+        /// 课程名称
+        /// </summary>
+        public string CourseName { get; set; }
 
+        /// <summary>
+        /// 课程分类名称
+        /// </summary>
+        public Common.Enum.Point.CourseClassTypeEnum CourseClassType { get; set; }
+
+        /// <summary>
+        /// 教师名称
+        /// </summary>
+        public string TeacherName { get; set; }
+
+        /// <summary>
+        /// 教师头像
+        /// </summary>
+        public string TeacherLogo { get; set; }
+
+        /// <summary>
+        /// 用户名称
+        /// </summary>
+        public string UserName { get; set; }
+
+        /// <summary>
+        /// 开始时间
+        /// </summary>
+        public string StartTime { get; set; }
+        /// <summary>
+        /// 结束时间
+        /// </summary>
+        public string EndTime { get; set; }
     }
 }

Mall.Module.Education/PointModule.cs

@@ -586,6 +586,17 @@ namespace Mall.Module.Education
             return pointTeacherCourseOrderRepository.GetPointOrderPageList(pageIndex, pageSize, out rowsCount, where);
         }
 
+        /// <summary>
+        /// 获取订单详情
+        /// </summary>
+        /// <param name="orderId"></param>
+        /// <returns></returns>
+        public RB_Point_TeacherCourseOrder_Extend GetPointOrderInfo(int orderId, int TenantId)
+        {
+            var model = pointTeacherCourseOrderRepository.GetPointOrderInfo(new RB_Point_TeacherCourseOrder_Extend() { ID = orderId, TenantId = TenantId });
+            return model;
+        }
+
 
 
         public bool SetTeacherCourseOrder(RB_Point_TeacherCourseOrder_Extend model)

Mall.Repository/Point/RB_Point_TeacherCourseOrderRepository.cs

@@ -55,7 +55,13 @@ namespace Mall.Repository.Point
         public List<RB_Point_TeacherCourseOrder_Extend> GetPointOrderPageList(int pageIndex, int pageSize, out long rowsCount, RB_Point_TeacherCourseOrder_Extend where)
         {
             StringBuilder sb = new StringBuilder();
-            sb.Append($@"SELECT a.*,b.`Name` as UserName from RB_Point_TeacherCourseOrder as a LEFT JOIN rb_member_user as b  on a.UserId=b.Id where a.state=0 ");
+            sb.Append($@"SELECT a.*,b.`Name` as UserName , t.CourseName,c.CourseClassType, d.Name as TeacherName ,d.TeacherLogo
+from RB_Point_TeacherCourseOrder as a 
+Left join rb_point_teachercourse t on a.CourseId = t.ID
+Left Join rb_point_courseclass c on a.CourseClassId = c.ID
+Left JOin rb_education_teacher d on a.TeacherId = d.ID
+LEFT JOIN rb_member_user as b  on a.UserId=b.Id 
+where a.state=0 ");
             if (where != null)
             {
                 if (where.TenantId > 0)
@@ -82,8 +88,79 @@ namespace Mall.Repository.Point
                 {
                     sb.AppendFormat(" and a.OrderStaus={0}", where.OrderStaus);
                 }
+                if (where.TeacherId > 0)
+                {
+                    sb.AppendFormat(" and a.TeacherId={0}", where.TeacherId);
+                }
+                if (where.CourseId > 0)
+                {
+                    sb.AppendFormat(" and a.CourseId={0}", where.CourseId);
+                }
+                if (where.UserId > 0)
+                {
+                    sb.AppendFormat(" and a.UserId={0}", where.UserId);
+                }
+                if (!string.IsNullOrEmpty(where.StartTime))
+                {
+                    sb.AppendFormat(" and a.CreateDate >='{0}'", where.StartTime);
+                }
+                if (!string.IsNullOrEmpty(where.EndTime))
+                {
+                    sb.AppendFormat(" and a.CreateDate <='{0}'", where.EndTime + " 23:59:59");
                 }
+            }
+            sb.AppendFormat(" order by a.ID desc");
             return GetPage<RB_Point_TeacherCourseOrder_Extend>(pageIndex, pageSize, out rowsCount, sb.ToString()).ToList();
         }
+
+        /// <summary>
+        /// 获取明细
+        /// </summary>
+        /// <param name="where"></param>
+        /// <returns></returns>
+        public RB_Point_TeacherCourseOrder_Extend GetPointOrderInfo(RB_Point_TeacherCourseOrder_Extend where)
+        {
+            StringBuilder sb = new StringBuilder();
+            sb.Append($@"SELECT a.*,b.`Name` as UserName , t.CourseName,c.CourseClassType, d.Name as TeacherName ,d.TeacherLogo
+from RB_Point_TeacherCourseOrder as a 
+Left join rb_point_teachercourse t on a.CourseId = t.ID
+Left Join rb_point_courseclass c on a.CourseClassId = c.ID
+Left JOin rb_education_teacher d on a.TeacherId = d.ID
+LEFT JOIN rb_member_user as b  on a.UserId=b.Id 
+where a.state=0 ");
+            if (where != null)
+            {
+                if (where.TenantId > 0)
+                {
+                    sb.AppendFormat(" and a.TenantId={0}", where.TenantId);
+                }
+                if (where.MallBaseId > 0)
+                {
+                    sb.AppendFormat(" and a.MallBaseId={0}", where.MallBaseId);
+                }
+                if (where.ID > 0)
+                {
+                    sb.AppendFormat(" and a.ID={0}", where.ID);
+                }
+                if (where.OrderStaus > 0)
+                {
+                    sb.AppendFormat(" and a.OrderStaus={0}", where.OrderStaus);
+                }
+                if (where.TeacherId > 0)
+                {
+                    sb.AppendFormat(" and a.TeacherId={0}", where.TeacherId);
+                }
+                if (where.CourseId > 0)
+                {
+                    sb.AppendFormat(" and a.CourseId={0}", where.CourseId);
+                }
+                if (where.UserId > 0)
+                {
+                    sb.AppendFormat(" and a.UserId={0}", where.UserId);
+                }
+            }
+            sb.AppendFormat(" order by a.ID desc");
+            return Get<RB_Point_TeacherCourseOrder_Extend>(sb.ToString()).FirstOrDefault();
+        }
     }
 }

Mall.WebApi/Controllers/Education/AppletPointController.cs

@@ -156,6 +156,95 @@ namespace Mall.WebApi.Controllers.Education
             }
         }
       
+        /// <summary>
+        /// 获取订单列表分页列表
+        /// </summary>
+        /// <returns></returns>
+        [HttpPost]
+        public ApiResult GetPointOrderPageList()
+        {
+            var parms = RequestParm;
+            var userInfo = AppletUserInfo;
+            ResultPageModel pagelist = JsonConvert.DeserializeObject<ResultPageModel>(RequestParm.msg.ToString());
+            RB_Point_TeacherCourseOrder_Extend demodel = JsonConvert.DeserializeObject<RB_Point_TeacherCourseOrder_Extend>(RequestParm.msg.ToString());
+            demodel.TenantId = userInfo.TenantId;
+            demodel.MallBaseId = userInfo.MallBaseId;
+            demodel.UserId = userInfo.UserId;//只能查询自己的订单列表
+            var list = pointModule.GetPointOrderPageList(pagelist.pageIndex, pagelist.pageSize, out long count, demodel);
+            pagelist.count = Convert.ToInt32(count);
+            pagelist.pageData = list.Select(x => new
+            {
+                x.ID,
+                x.CourseClassId,
+                CourseClassTypeName = x.CourseClassType.GetEnumName(),
+                x.CourseId,
+                x.CourseName,
+                x.TeacherId,
+                x.TeacherName,
+                x.TeacherLogo,
+                StudyDate = x.StudyDate.ToString("MM-dd HH:mm"),
+                x.StudyDuration,
+                x.TotalStudyDuration,
+                DurationUnit = x.DurationUnit.GetEnumName(),
+                x.OrderStaus,
+                OrderStatusName = x.OrderStaus.GetEnumName(),
+                x.IsSendRoom,
+                x.RoomInfo,
+                x.TotalPointNum,
+                x.ActualPointNum,
+                x.BasePointNum,
+                x.UserId,
+                x.UserName,
+                CreateDate = x.CreateDate.HasValue ? x.CreateDate.Value.ToString("yyyy-MM-dd HH:mm:ss") : "",
+            });
+            return ApiResult.Success("", pagelist);
+        }
+
+        /// <summary>
+        /// 获取订单详情
+        /// </summary>
+        /// <returns></returns>
+        [HttpPost]
+        public ApiResult GetPointOrderInfo()
+        {
+            var userInfo = AppletUserInfo;
+            var parms = JObject.Parse(RequestParm.msg.ToString());
+            int OrderId = parms.GetInt("OrderId", 0);
+            if (OrderId <= 0)
+            {
+                return ApiResult.ParamIsNull("请传递订单id");
+            }
+
+            var model = pointModule.GetPointOrderInfo(OrderId, userInfo.TenantId);
+            if (model == null) { return ApiResult.Failed("订单不存在"); }
+            if (model.UserId != userInfo.UserId) { return ApiResult.Failed("不是你的订单，无法查看"); }
+            return ApiResult.Success("", new
+            {
+                model.ID,
+                model.CourseClassId,
+                CourseClassTypeName = model.CourseClassType.GetEnumName(),
+                model.CourseId,
+                model.CourseName,
+                model.TeacherId,
+                model.TeacherName,
+                model.TeacherLogo,
+                StudyDate = model.StudyDate.ToString("MM-dd HH:mm"),
+                model.StudyDuration,
+                model.TotalStudyDuration,
+                DurationUnit = model.DurationUnit.GetEnumName(),
+                model.OrderStaus,
+                OrderStatusName = model.OrderStaus.GetEnumName(),
+                model.IsSendRoom,
+                model.RoomInfo,
+                model.TotalPointNum,
+                model.ActualPointNum,
+                model.BasePointNum,
+                model.UserId,
+                model.UserName,
+                CreateDate = model.CreateDate.HasValue ? model.CreateDate.Value.ToString("yyyy-MM-dd HH:mm:ss") : "",
+            });
+        }
+
         #endregion
     }
 }

Mall.WebApi/Controllers/Education/PointController.cs

@@ -151,7 +151,6 @@ namespace Mall.WebApi.Controllers.Education
 
         #endregion
 
-
         #region 个人中心-点数记录
 
         /// <summary>
@@ -226,6 +225,94 @@ namespace Mall.WebApi.Controllers.Education
         }
         #endregion
 
+        #region 订单列表
+
+        /// <summary>
+        /// 获取订单列表分页列表
+        /// </summary>
+        /// <returns></returns>
+        [HttpPost]
+        public ApiResult GetPointOrderPageList() {
+            var parms = RequestParm;
+            var userInfo = UserInfo;
+            ResultPageModel pagelist = JsonConvert.DeserializeObject<ResultPageModel>(RequestParm.msg.ToString());
+            RB_Point_TeacherCourseOrder_Extend demodel = JsonConvert.DeserializeObject<RB_Point_TeacherCourseOrder_Extend>(RequestParm.msg.ToString());
+            demodel.TenantId = userInfo.TenantId;
+            demodel.MallBaseId = userInfo.MallBaseId;
+            var list = pointModule.GetPointOrderPageList(pagelist.pageIndex, pagelist.pageSize, out long count, demodel);
+            pagelist.count = Convert.ToInt32(count);
+            pagelist.pageData = list.Select(x => new
+            {
+                x.ID,
+                x.CourseClassId,
+                CourseClassTypeName = x.CourseClassType.GetEnumName(),
+                x.CourseId,
+                x.CourseName,
+                x.TeacherId,
+                x.TeacherName,
+                x.TeacherLogo,
+                StudyDate = x.StudyDate.ToString("MM-dd HH:mm"),
+                x.StudyDuration,
+                x.TotalStudyDuration,
+                DurationUnit = x.DurationUnit.GetEnumName(),
+                x.OrderStaus,
+                OrderStatusName = x.OrderStaus.GetEnumName(),
+                x.IsSendRoom,
+                x.RoomInfo,
+                x.TotalPointNum,
+                x.ActualPointNum,
+                x.BasePointNum,
+                x.UserId,
+                x.UserName,
+                CreateDate = x.CreateDate.HasValue ? x.CreateDate.Value.ToString("yyyy-MM-dd HH:mm:ss") : "",
+            });
+            return ApiResult.Success("", pagelist);
+        }
+
+        /// <summary>
+        /// 获取订单详情
+        /// </summary>
+        /// <returns></returns>
+        [HttpPost]
+        public ApiResult GetPointOrderInfo() {
+            var userInfo = UserInfo;
+            var parms = JObject.Parse(RequestParm.msg.ToString());
+            int OrderId = parms.GetInt("OrderId", 0);
+            if (OrderId <= 0) {
+                return ApiResult.ParamIsNull("请传递订单id");
+            }
+
+            var model = pointModule.GetPointOrderInfo(OrderId, userInfo.TenantId);
+            if (model == null) { return ApiResult.Failed("订单不存在");}
+            return ApiResult.Success("", new
+            {
+                model.ID,
+                model.CourseClassId,
+                CourseClassTypeName = model.CourseClassType.GetEnumName(),
+                model.CourseId,
+                model.CourseName,
+                model.TeacherId,
+                model.TeacherName,
+                model.TeacherLogo,
+                StudyDate = model.StudyDate.ToString("MM-dd HH:mm"),
+                model.StudyDuration,
+                model.TotalStudyDuration,
+                DurationUnit = model.DurationUnit.GetEnumName(),
+                model.OrderStaus,
+                OrderStatusName = model.OrderStaus.GetEnumName(),
+                model.IsSendRoom,
+                model.RoomInfo,
+                model.TotalPointNum,
+                model.ActualPointNum,
+                model.BasePointNum,
+                model.UserId,
+                model.UserName,
+                CreateDate = model.CreateDate.HasValue ? model.CreateDate.Value.ToString("yyyy-MM-dd HH:mm:ss") : "",
+            });
+        }
+
+        #endregion
+
         #region 在线课程分类
         /// <summary>
         /// 课程分类
@@ -628,11 +715,6 @@ namespace Mall.WebApi.Controllers.Education
             }
         }
 
-
-
-
-
-
         /// <summary>
         /// 删除老师排课
         /// </summary>