解决冲突

Mall.Common/Enum/Point/CourseClassTypeEnum.cs

+using System;
+using System.Collections.Generic;
+using System.Text;
+using Mall.Common.Plugin;
+
+namespace Mall.Common.Enum.Point
+{
+    public enum CourseClassTypeEnum
+    {
+        /// <summary>
+        /// 体验课
+        /// </summary>
+        [EnumField("体验课")]
+        Experience = 1,
+        /// <summary>
+        /// 一对一外教
+        /// </summary>
+        [EnumField("一对一外教")]
+        OneForeignTeacher = 2,
+        /// <summary>
+        /// 一对一中教
+        /// </summary>
+        [EnumField("一对一中教")]
+        OneTeacher = 3,
+        /// <summary>
+        /// 公开课
+        /// </summary>
+        [EnumField("公开课")]
+        Public = 24,
+        /// <summary>
+        /// 兴趣主题课
+        /// </summary>
+        [EnumField("兴趣主题课")]
+        InterestTopics =5
+    }
+}

Mall.Common/Enum/Point/DurationUnitEnum.cs

+using System;
+using System.Collections.Generic;
+using System.Text;
+using Mall.Common.Plugin;
+
+namespace Mall.Common.Enum.Point
+{
+    public enum DurationUnitEnum
+    {
+        /// <summary>
+        /// 分钟
+        /// </summary>
+        [EnumField("分钟")]
+        Minute = 1,
+        /// <summary>
+        /// 小时
+        /// </summary>
+        [EnumField("小时")]
+        Hour = 2
+    }
+}

Mall.Common/Enum/Point/StudentNumTypeEnum.cs

+using System;
+using System.Collections.Generic;
+using System.Text;
+using Mall.Common.Plugin;
+
+namespace Mall.Common.Enum.Point
+{
+    public enum StudentNumTypeEnum
+    {
+        /// <summary>
+        /// 一对一
+        /// </summary>
+        [EnumField("一对一")]
+        OneOnOne = 1,
+        /// <summary>
+        /// 多人
+        /// </summary>
+        [EnumField("多人")]
+        OneToMany = 2
+    }
+}

Mall.Model/Entity/Point/RB_Point_CourseClass.cs

+using System;
+using System.Collections.Generic;
+using System.Text;
+using Mall.Common.Enum.Point;
+using VT.FW.DB;
+
+namespace Mall.Model.Entity.Point
+{
+
+    /// <summary>
+    /// 排课分类
+    /// </summary>
+    [Serializable]
+    [DB(ConnectionName = "DefaultConnection")]
+    public class RB_Point_CourseClass
+    {
+        public int ID { get; set; }
+        /// <summary>
+        /// 排序
+        /// </summary>        
+        public int? Sort
+        {
+            get;
+            set;
+        }
+
+        /// <summary>
+        /// 分类类型
+        /// </summary>
+        public CourseClassTypeEnum CourseClassType { get; set; }
+
+
+        /// <summary>
+        /// 上课人数
+        /// </summary>
+        public StudentNumTypeEnum StudentNumType { get; set; }
+
+        /// <summary>
+        /// 是否为公开课0-否，1-是
+        /// </summary>
+        public int IsPublic { get; set; }
+
+
+        /// <summary>
+        /// 是否免费0-否，1-是
+        /// </summary>
+        public int IsFree { get; set; }
+
+
+        /// <summary>
+        /// 点数
+        /// </summary>
+        public int PointNum { get; set; }
+
+
+        /// <summary>
+        /// 多少时长
+        /// </summary>
+        public decimal Duration { get; set; }
+
+
+        /// <summary>
+        /// 时长单位
+        /// </summary>
+        public DurationUnitEnum DurationUnit { get; set; }
+
+
+
+        /// <summary>
+        /// 删除状态
+        /// </summary>        
+        public int? State
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 商户号
+        /// </summary>        
+        public int TenantId
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 小程序id
+        /// </summary>        
+        public int MallBaseId
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// CreateDate
+        /// </summary>        
+        public DateTime? CreateDate
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// UpdateDate
+        /// </summary>        
+        public DateTime? UpdateDate
+        {
+            get;
+            set;
+        }
+
+    }
+}

