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

Edu.Common/Enum/Course/OrderSourceEnum.cs

@@ -42,5 +42,10 @@ namespace Edu.Common.Enum.Course
         /// </summary>
         [EnumField("教育同行")]
         EduClient = 7,
+        /// <summary>
+        /// 甲鹤小程序
+        /// </summary>
+        [EnumField("甲鹤小程序")]
+        MallApplet = 8,
     }
 }

Edu.Model/Entity/Finance/RB_Finance_OrderRecord.cs

@@ -18,7 +18,7 @@ namespace Edu.Model.Entity.Finance
         /// </summary>
         public int ID { get; set; }
         /// <summary>
-        /// 类型  1收款 2退款
+        /// 类型  1收款 2退款,3-活动收入，4-活动退款
         /// </summary>        
         public int? Type
         {

Edu.Model/ViewModel/Mall/RB_Goods_SpecificationValue_Extend.cs

@@ -21,5 +21,11 @@ namespace Edu.Model.ViewModel.Mall
         /// 图片路径
         /// </summary>
         public string ImagePath { get; set; }
+
+
+        /// <summary>
+        /// 班级ids
+        /// </summary>
+        public string ClassIds { get; set; }
     }
 }

Edu.Repository/Grade/RB_ClassRepository.cs

@@ -118,6 +118,10 @@ WHERE 1=1
                 {
                     builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_Class_ViewModel.ClassId), query.ClassId);
                 }
+                if (!string.IsNullOrEmpty(query.Q_ClassIds))
+                {
+                    builder.AppendFormat(" AND A.{0} in ({1}) ", nameof(RB_Class_ViewModel.ClassId), query.Q_ClassIds);
+                }
                 if (query.Status >= 0)
                 {
                     builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_Class_ViewModel.Status), (int)query.Status);

Edu.Repository/Mall/RB_Goods_SpecificationValueRepository.cs

@@ -50,7 +50,10 @@ namespace Edu.Repository.Mall
             {
                 where += $@" and {nameof(RB_Goods_SpecificationValue.GoodsId)} in({dmodel.GoodsIds})";
             }
-
+            if (!string.IsNullOrEmpty(dmodel.ClassIds))
+            {
+                where += $@" and {nameof(RB_Goods_SpecificationValue.ClassId)} in({dmodel.ClassIds})";
+            }
             string sql = $@"select * from RB_Goods_SpecificationValue where {where} order by Id asc";
             return Get<RB_Goods_SpecificationValue_Extend>(sql).ToList();
         }

Edu.WebApi/Controllers/Course/CourseController.cs

@@ -283,21 +283,21 @@ namespace Edu.WebApi.Controllers.Course
                 IsKCourse = base.ParmJObj.GetInt("IsKCourse"),
                 ClassHours = base.ParmJObj.GetDecimal("ClassHours")
             };
-            //try
-            //{
-            //    extModel.CategoryList = JsonHelper.DeserializeObject<List<RB_Goods_Category_Extend>>(base.ParmJObj.GetStringValue("CategoryList"));
-            //    if (extModel.SalePlatList != null && extModel.SalePlatList.Any(x => x == 4))//有小程序的上架平台
-            //    {
-            //        if (extModel.CategoryList == null || !extModel.CategoryList.Any())
-            //        {
-            //            return ApiResult.Failed("上架小程序必须选择小程序对应的分类");
-            //        }
-            //    }
-            //}
-            //catch (Exception ex)
-            //{
-
-            //}
+            try
+            {
+                extModel.CategoryList = JsonHelper.DeserializeObject<List<RB_Goods_Category_Extend>>(base.ParmJObj.GetStringValue("CategoryList"));
+                if (extModel.SalePlatList != null && extModel.SalePlatList.Any(x => x == 4))//有小程序的上架平台
+                {
+                    if (extModel.CategoryList == null || !extModel.CategoryList.Any())
+                    {
+                        return ApiResult.Failed("上架小程序必须选择小程序对应的分类");
+                    }
+                }
+            }
+            catch (Exception ex)
+            {
+
+            }
             extModel.CreateTime = DateTime.Now;
             extModel.CreateBy = base.UserInfo.Id;
             extModel.UpdateBy = base.UserInfo.Id;