Merge branch 'master' of http://gitlab.oytour.com/Kui2/mall.oytour.com into sdzq-ld

Mall.Model/Entity/Education/RB_Education_Teacher.cs

@@ -46,6 +46,12 @@ namespace Mall.Model.Entity.Education
 
         public string LableName { get; set; }
 
+        /// <summary>
+        /// 擅长课程
+        /// </summary>
+        public string GoodCourse { get; set; }
+
+
         /// <summary>
         /// 专业
         /// </summary>

Mall.Model/Extend/Education/RB_Education_Teacher_Extend.cs

@@ -18,6 +18,11 @@ namespace Mall.Model.Extend.Education
         /// </summary>
         public List<string> LableNameList { get; set; }
 
+        /// <summary>
+        /// 擅长课程
+        /// </summary>
+        public List<string> GoodCourseList { get; set; }
+
         /// <summary>
         /// 订单数
         /// </summary>

Mall.Model/Extend/MarketingCenter/RB_Miniprogram_Template_Extend.cs

@@ -797,6 +797,41 @@ namespace Mall.Model.Extend.MarketingCenter
         /// 视频地址
         /// </summary>
         public string url { get; set; }
+
+        /// <summary>
+        /// 上边距
+        /// </summary>
+        public string top { get; set; }
+
+        /// <summary>
+        /// 下边距
+        /// </summary>
+        public string bottom { get; set; }
+
+        /// <summary>
+        /// 左边距
+        /// </summary>
+        public string left { get; set; }
+
+        /// <summary>
+        /// 右边距
+        /// </summary>
+        public string right { get; set; }
+
+        /// <summary>
+        /// 是否全屏
+        /// </summary>
+        public bool isfullscreen { get; set; }
+
+        /// <summary>
+        /// 背景图
+        /// </summary>
+        public string backgroundimage { get; set; }
+
+        /// <summary>
+        /// 圆角
+        /// </summary>
+        public string radius { get; set; }
     }
 
     /// <summary>

Mall.Module.Education/EducationModule.cs

@@ -1770,6 +1770,7 @@ namespace Mall.Module.Education
                            { nameof(RB_Education_Teacher_Extend.Nationality),model.Nationality},
                            { nameof(RB_Education_Teacher_Extend.ForeignersUrl),model.ForeignersUrl},
                            { nameof(RB_Education_Teacher_Extend.UserId),model.UserId},