Mall.Model/Entity/Point/RB_Point_TeacherCourse.cs

+using System;
+using System.Collections.Generic;
+using System.Text;
+using Mall.Common.Enum.Point;
+using VT.FW.DB;
+
+namespace Mall.Model.Entity.Point
+{
+
+    /// <summary>
+    /// 老师课程
+    /// </summary>
+    [Serializable]
+    [DB(ConnectionName = "DefaultConnection")]
+    public class RB_Point_TeacherCourse
+    {
+        public int ID { get; set; }
+
+        /// <summary>
+        /// 课程分类id
+        /// </summary>
+        public int CourseClassId { get; set; }
+
+        /// <summary>
+        /// 老师id
+        /// </summary>
+        public int TeacherId { get; set; }
+
+
+        /// <summary>
+        /// 学习时间
+        /// </summary>
+        public DateTime StudyDate { get; set; }
+
+
+        /// <summary>
+        /// 学习开始时间
+        /// </summary>
+        public string StudyStartDate { get; set; }
+
+
+        /// <summary>
+        /// 学习结束时间
+        /// </summary>
+        public string StudyEndDate { get; set; }
+
+
+        /// <summary>
+        /// 点数
+        /// </summary>
+        public int PointNum { get; set; }
+
+        /// <summary>
+        /// 课程名称
+        /// </summary>
+        public string CourseName { get; set; }
+
+        /// <summary>
+        /// 最少约课时长
+        /// </summary>
+        public decimal MinDuration { get; set; }
+        /// <summary>
+        /// 时长
+        /// </summary>
+        public decimal StudyDuration { get; set; }
+
+        /// <summary>
+        /// 删除状态
+        /// </summary>        
+        public int? State
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 商户号
+        /// </summary>        
+        public int TenantId
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 小程序id
+        /// </summary>        
+        public int MallBaseId
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// CreateDate
+        /// </summary>        
+        public DateTime? CreateDate
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// UpdateDate
+        /// </summary>        
+        public DateTime? UpdateDate
+        {
+            get;
+            set;
+        }
+
+    }
+}

Mall.Model/Extend/Point/RB_Point_CourseClass_Extend.cs

+using System;
+using System.Collections.Generic;
+using System.Text;
+using Mall.Model.Entity.Point;
+
+namespace Mall.Model.Extend.Point
+{
+    /// <summary>
+    /// 课程分类扩展表
+    /// </summary>
+    public class RB_Point_CourseClass_Extend : RB_Point_CourseClass
+    {
+        /// <summary>
+        /// 分类名称
+        /// </summary>
+        public string ClassName { get; set; }
+
+
+        /// <summary>
+        /// 学生人数名称
+        /// </summary>
+        public string StudentNumTypeName { get; set; }
+
+
+
+        /// <summary>
+        /// 时长名称
+        /// </summary>
+        public string DurationUnitName { get; set; }
+
+    }
+}

Mall.Model/Extend/Point/RB_Point_TeacherCourse_Extend.cs

