页面修改

Mall.Model/Entity/Education/RB_Goods.cs

@@ -73,5 +73,19 @@ namespace Mall.Model.Entity.Coffee
 		/// </summary>
 		public int MaterialId { get; set; }
 
+		/// <summary>
+		/// 进阶小课堂年级Id
+		/// </summary>
+		public int EduGradeId { get; set; }
+
+		/// <summary>
+		/// 进阶小课堂班型Id
+		/// </summary>
+		public int EduClassTypeId { get; set; }
+
+		/// <summary>
+		/// 进阶小课堂老师Id
+		/// </summary>
+		public int EduTeacherId { get; set; }
 	}
 }

Mall.Model/Entity/Product/RB_Goods.cs

@@ -663,5 +663,20 @@ namespace Mall.Model.Entity.Product
         /// 教育扩展json对象
         /// </summary>
         public string EduJsonData { get; set; }
+
+        /// <summary>
+        /// 进阶小课堂年级Id
+        /// </summary>
+        public int EduGradeId { get; set; }
+
+        /// <summary>
+        /// 进阶小课堂班型Id
+        /// </summary>
+        public int EduClassTypeId { get; set; }
+
+        /// <summary>
+        /// 进阶小课堂老师Id
+        /// </summary>
+        public int EduTeacherId { get; set; }
     }
 }

Mall.Module.Product/ProductModule.cs

@@ -9,6 +9,7 @@ using Mall.Model.Extend.Reserve;
 using Mall.Model.Extend.User;
 using Mall.Model.Query;
 using Mall.Repository.BaseSetUp;
+using Mall.Repository.Education;
 using Mall.Repository.MarketingCenter;
 using Mall.Repository.Product;
 using Mall.Repository.Reserve;
@@ -5582,6 +5583,31 @@ namespace Mall.Module.Product
             return treeList;
         }
 
+        /// <summary>
+        /// 获取班级类型
+        /// </summary>
+        /// <returns></returns>
+        public List<object> GetCourseCategoryListModule()
+        {
+            List<object> list = new List<object>();
+            var dataList = new RB_Think_Course_CategoryRepository().GetCourseCategoryListRepository(new Model.Entity.Education.RB_Course_Category()
+            {
+
+            });
+            if (dataList != null && dataList.Count > 0)
+            {
+                foreach (var item in dataList)
+                {
+                    list.Add(new
+                    {
+                        item.CateId,
+                        item.CateName,
+                    });
+                }
+            }
+            return list;
+        }
+
         /// <summary>
         /// 获取树形结构列表
         /// </summary>

Mall.Repository/Product/RB_GoodsRepository.cs

@@ -974,6 +974,15 @@ WHERE {where} group by g.Id order by g.CreateDate desc";
             {
                 where += $@" AND locate(',{dmodel.StoresIds},',CONCAT(',',g.{nameof(RB_Goods_Extend.StoresIds)}, ','))";
             }
+
+            if (dmodel.EduClassTypeId > 0)
+            {
+                where += $@" and g.{nameof(RB_Goods_Extend.EduClassTypeId)} ={dmodel.EduClassTypeId}";
+            }
+            if (dmodel.EduTeacherId > 0)
+            {
+                where += $@" and g.{nameof(RB_Goods_Extend.EduTeacherId)} ={dmodel.EduTeacherId}";
+            }
             //默认综合【升序】
             string orderBy = $" order by g.{nameof(RB_Goods_Extend.Sort)} asc";
             //上架时间【降序】

Mall.WebApi/Controllers/Product/AppletGoodsController.cs

@@ -116,6 +116,27 @@ namespace Mall.WebApi.Controllers.MallBase
             return ApiResult.Success("", list);
         }
 
+        /// <summary>
+        /// 获取班型
+        /// </summary>
+        /// <returns></returns>
+        [HttpPost]
+        public ApiResult GetClassTypeList(object requestMsg)
+        {
+            JObject rootObj = JObject.Parse(requestMsg.ToString());
+            var parms = new RequestParm()
+            {
+                TenantId = rootObj.GetInt("TenantId"),
+                MallBaseId = rootObj.GetInt("MallBaseId"),
+            };
+            if (parms.MallBaseId <= 0)
+            {
+                return ApiResult.ParamIsNull();
+            }
+            var list = productModule.GetCourseCategoryListModule();
+            return ApiResult.Success("", list);
+        }
+
         /// <summary>
         /// 获取分类树形结构
         /// </summary>