+                           { nameof(RB_Education_Teacher_Extend.GoodCourse),model.GoodCourse},
                     };
                     List<WhereHelper> wheres = new List<WhereHelper>() {
                         new WhereHelper(){

Mall.Module.MarketingCenter/MiniprogramTemplateModule.cs

@@ -329,7 +329,27 @@ namespace Mall.Module.MarketingCenter
                     item.data = subData;
                     break;
                 //视频插件
-                case "video": item.data = JsonHelper.DeserializeObject<videoItem>(item.data.ToString()); break;
+                case "video":
+                    videoItem videoData = new videoItem();
+                    try
+                    {
+                        var video = JsonHelper.DeserializeObject<videoItem>(item.data.ToString());
+                        videoData.pic_url = video?.pic_url ?? "";
+                        videoData.url = video?.url ?? "";
+                        videoData.top = video?.top ?? "0";
+                        videoData.bottom = video?.bottom ?? "0";
+                        videoData.left = video?.left ?? "0";
+                        videoData.right = video?.right ?? "0";
+                        videoData.isfullscreen = video?.isfullscreen ?? false;
+                        videoData.backgroundimage = video?.backgroundimage ?? "";
+                        videoData.radius = video?.radius ?? "0";
+                    }
+                    catch
+                    {
+
+                    }
+                    item.data = videoData;
+                    break;
                 //商品插件
                 case "goods": item.data = JsonHelper.DeserializeObject<goodsItem>(item.data.ToString()); break;
                 //门店插件

Mall.Module.User/ContentModule.cs

@@ -214,7 +214,27 @@ namespace Mall.Module.User
                         switch (item.Id)
                         {
                             case "rubik": item.data = JsonHelper.DeserializeObject<rubikItem>(item.data.ToString()); break;
-                            case "video": item.data = JsonHelper.DeserializeObject<videoItem>(item.data.ToString()); break;
+                            case "video":
+                                videoItem videoData = new videoItem();
+                                try
+                                {
+                                    var video = JsonHelper.DeserializeObject<videoItem>(item.data.ToString());
+                                    videoData.pic_url = video?.pic_url ?? "";
+                                    videoData.url = video?.url ?? "";
+                                    videoData.top = video?.top ?? "0";
+                                    videoData.bottom = video?.bottom ?? "0";
+                                    videoData.left = video?.left ?? "0";
+                                    videoData.right = video?.right ?? "0";
+                                    videoData.isfullscreen = video?.isfullscreen ?? false;
+                                    videoData.backgroundimage = video?.backgroundimage ?? "";
+                                    videoData.radius = video?.radius ?? "0";
+                                }
+                                catch
+                                {
+
+                                }
+                                item.data = videoData;
+                                break;
                             case "image-text": item.data = JsonHelper.DeserializeObject<imagetextItem>(item.data.ToString()); break;
                         }
                     }

Mall.WebApi/Controllers/Education/AppletSchoolController.cs

@@ -415,6 +415,18 @@ namespace Mall.WebApi.Controllers.Education
             {
                 oldLogisticsModel.LableNameList = JsonConvert.DeserializeObject<List<string>>(oldLogisticsModel.LableName);
             }
+            else
+            {
+                oldLogisticsModel.LableNameList = new List<string>();
+            }
+            if (!string.IsNullOrWhiteSpace(oldLogisticsModel.GoodCourse))
+            {
+                oldLogisticsModel.GoodCourseList = JsonConvert.DeserializeObject<List<string>>(oldLogisticsModel.GoodCourse);
+            }
+            else
+            {
+                oldLogisticsModel.GoodCourseList = new List<string>();
+            }
             //获取老师的关注数
             //判断是否已经关注过
             var oldList = educationModule.GetFollowTeacherList(new RB_Education_FollowTeacher_Extend { TeacherId = query.ID, MallBaseId = query.MallBaseId, TenantId = query.TenantId });
@@ -473,6 +485,7 @@ namespace Mall.WebApi.Controllers.Education
                 oldLogisticsModel?.WorkYears,
                 oldLogisticsModel?.Major,
                 oldLogisticsModel?.LableNameList,
+                oldLogisticsModel.GoodCourseList,
                 oldLogisticsModel?.Name,
                 oldLogisticsModel?.TeacherLogo,
                 oldLogisticsModel?.Introduction,

Mall.WebApi/Controllers/Education/EducationController.cs

@@ -744,8 +744,8 @@ namespace Mall.WebApi.Controllers.Education
                 x.Nationality,
                 x.ForeignersUrl,
                 x.LableName,
-                LableNameList = string.IsNullOrWhiteSpace(x.LableName) ? new List<string>() : JsonConvert.DeserializeObject<List<string>>(x.LableName)
-
+                LableNameList = string.IsNullOrWhiteSpace(x.LableName) ? new List<string>() : JsonConvert.DeserializeObject<List<string>>(x.LableName),
+                GoodCourseList = string.IsNullOrWhiteSpace(x.GoodCourse) ? new List<string>() : JsonConvert.DeserializeObject<List<string>>(x.GoodCourse)
             });
             return ApiResult.Success("", pagelist);
         }
@@ -804,6 +804,10 @@ namespace Mall.WebApi.Controllers.Education
             {
                 oldLogisticsModel.LableNameList = JsonConvert.DeserializeObject<List<string>>(oldLogisticsModel.LableName);
             }
+            if (!string.IsNullOrWhiteSpace(oldLogisticsModel.GoodCourse))
+            {
+                oldLogisticsModel.GoodCourseList = JsonConvert.DeserializeObject<List<string>>(oldLogisticsModel.GoodCourse);
+            }
             return ApiResult.Success("", oldLogisticsModel);
         }
 
@@ -858,6 +862,10 @@ namespace Mall.WebApi.Controllers.Education
                 {
                     return ApiResult.Failed("请输入简介");
                 }
+                if (query.GoodCourseList==null||!query.GoodCourseList.Any())
+                {
+                    return ApiResult.Failed("请输入擅长课程");
+                }
                 if (query.ID == 0)
                 {
                     query.CreateDate = System.DateTime.Now;
@@ -871,6 +879,14 @@ namespace Mall.WebApi.Controllers.Education
                 {
                     query.LableName = "";
                 }
+                if (query.GoodCourseList != null && query.GoodCourseList.Any())
+                {
+                    query.GoodCourse = JsonConvert.SerializeObject(query.GoodCourseList);
+                }
+                else
+                {
+                    query.GoodCourse = "";
+                }
                 bool result = educationModule.AddOrUpdateTeacher(query);
                 if (result)
                 {

Mall.WebApi/Controllers/Mall/MallHelper.cs

@@ -1382,6 +1382,13 @@ namespace Mall.WebApi.Controllers
                             {
                                 pic_url = Common.Config.GetFileUrl(subitem.video_pic_url),
                                 url = subitem.video_url,
+                                bottom = "0",
+                                left = "0",
+                                right = "0",
+                                top = "0",
+                                isfullscreen = false,
+                                backgroundimage = "",
+                                radius="0"
                             }
                         });
                         templateData.data.Add(new