+using System;
+using System.Collections.Generic;
+using System.Text;
+using Mall.Common.Enum.Point;
+using Mall.Model.Entity.Point;
+
+namespace Mall.Model.Extend.Point
+{
+    public class RB_Point_TeacherCourse_Extend : RB_Point_TeacherCourse
+    {
+
+        /// <summary>
+        /// 分类类型
+        /// </summary>
+        public CourseClassTypeEnum CourseClassType { get; set; }
+
+
+        /// <summary>
+        /// 上课人数
+        /// </summary>
+        public StudentNumTypeEnum StudentNumType { get; set; }
+
+        /// <summary>
+        /// 是否为公开课0-否，1-是
+        /// </summary>
+        public int IsPublic { get; set; }
+
+
+        /// <summary>
+        /// 是否免费0-否，1-是
+        /// </summary>
+        public int IsFree { get; set; }
+
+
+        /// <summary>
+        /// 时长单位
+        /// </summary>
+        public DurationUnitEnum DurationUnit { get; set; }
+
+
+
+        /// <summary>
+        /// 学习开始时间
+        /// </summary>
+        public DateTime StudyStartTime { get; set; }
+
+
+        /// <summary>
+        /// 学习结束时间
+        /// </summary>
+        public DateTime StudyEndTime { get; set; }
+
+
+        public string TeacherName { get; set; }
+
+
+        public string TeacherLogo { get; set; }
+
+
+        #region 查询时间范围
+        /// <summary>
+        /// 查询开始时间
+        /// </summary>
+        public string SelectStartTime { get; set; }
+
+
+        /// <summary>
+        /// 查询结束时间
+        /// </summary>
+        public string SelectEndTime { get; set; }
+
+        /// <summary>
+        /// 订单数
+        /// </summary>
+        public int OrderNum { get; set; }
+        #endregion
+    }
+}

Mall.Module.Education/PointModule.cs

@@ -20,6 +20,10 @@ namespace Mall.Module.Education
         /// 会员信息
         /// </summary>
         private readonly RB_Member_UserRepository member_UserRepository = new RB_Member_UserRepository();
+        private readonly RB_Point_CourseClassRepository pointCourseClassRepository = new RB_Point_CourseClassRepository();
+        private readonly RB_Point_TeacherCourseRepository pointTeacherCourseRepository = new RB_Point_TeacherCourseRepository();
+
+
         #region 点数商品
         /// <summary>
         /// 获取列表
@@ -65,7 +69,7 @@ namespace Mall.Module.Education
                 {
                     { nameof(RB_Point_Goods_Extend.UpdateDate), model.UpdateDate },
                     { nameof(RB_Point_Goods_Extend.GoodsName), model.GoodsName },
-                    { nameof(RB_Point_Goods_Extend.GivePonit), model.GivePonit },
+                    { nameof(RB_Point_Goods_Extend.GivePoint), model.GivePoint },
                     { nameof(RB_Point_Goods_Extend.OriginalPrice), model.OriginalPrice },
                     { nameof(RB_Point_Goods_Extend.SellingPrice), model.SellingPrice },
                     { nameof(RB_Point_Goods_Extend.Sort), model.Sort },
@@ -266,7 +270,7 @@ namespace Mall.Module.Education
                             OperatorEnum = OperatorEnum.Equal
                         }
                     };
-
+                    member_UserRepository.Update(filedsUser, userWhereHelpers, trans);
                 }
                 return flag;
             }
@@ -296,6 +300,7 @@ namespace Mall.Module.Education
 
         #endregion
 
+
         #region 点数明细
         /// <summary>
         /// 获取点数明细
@@ -318,7 +323,148 @@ namespace Mall.Module.Education
         public int GetUserPointBalance(int userId) {
             return member_UserRepository.GetEntity(userId)?.PointNum ?? 0;
         }
