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

Mall.Model/Extend/MarketingCenter/RB_Miniprogram_Template_Extend.cs

@@ -2368,6 +2368,12 @@ namespace Mall.Model.Extend.MarketingCenter
 
         public string lableName { get; set; }
 
+        /// <summary>
+        /// 副标题
+        /// </summary>
+
+        public List<string> lableNameList { get; set; }
+
         /// <summary>
         /// 商品图片
         /// </summary>

Mall.WebApi/Controllers/Education/AppletSchoolController.cs

@@ -13,6 +13,7 @@ using Mall.Model.Extend.User;
 using System.Collections.Generic;
 using Newtonsoft.Json.Linq;
 using Mall.Common.Plugin;
+using Google.Protobuf.WellKnownTypes;
 
 namespace Mall.WebApi.Controllers.Education
 {
@@ -448,6 +449,42 @@ namespace Mall.WebApi.Controllers.Education
             return ApiResult.Success("", new { teacherResult, goodsResult });
         }
 
+
+
+        /// <summary>
+        /// 小程序分页列表(赞羊)
+        /// </summary>
+        /// <returns></returns>
+        [HttpPost]
+        public ApiResult GetTeacherGoodsList(object requestMsg)
+        {
+            var parms = JsonConvert.DeserializeObject<RequestParm>(requestMsg.ToString());
+            if (parms.MallBaseId <= 0)
+            {
+                return ApiResult.ParamIsNull();
+            }
+            ResultPageModel pagelist = JsonConvert.DeserializeObject<ResultPageModel>(parms.msg.ToString());
+            RB_Goods_Extend demodel = JsonConvert.DeserializeObject<RB_Goods_Extend>(parms.msg.ToString());
+
+            demodel.TenantId = parms.TenantId;
+            demodel.MallBaseId = parms.MallBaseId;
+            if (demodel.TeacherId <= 0)
+            {
+                return ApiResult.Failed("老师编号不能为0");
+            }
+            var list = educationModule.GetListByTeacherId(pagelist.pageIndex, pagelist.pageSize, out long count, demodel);
+            pagelist.count = Convert.ToInt32(count);
+            pagelist.pageData = list.Select(x => new
+            {
+                x.CoverImage,
+                x.Name,
+                x.CourseNum,
+                x.Id
+            });
+            return ApiResult.Success("", pagelist);
+        }
+
+
         #endregion
     }
 }
\ No newline at end of file

Mall.WebApi/Controllers/Mall/MallHelper.cs

@@ -781,6 +781,10 @@ namespace Mall.WebApi.Controllers
                                         lastItem.name = tempGood.Name;
                                         lastItem.lableName = tempGood.LableName;
                                         lastItem.picUrl = tempGood.ArticlePic;
+                                        if (!string.IsNullOrWhiteSpace(lastItem.lableName))
+                                        {
+                                            lastItem.lableNameList = JsonConvert.DeserializeObject<List<string>>(lastItem.lableName);
+                                        }
                                         newGoodsList.Add(lastItem);
                                     }
                                 }
@@ -796,7 +800,7 @@ namespace Mall.WebApi.Controllers
                                 TenantId = TenantId,
                                 MallBaseId = MallBaseId,
                                 ArticleStatus = 1,
-                                OrderBy=1
+                                OrderBy = 1
                             });
                             if (articleList != null && articleList.Count > 0)
                             {
@@ -807,8 +811,10 @@ namespace Mall.WebApi.Controllers
                                         id = gItem.ID,
                                         name = gItem.Name,
                                         lableName = gItem.LableName,
-                                        picUrl = gItem.ArticlePic
-                                });
+                                        picUrl = gItem.ArticlePic,
+                                        lableNameList = string.IsNullOrWhiteSpace(gItem.LableName) ? new List<string>() : JsonConvert.DeserializeObject<List<string>>(gItem.LableName)
+                                    }); ;
+
                                 }
                             }
                         }
@@ -1997,7 +2003,7 @@ namespace Mall.WebApi.Controllers
                     resultMallShopStyle = new ResultMallShopStyle() { main = "#ff4544", secondary = "#ffdada", IsEducation = 0 };
                     break;
                 case MallShopStyleEnum.Education:
-                    resultMallShopStyle = new ResultMallShopStyle() { main = "#00d6a6", secondary = "#ffc86d",IsEducation=1 };
+                    resultMallShopStyle = new ResultMallShopStyle() { main = "#00d6a6", secondary = "#ffc86d", IsEducation = 1 };
                     break;
             }
             mallStyle = new
@@ -2285,7 +2291,7 @@ namespace Mall.WebApi.Controllers
         /// <summary>
         /// 0-商品，1-是
         /// </summary>
-        public int IsEducation{ get; set; }
+        public int IsEducation { get; set; }
 
 
     }