@@ -241,7 +262,9 @@ namespace Mall.WebApi.Controllers.MallBase
                 OrderBy=sObj.GetInt("OrderBy"),
                 UserId=sObj.GetInt("UserId"),
                 GoodsPageType=(GoodsPageTypeEnum)sObj.GetInt("GoodsPageType"),
-                IsVideo=sObj.GetInt("IsVideo")
+                IsVideo=sObj.GetInt("IsVideo"),
+                EduClassTypeId=sObj.GetInt("EduClassTypeId"),
+                EduTeacherId=sObj.GetInt("EduTeacherId"),
             };
             demodel.TenantId = parms.TenantId;
             demodel.MallBaseId = parms.MallBaseId;

Mall.WebApi/Filter/ApiFilterAttribute.cs

@@ -222,7 +222,6 @@ namespace Mall.WebApi.Filter
                 catch
                 {
                     actionContext.Result = new Microsoft.AspNetCore.Mvc.JsonResult(
-                        HttpStatusCode.OK,
                         new ApiResult
                         {
                             resultCode = (int)ResultCode.TokenIllegal,

Mall.WebApi/appsettings.json

 {
-    "ConnectionStrings": {
-      "DefaultConnection": "server=192.168.10.214;user id=reborn;password=Reborn@2018;database=reborn_mall;CharSet=utf8mb4; Convert Zero Datetime=true; ",
-      "DefaultConnectionPName": "MySql.Data.MySqlClient",
-      "FinanceConnection": "server=192.168.10.214;user id=reborn;password=Reborn@2018;database=reborn_finance;CharSet=utf8mb4; Convert Zero Datetime=true; ",
-      "FinanceConnectionPName": "MySql.Data.MySqlClient",
-      "UserConnection": "server=192.168.10.214;user id=reborn;password=Reborn@2018;database=reborn_user;CharSet=utf8mb4; Convert Zero Datetime=true; ",
-      "UserConnectionPName": "MySql.Data.MySqlClient",
-      "PropertyConnection": "server=192.168.10.214;user id=reborn;password=Reborn@2018;database=property;CharSet=utf8mb4; Convert Zero Datetime=true; ",
-      "PropertyConnectionPName": "MySql.Data.MySqlClient",
-      "EduConnection": "server=192.168.10.214;user id=reborn;password=Reborn@2018;database=test_edu2;CharSet=utf8mb4; Convert Zero Datetime=true; ",
-      "EduConnectionPName": "MySql.Data.MySqlClient"
-    },
+  "ConnectionStrings": {
+    "DefaultConnection": "server=192.168.10.214;user id=reborn;password=Reborn@2018;database=reborn_mall;CharSet=utf8mb4; Convert Zero Datetime=true; ",
+    "DefaultConnectionPName": "MySql.Data.MySqlClient",
+    "FinanceConnection": "server=192.168.10.214;user id=reborn;password=Reborn@2018;database=reborn_finance;CharSet=utf8mb4; Convert Zero Datetime=true; ",
+    "FinanceConnectionPName": "MySql.Data.MySqlClient",
+    "UserConnection": "server=192.168.10.214;user id=reborn;password=Reborn@2018;database=reborn_user;CharSet=utf8mb4; Convert Zero Datetime=true; ",
+    "UserConnectionPName": "MySql.Data.MySqlClient",
+    "PropertyConnection": "server=192.168.10.214;user id=reborn;password=Reborn@2018;database=property;CharSet=utf8mb4; Convert Zero Datetime=true; ",
+    "PropertyConnectionPName": "MySql.Data.MySqlClient",
+    "EduConnection": "server=192.168.10.214;user id=reborn;password=Reborn@2018;database=test_edu2;CharSet=utf8mb4; Convert Zero Datetime=true; ",
+    "EduConnectionPName": "MySql.Data.MySqlClient",
+    "ThinkConnection": "server=192.168.10.214;user id=reborn;password=Reborn@2018;database=reborn_think;CharSet=utf8mb4; Convert Zero Datetime=true; ",
+    "ThinkConnectionPName": "MySql.Data.MySqlClient"
+  },
     "Logging": {
       "LogLevel": {
         "Default": "Information",