+        #endregion
+
+
+        #region 在线课程分类
+        /// <summary>
+        /// 获取列表
+        /// </summary>
+        /// <param name="where"></param>
+        /// <returns></returns>
+        public List<RB_Point_CourseClass_Extend> GetPointCourseClassList(RB_Point_CourseClass_Extend where)
+        {
+            return pointCourseClassRepository.GetPointCourseClassList(where);
+        }
+
+
+        /// <summary>
+        /// 分页列表
+        /// </summary>
+        /// <param name="pageIndex"></param>
+        /// <param name="pageSize"></param>
+        /// <param name="rowsCount"></param>
+        /// <param name="where"></param>
+        /// <returns></returns>
+        public List<RB_Point_CourseClass_Extend> GetPointCourseClassPageList(int pageIndex, int pageSize, out long rowsCount, RB_Point_CourseClass_Extend where)
+        {
+            return pointCourseClassRepository.GetPointCourseClassPageList(pageIndex, pageSize, out rowsCount, where);
+        }
+
+        /// <summary>
+        /// 新增/修改点数商品
+        /// </summary>
+        /// <param name="model"></param>
+        /// <returns></returns>
+        public bool SetPointCourseClass(RB_Point_CourseClass_Extend model)
+        {
+            if (model.ID == 0)
+            {
+                return pointCourseClassRepository.Insert(model) > 0;
+            }
+            else
+            {
+                IDictionary<string, object> fileds = new Dictionary<string, object>
+                {
+                    { nameof(RB_Point_CourseClass_Extend.UpdateDate), model.UpdateDate },
+                    { nameof(RB_Point_CourseClass_Extend.CourseClassType), (int)model.CourseClassType },
+                    { nameof(RB_Point_CourseClass_Extend.StudentNumType), model.StudentNumType },
+                    { nameof(RB_Point_CourseClass_Extend.IsPublic), model.IsPublic },
+                    { nameof(RB_Point_CourseClass_Extend.IsFree), model.IsFree },
+                    { nameof(RB_Point_CourseClass_Extend.Sort), model.Sort },
+                    { nameof(RB_Point_CourseClass_Extend.PointNum), model.PointNum },
+                    { nameof(RB_Point_CourseClass_Extend.Duration), model.Duration },
+                    { nameof(RB_Point_CourseClass_Extend.DurationUnit), (int)model.Duration }
+                };
+                IList<WhereHelper> auditrecordWhereHelpers = new List<WhereHelper>
+                    {
+                        new WhereHelper()
+                        {
+                            FiledName = nameof(RB_Point_CourseClass_Extend.ID),
+                            FiledValue = model.ID,
+                            OperatorEnum = OperatorEnum.Equal
+                        },
+                         new WhereHelper()
+                        {
+                            FiledName = nameof(RB_Point_CourseClass_Extend.TenantId),
+                            FiledValue = model.TenantId,
+                            OperatorEnum = OperatorEnum.Equal
+                        },
+                          new WhereHelper()
+                        {
+                            FiledName = nameof(RB_Point_CourseClass_Extend.MallBaseId),
+                            FiledValue = model.MallBaseId,
+                            OperatorEnum = OperatorEnum.Equal
+                        }
+                    };
+                return pointCourseClassRepository.Update(fileds, auditrecordWhereHelpers);
+            }
+        }
+
+
+        /// <summary>
+        /// 删除点数课程分类
+        /// </summary>
+        /// <param name="model"></param>
+        /// <returns></returns>
+        public bool DeletePointCourseClass(RB_Point_CourseClass_Extend model)
+        {
+            IDictionary<string, object> fileds = new Dictionary<string, object>
+                {
+                    { nameof(RB_Point_CourseClass_Extend.UpdateDate), model.UpdateDate },
+                    { nameof(RB_Point_CourseClass_Extend.State),1 }
+                };
+            IList<WhereHelper> auditrecordWhereHelpers = new List<WhereHelper>
+                    {
+                        new WhereHelper()
+                        {
+                            FiledName = nameof(RB_Point_CourseClass_Extend.ID),
+                            FiledValue = model.ID,
+                            OperatorEnum = OperatorEnum.Equal
+                        },
+                         new WhereHelper()
+                        {
+                            FiledName = nameof(RB_Point_CourseClass_Extend.TenantId),
+                            FiledValue = model.TenantId,
+                            OperatorEnum = OperatorEnum.Equal
+                        },
+                          new WhereHelper()
+                        {
+                            FiledName = nameof(RB_Point_CourseClass_Extend.MallBaseId),
+                            FiledValue = model.MallBaseId,
+                            OperatorEnum = OperatorEnum.Equal
+                        }
+                    };
+            return pointCourseClassRepository.Update(fileds, auditrecordWhereHelpers);
+
+        }
+        #endregion
+
+
+        #region  教师排课
+        /// <summary>
+        /// 获取列表
+        /// </summary>
+        /// <param name="where"></param>
+        /// <returns></returns>
+        public List<RB_Point_TeacherCourse_Extend> GetTeacherCourseList(RB_Point_TeacherCourse_Extend where)
+        {
+            return pointTeacherCourseRepository.GetTeacherCourseList(where);
+        }
+
 
