页面修改

Edu.Model/ViewModel/Course/RB_Class_ViewModel.cs

@@ -176,5 +176,10 @@ namespace Edu.Model.ViewModel.Course
         /// 课程分类编号
         /// </summary>
         public int CateId { get; set; }
+
+        /// <summary>
+        /// 销售平台
+        /// </summary>
+        public string Saleplat { get; set; }
     }
 }
\ No newline at end of file

Edu.Repository/Course/RB_ClassRepository.cs

@@ -310,6 +310,30 @@ WHERE 1=1
                     builder.AppendFormat(" AND (IFNULL(A.ClassPersion,0)-IFNULL(t.GuestNum,0))>0 ");
                     builder.AppendFormat(" AND A.{0} >='{1}' ", nameof(RB_Class_ViewModel.EndOrderTime), DateTime.Now.ToString("yyyy-MM-dd"));
                 }
+                //销售平台
+                if (!string.IsNullOrEmpty(query.Saleplat))
+                {
+                    var salePlatList= Common.ConvertHelper.StringToList(query.Saleplat);
+                    string str = "";
+                    if (salePlatList != null && salePlatList.Count > 0)
+                    {
+                        for (var i = 0; i < salePlatList.Count; i++)
+                        {
+                            if (i == 0)
+                            {
+                                str += string.Format(" FIND_IN_SET('{0}', B.Saleplat)>0 ",salePlatList[i]);
+                            }
+                            else
+                            {
+                                str += string.Format(" AND FIND_IN_SET('{0}', B.Saleplat)>0 ", salePlatList[i]);
+                            }
+                        }
+                    }
+                    if (!string.IsNullOrEmpty(str))
+                    {
+                        builder.AppendFormat("  AND ({0}) ", str);
+                    }
+                }
             }
             builder.AppendFormat(" order by A.{0} asc", nameof(RB_Class_ViewModel.OpenTime));
             return GetPage<RB_Class_ViewModel>(pageIndex, pageSize, out rowsCount, builder.ToString(), parameters).ToList();

Edu.Repository/Course/RB_CourseRepository.cs

@@ -48,6 +48,30 @@ WHERE 1=1
                 {
                     builder.AppendFormat(" AND A.{0}<>{1} ORDER BY RAND() LIMIT {2} ", nameof(RB_Course_ViewModel.CourseId), query.CourseId, query.RandNum);
                 }
+                //销售平台
+                if (!string.IsNullOrEmpty(query.Saleplat))
+                {
+                    var salePlatList = Common.ConvertHelper.StringToList(query.Saleplat);
+                    string str = "";
+                    if (salePlatList != null && salePlatList.Count > 0)
+                    {
+                        for (var i = 0; i < salePlatList.Count; i++)
+                        {
+                            if (i == 0)
+                            {
+                                str += string.Format(" FIND_IN_SET('{0}', A.Saleplat)>0 ", salePlatList[i]);
+                            }
+                            else
+                            {
+                                str += string.Format(" AND FIND_IN_SET('{0}', A.Saleplat)>0 ", salePlatList[i]);
+                            }
+                        }
+                    }
+                    if (!string.IsNullOrEmpty(str))
+                    {
+                        builder.AppendFormat("  AND ({0}) ", str);
+                    }
+                }
             }
             return Get<RB_Course_ViewModel>(builder.ToString(), parameters).ToList();
         }
@@ -91,6 +115,30 @@ WHERE 1=1
                 {
                     builder.AppendFormat(" AND A.{0} IN({1}) ", nameof(RB_Course_ViewModel.CateId), query.QCateIds);
                 }
+                //销售平台
+                if (!string.IsNullOrEmpty(query.Saleplat))
+                {
+                    var salePlatList = Common.ConvertHelper.StringToList(query.Saleplat);
+                    string str = "";
+                    if (salePlatList != null && salePlatList.Count > 0)
+                    {
+                        for (var i = 0; i < salePlatList.Count; i++)
+                        {
+                            if (i == 0)
+                            {
+                                str += string.Format(" FIND_IN_SET('{0}', A.Saleplat)>0 ", salePlatList[i]);
+                            }
+                            else
+                            {
+                                str += string.Format(" AND FIND_IN_SET('{0}', A.Saleplat)>0 ", salePlatList[i]);
+                            }
+                        }
+                    }
+                    if (!string.IsNullOrEmpty(str))
+                    {
+                        builder.AppendFormat("  AND ({0}) ", str);
+                    }
+                }
             }
             return GetPage<RB_Course_ViewModel>(pageIndex, pageSize, out rowsCount, builder.ToString(), parameters).ToList();
         }

Edu.WebApi/Controllers/Web/WebController.cs

@@ -342,6 +342,7 @@ namespace Edu.WebApi.Controllers.Web
                 int groupId = groupModule.GetGroupIdByDomainModule(Domain);
                 query.Group_Id = groupId;
             }
+            query.Saleplat = "2,3";
             var list = courseModule.GetCoursePageListModule(pageModel.PageIndex, pageModel.PageSize, out long rowsCount, query);
             List<object> resultList = new List<object>();
             foreach (var item in list)
@@ -426,6 +427,7 @@ namespace Edu.WebApi.Controllers.Web
                 int groupId = groupModule.GetGroupIdByDomainModule(Domain);
                 query.Group_Id = groupId;
             }
+            query.Saleplat = "2,3";
             var list = courseModule.GetCourseListModule(query);
             return ApiResult.Success(data: list.Select(qitem => new
             {
@@ -463,6 +465,7 @@ namespace Edu.WebApi.Controllers.Web
                 int groupId = groupModule.GetGroupIdByDomainModule(Domain);
                 dmodel.Group_Id = groupId;
             }
+            dmodel.Saleplat = "2,3";
             var list = orderModule.GetClassPruductList(pageModel.PageIndex, pageModel.PageSize, out long count, dmodel);
             pageModel.Count = Convert.ToInt32(count);
             pageModel.PageData = list.Select(x => new