+        /// <summary>
+        /// 分页列表
+        /// </summary>
+        /// <param name="pageIndex"></param>
+        /// <param name="pageSize"></param>
+        /// <param name="rowsCount"></param>
+        /// <param name="where"></param>
+        /// <returns></returns>
+        public List<RB_Point_TeacherCourse_Extend> GetTeacherCoursePageList(int pageIndex, int pageSize, out long rowsCount, RB_Point_TeacherCourse_Extend where)
+        {
+            return pointTeacherCourseRepository.GetTeacherCoursePageList(pageIndex, pageSize, out rowsCount, where);
+        }
         #endregion
     }
 }

Mall.Repository/Point/RB_Point_CourseClassRepository.cs

+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using Mall.Model.Entity.Point;
+using Mall.Model.Extend.Point;
+
+namespace Mall.Repository.Point
+{
+    public class RB_Point_CourseClassRepository:BaseRepository<RB_Point_CourseClass>
+    {
+        /// <summary>
+        /// 表名称
+        /// </summary>
+        public string TableName { get { return nameof(RB_Point_CourseClass); } }
+
+        /// <summary>
+        /// 获取列表
+        /// </summary>
+        /// <param name="where"></param>
+        /// <returns></returns>
+        public List<RB_Point_CourseClass_Extend> GetPointCourseClassList(RB_Point_CourseClass_Extend where)
+        {
+            StringBuilder sb = new StringBuilder();
+            sb.Append($@"SELECT * from RB_Point_CourseClass  where state=0");
+            if (where != null)
+            {
+                if (where.TenantId > 0)
+                {
+                    sb.AppendFormat(" and TenantId={0}", where.TenantId);
+                }
+                if (where.MallBaseId > 0)
+                {
+                    sb.AppendFormat(" and MallBaseId={0}", where.MallBaseId);
+                }
+                if (where.ID > 0)
+                {
+                    sb.AppendFormat(" and ID={0}", where.ID);
+                }
+               
+            }
+            return Get<RB_Point_CourseClass_Extend>(sb.ToString()).ToList();
+        }
+
+
+
+
+        /// <summary>
+        /// 分页列表
+        /// </summary>
+        /// <param name="pageIndex"></param>
+        /// <param name="pageSize"></param>
+        /// <param name="rowsCount"></param>
+        /// <param name="where"></param>
+        /// <returns></returns>
+        public List<RB_Point_CourseClass_Extend> GetPointCourseClassPageList(int pageIndex, int pageSize, out long rowsCount, RB_Point_CourseClass_Extend where)
+        {
+            StringBuilder sb = new StringBuilder();
+            sb.Append($@"SELECT * from RB_Point_CourseClass  where state=0");
+            if (where != null)
+            {
+                if (where.TenantId > 0)
+                {
+                    sb.AppendFormat(" and TenantId={0}", where.TenantId);
+                }
+                if (where.MallBaseId > 0)
+                {
+                    sb.AppendFormat(" and MallBaseId={0}", where.MallBaseId);
+                }
+                if (where.ID > 0)
+                {
+                    sb.AppendFormat(" and ID={0}", where.ID);
+                }
+                if (where.CourseClassType > 0)
+                {
+                    sb.AppendFormat(" and CourseClassType={0}", (int)where.CourseClassType);
+                }
+            }
+            return GetPage<RB_Point_CourseClass_Extend>(pageIndex, pageSize, out rowsCount, sb.ToString()).ToList();
+        }
+    }
+}

Mall.Repository/Point/RB_Point_TeacherCourseRepository.cs

+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using Mall.Model.Entity.Point;
+using Mall.Model.Extend.Point;
+
+namespace Mall.Repository.Point
+{
+    public class RB_Point_TeacherCourseRepository : BaseRepository<RB_Point_TeacherCourse>
+    {
+        /// <summary>
+        /// 表名称
+        /// </summary>
+        public string TableName { get { return nameof(RB_Point_TeacherCourse); } }
+
+        /// <summary>
+        /// 获取列表
+        /// </summary>
+        /// <param name="where"></param>
+        /// <returns></returns>
+        public List<RB_Point_TeacherCourse_Extend> GetTeacherCourseList(RB_Point_TeacherCourse_Extend where)
+        {
+            StringBuilder sb = new StringBuilder();
+            sb.Append($@"SELECT tc.*,et.`Name` as TeacherName,et.TeacherLogo,cc.CourseClassType,
+cc.StudentNumType,cc.IsPublic,cc.IsFree,cc.DurationUnit
+from RB_Point_TeacherCourse as tc  
+LEFT JOIN rb_point_courseclass as cc on tc.CourseClassId=cc.ID
+LEFT JOIN rb_education_teacher as et on tc.TeacherId=et.ID
+ where tc.state=0 and cc.state=0 and et.`Status`=0");
+            if (where != null)
+            {
+                if (where.TenantId > 0)
+                {
+                    sb.AppendFormat(" and tc.TenantId={0}", where.TenantId);
+                }
+                if (where.MallBaseId > 0)
+                {
+                    sb.AppendFormat(" and tc.MallBaseId={0}", where.MallBaseId);
+                }
+                if (where.MallBaseId > 0)
+                {
+                    sb.AppendFormat(" and tc.MallBaseId={0}", where.MallBaseId);
+                }
+                if (where.CourseClassId > 0)
+                {
+                    sb.AppendFormat(" and tc.CourseClassId={0}", where.CourseClassId);
+                }
+                if (where.TeacherId > 0)
+                {
+                    sb.AppendFormat(" and tc.TeacherId={0}", where.TeacherId);
+                }
+                if (!string.IsNullOrEmpty(where.SelectStartTime))
+                {
+                    sb.AppendFormat(" AND DATE_FORMAT(tc.{0},'%y-%m-%d')>=DATE_FORMAT('{1}','%y-%m-%d') ", nameof(RB_Point_TeacherCourse_Extend.StudyDate), where.SelectStartTime);
+                }
+                if (!string.IsNullOrEmpty(where.SelectEndTime))
+                {
+                    sb.AppendFormat(" AND DATE_FORMAT(tc.{0},'%y-%m-%d')<=DATE_FORMAT('{1}','%y-%m-%d') ", nameof(RB_Point_TeacherCourse_Extend.StudyDate), where.SelectEndTime);
+                }
+                if (where.ID > 0)
+                {
+                    sb.AppendFormat(" and tc.ID={0}", where.ID);
+                }
+            }
+            return Get<RB_Point_TeacherCourse_Extend>(sb.ToString()).ToList();
+        }
+
+
+
+
+        /// <summary>
+        /// 分页列表
+        /// </summary>
+        /// <param name="pageIndex"></param>
+        /// <param name="pageSize"></param>
+        /// <param name="rowsCount"></param>
+        /// <param name="where"></param>
+        /// <returns></returns>
+        public List<RB_Point_TeacherCourse_Extend> GetTeacherCoursePageList(int pageIndex, int pageSize, out long rowsCount, RB_Point_TeacherCourse_Extend where)
+        {
+            StringBuilder sb = new StringBuilder();
+            sb.Append($@"SELECT * from RB_Point_TeacherCourse  where state=0");
+            if (where != null)
+            {
+                if (where.TenantId > 0)
+                {
+                    sb.AppendFormat(" and TenantId={0}", where.TenantId);
+                }
+                if (where.MallBaseId > 0)
+                {
+                    sb.AppendFormat(" and MallBaseId={0}", where.MallBaseId);
+                }
+                if (where.MallBaseId > 0)
+                {
+                    sb.AppendFormat(" and MallBaseId={0}", where.MallBaseId);
+                }
+                if (where.CourseClassId > 0)
+                {
+                    sb.AppendFormat(" and CourseClassId={0}", where.CourseClassId);
+                }
+                if (where.TeacherId > 0)
+                {
+                    sb.AppendFormat(" and TeacherId={0}", where.TeacherId);
+                }
+                if (!string.IsNullOrEmpty(where.SelectStartTime))
+                {
+                    sb.AppendFormat(" AND DATE_FORMAT(A.{0},'%y-%m-%d')>=DATE_FORMAT('{1}','%y-%m-%d') ", nameof(RB_Point_TeacherCourse_Extend.StudyDate), where.SelectStartTime);
+                }
+                if (!string.IsNullOrEmpty(where.SelectEndTime))
+                {
+                    sb.AppendFormat(" AND DATE_FORMAT(A.{0},'%y-%m-%d')<=DATE_FORMAT('{1}','%y-%m-%d') ", nameof(RB_Point_TeacherCourse_Extend.StudyDate), where.SelectEndTime);
+                }
+                if (where.ID > 0)
+                {
+                    sb.AppendFormat(" and ID={0}", where.ID);
+                }
+            }
+            return GetPage<RB_Point_TeacherCourse_Extend>(pageIndex, pageSize, out rowsCount, sb.ToString()).ToList();
+        }
+    }
+}

Mall.WebApi/Controllers/Education/PointController.cs

@@ -183,7 +183,198 @@ namespace Mall.WebApi.Controllers.Education
             };
             return ApiResult.Success("", pagelist);
         }
+        #endregion
+
+        #region 在线课程分类
+        /// <summary>
+        /// 课程分类
+        /// </summary>
+        /// <returns></returns>
+        [HttpPost]
+        public ApiResult GetPointCourseClassPageList()
+        {
+            var parms = RequestParm;
+            ResultPageModel pagelist = JsonConvert.DeserializeObject<ResultPageModel>(RequestParm.msg.ToString());
+            RB_Point_CourseClass_Extend demodel = JsonConvert.DeserializeObject<RB_Point_CourseClass_Extend>(RequestParm.msg.ToString());
+            demodel.TenantId = UserInfo.TenantId;
+            demodel.MallBaseId = parms.MallBaseId;
+            //demodel.TeacherStatus = -1;
+            var list = pointModule.GetPointCourseClassPageList(pagelist.pageIndex, pagelist.pageSize, out long count, demodel);
+            pagelist.count = Convert.ToInt32(count);
+            pagelist.pageData = list.Select(x => new
+            {
+                x.ID,
+                x.IsFree,
+                x.CourseClassType,
+                CourseClassName = EnumHelper.GetEnumName(x.CourseClassType),
+                x.Duration,
+                x.DurationUnit,
+                x.StudentNumType,
+                StudentNumTypeStr = EnumHelper.GetEnumName(x.StudentNumType),
+                DurationUnitStr = EnumHelper.GetEnumName(x.DurationUnit),
+                x.PointNum,
+                x.IsPublic
+            });
+            return ApiResult.Success("", pagelist);
+        }
+
 
+        /// <summary>
+        /// 获取详情
+        /// </summary>
+        /// <returns></returns>
+        [HttpPost]
+        public ApiResult GetPointCourseClassModel()
+        {
+            var parms = RequestParm;
+            var query = JsonConvert.DeserializeObject<RB_Point_CourseClass_Extend>(RequestParm.msg.ToString());
+            query.TenantId = UserInfo.TenantId;
+            query.MallBaseId = parms.MallBaseId;
+            var oldPointGoodsModel = pointModule.GetPointCourseClassList(query).FirstOrDefault();
+            if (oldPointGoodsModel == null)
+            {
+                oldPointGoodsModel = new RB_Point_CourseClass_Extend();
+            }
+            else {
+                oldPointGoodsModel.ClassName = EnumHelper.GetEnumName(oldPointGoodsModel.CourseClassType);
+                oldPointGoodsModel.StudentNumTypeName = EnumHelper.GetEnumName(oldPointGoodsModel.StudentNumType);
+                oldPointGoodsModel.DurationUnitName = EnumHelper.GetEnumName(oldPointGoodsModel.DurationUnit);
+            }
+            return ApiResult.Success("", oldPointGoodsModel);
+        }
+
+
+        /// <summary>
+        /// 保存课程分类信息
+        /// </summary>
+        /// <returns></returns>
+        public ApiResult SetPointCourseClass()
+        {
+            var parms = RequestParm;
+            var query = JsonConvert.DeserializeObject<RB_Point_CourseClass_Extend>(RequestParm.msg.ToString());
+            query.TenantId = UserInfo.TenantId;
+            query.MallBaseId = parms.MallBaseId;
+            if (query == null)
+            {
+                return ApiResult.Failed("请传入课程分类信息");
+            }
+            else
+            {
+                if (query.ID == 0)
+                {
+                    query.CreateDate = System.DateTime.Now;
+                }
+                if (query.CourseClassType == 0)
+                {
+                    return ApiResult.Failed("请选择课程分类类型");
+                }
+                if (query.StudentNumType == 0)
+                {
+                    return ApiResult.Failed("请选择上课人数");
+                }
+                if (query.IsFree == 0)
+                {
+                    if (query.PointNum == 0)
+                    {
+                        return ApiResult.Failed("课程分类不免费，请填入点数");
+                    }
+                }
+                if (query.Duration == 0)
+                {
+                    return ApiResult.Failed("请输入时长");
+                }
+                query.Sort = 0;
+                query.State = 0;
+                query.UpdateDate = System.DateTime.Now;
+                bool result = pointModule.SetPointCourseClass(query);
+                if (result)
+                {
+                    return ApiResult.Success("课程分类信息保存成功");
+                }
+                else
+                {
+                    return ApiResult.Failed("课程分类信息保存失败");
+                }
+            }
+        }
+
+
+
+        /// <summary>
+        /// 删除课程分类
+        /// </summary>
+        /// <returns></returns>
+        [HttpPost]
+        public ApiResult DeletePointCourseClass()
+        {
+            var parms = RequestParm;
+            JObject parmsJob = JObject.Parse(RequestParm.msg.ToString());
+            int Id = parmsJob.GetInt("Id", 0);
+
+            if (Id == 0)
+            {
+                return ApiResult.Failed("请选择您要删除的课程分类信息");
+            }
+            bool flag = pointModule.DeletePointCourseClass(new RB_Point_CourseClass_Extend { ID = Id, TenantId = UserInfo.TenantId, MallBaseId = parms.MallBaseId });
+            if (flag)
+            {
+                return ApiResult.Success();
+            }
+            else
+            {
+                return ApiResult.Failed();
+            }
+        }
+
+
+
+        /// <summary>
+        /// 获取课程分类枚举
+        /// </summary>
+        /// <returns></returns>
+        [HttpPost]
+        public ApiResult GetCourseClassTypeEnumList()
+        {
+            var list = EnumHelper.GetEnumList(typeof(Common.Enum.Point.CourseClassTypeEnum));
+            return ApiResult.Success("", list.OrderBy(x => Convert.ToInt32(x.Value)).Select(x => new
+            {
+                Name = x.Key,
+                Id = Convert.ToInt32(x.Value)
+            }));
+        }
+
+
+        /// <summary>
+        /// 获取课程时长单位枚举
+        /// </summary>
+        /// <returns></returns>
+        [HttpPost]
+        public ApiResult GetDurationUnitEnumList()
+        {
+            var list = EnumHelper.GetEnumList(typeof(Common.Enum.Point.DurationUnitEnum));
+            return ApiResult.Success("", list.OrderBy(x => Convert.ToInt32(x.Value)).Select(x => new
+            {
+                Name = x.Key,
+                Id = Convert.ToInt32(x.Value)
+            }));
+        }
+
+
+
+        /// <summary>
+        /// 获取上课人数枚举
+        /// </summary>
+        /// <returns></returns>
+        [HttpPost]
+        public ApiResult GetStudentNumTypeEnumList()
+        {
+            var list = EnumHelper.GetEnumList(typeof(Common.Enum.Point.StudentNumTypeEnum));
+            return ApiResult.Success("", list.OrderBy(x => Convert.ToInt32(x.Value)).Select(x => new
+            {
+                Name = x.Key,
+                Id = Convert.ToInt32(x.Value)
+            }));
+        }
         #endregion
     }
 }