提交代码

Mall.Model/Entity/TradePavilion/RB_Commerce_ActivityType.cs

@@ -62,5 +62,11 @@ namespace Mall.Model.Entity.TradePavilion
         /// 删除状态
         /// </summary>
         public DateStateEnum Status { get; set; }
+
+
+        /// <summary>
+        /// 标签
+        /// </summary>
+        public string LableName { get; set; }
     }
 }

Mall.Model/Extend/MarketingCenter/RB_Miniprogram_Template_Extend.cs

@@ -3165,4 +3165,74 @@ namespace Mall.Model.Extend.MarketingCenter
         public List<string> AlbumList { get; set; }
     }
     #endregion
+
+    #region 星球大事件分类
+
+    /// <summary>
+    ///教育模块-资讯列表
+    /// </summary>
+    public class MiAiActivityTypeItem
+    {
+
+
+        /// <summary>
+        /// 商品数量
+        /// </summary>
+        public int goodsLength { get; set; }
+
+        /// <summary>
+        /// 商品添加方式【0-自定义,1-最新】
+        /// </summary>
+        public int addGoodsType { get; set; }
+
+
+
+        /// <summary>
+        /// 列表样式[-1-列表模式,0-左右滑动,1-一行一个]
+        /// </summary>
+        public int listStyle { get; set; }
+
+
+        /// <summary>
+        /// 背景颜色
+        /// </summary>
+        public string backgroundColor { get; set; }
+
+        /// <summary>
+        /// 上边距
+        /// </summary>
+        public string PaddingTop { get; set; }
+
+        /// <summary>
+        /// 下边距
+        /// </summary>
+        public string PaddingBottom { get; set; }
+
+        /// <summary>
+        /// 左边距
+        /// </summary>
+        public string PaddingLeft { get; set; }
+
+        /// <summary>
+        /// 右边距
+        /// </summary>
+        public string PaddingRight { get; set; }
+
+
+        /// <summary>
+        /// 搜索圆角像素
+        /// </summary>        
+        public int SearchFilletPX
+        {
+            get;
+            set;
+        }
+
+        /// <summary>
+        /// 自定义列表
+        /// </summary>
+        public List<CustomDetailsItem2> list { get; set; }
+    }
+
+    #endregion
 }
\ No newline at end of file

Mall.Model/Extend/TradePavilion/RB_Commerce_ActivityType_Extend.cs

@@ -8,8 +8,8 @@ namespace Mall.Model.Extend.TradePavilion
     /// <summary>
     /// 商会活动类型表扩展实体类
     /// </summary>
-    public class RB_Commerce_ActivityType_Extend: RB_Commerce_ActivityType
+    public class RB_Commerce_ActivityType_Extend : RB_Commerce_ActivityType
     {
-
+        public List<string> LableNameList { get; set; }
     }
 }
\ No newline at end of file

Mall.Module.TradePavilion/CommerceActivityModule.cs

@@ -225,7 +225,8 @@ namespace Mall.Module.TradePavilion
                     {nameof(RB_Commerce_ActivityType_Extend.TypeName),model.TypeName },
                     {nameof(RB_Commerce_ActivityType_Extend.CoverImage),model.CoverImage },
                     {nameof(RB_Commerce_ActivityType_Extend.UpdateBy),model.UpdateBy },
-                    {nameof(RB_Commerce_ActivityType_Extend.UpdateDate),model.UpdateDate }
+                    {nameof(RB_Commerce_ActivityType_Extend.UpdateDate),model.UpdateDate },
+                     {nameof(RB_Commerce_ActivityType_Extend.LableName),model.LableName }
                 };
                 flag = activityTypeRepository.Update(fileds, new WhereHelper(nameof(RB_Commerce_ActivityType_Extend.Id), model.Id));
             }

Mall.WebApi/Controllers/Education/AppletSchoolController.cs

@@ -626,5 +626,34 @@ namespace Mall.WebApi.Controllers.Education
         #endregion
 
 
+        #region  相亲朋友圈
+
+
+        /// <summary>
+        /// 老师动态列表
+        /// </summary>
+        /// <param name="request"></param>
+        /// <returns></returns>
+        [HttpPost]
+        public ApiResult GetMiAiDynamicList(object requestMsg)
+        {
+            var parms = JsonConvert.DeserializeObject<RequestParm>(requestMsg.ToString());
+            ResultPageModel pagelist = JsonConvert.DeserializeObject<ResultPageModel>(parms.msg.ToString());
+            Rb_Education_Dynamic_Extend demodel = JsonConvert.DeserializeObject<Rb_Education_Dynamic_Extend>(parms.msg.ToString());
+            demodel.TenantId = parms.TenantId;
+            demodel.MallBaseId = parms.MallBaseId;
+            List<Rb_Education_Dynamic_Extend> myArticleList = dynamicModule.MiAiDynamicList(pagelist.pageIndex, pagelist.pageSize, out long count, demodel);
+            List<object> list = new List<object>();
+            foreach (var item in myArticleList)
+            {
+                list.Add(DecoratorDynameicResult(item));
+            }
+            pagelist.count = Convert.ToInt32(count);
+            pagelist.pageData = list;
+            return ApiResult.Success("", pagelist);
+        }
+        #endregion
+
+
     }
 }
\ No newline at end of file

Mall.WebApi/Controllers/TradePavilion/AppletTradeController.cs

@@ -332,7 +332,7 @@ namespace Mall.WebApi.Controllers.TradePavilion
             query.MallBaseId = RequestParm.MallBaseId;
             query.TenantId = userInfo?.TenantId ?? 0;
             var list = activityModule.GetCommerceActivityTypeListModule(query);
-            return ApiResult.Success(data: list.Select(qitem => new { qitem.Id, qitem.CoverImage, qitem.TypeName }));
+            return ApiResult.Success(data: list.Select(qitem => new { qitem.Id, qitem.CoverImage, qitem.TypeName, LableNameList = string.IsNullOrWhiteSpace(qitem.LableName) ? new List<string>() : JsonConvert.DeserializeObject<List<string>>(qitem.LableName) })) ;
         }
 
         /// <summary>

Mall.WebApi/Controllers/TradePavilion/TradeController.cs

 using System;
 using System.Collections.Generic;
+using System.Linq;
 using Mall.CacheManager.User;
 using Mall.Common.API;
 using Mall.Common.Plugin;
@@ -401,6 +402,7 @@ namespace Mall.WebApi.Controllers.TradePavilion
             query.MallBaseId = RequestParm.MallBaseId;
             query.TenantId = RequestParm.TenantId;
             var list = activityModule.GetCommerceActivityTypePageListModule(pageModel.pageIndex, pageModel.pageSize, out long rowsCount, query);
+            list.ForEach(x=>x.LableNameList = string.IsNullOrWhiteSpace(x.LableName) ? new List<string>() : JsonConvert.DeserializeObject<List<string>>(x.LableName) );
             pageModel.count = Convert.ToInt32(rowsCount);
             pageModel.pageData = list;
             return ApiResult.Success(data: pageModel);
@@ -420,7 +422,7 @@ namespace Mall.WebApi.Controllers.TradePavilion
             query.MallBaseId = RequestParm.MallBaseId;
             query.TenantId = RequestParm.TenantId;
             var list = activityModule.GetCommerceActivityTypeListModule(query);
-            
+            list.ForEach(x => x.LableNameList = string.IsNullOrWhiteSpace(x.LableName) ? new List<string>() : JsonConvert.DeserializeObject<List<string>>(x.LableName));
             return ApiResult.Success(data: list);
         }
 
@@ -445,6 +447,13 @@ namespace Mall.WebApi.Controllers.TradePavilion
             extModel.CreateDate = DateTime.Now;
             extModel.UpdateBy = Uid;
             extModel.UpdateDate = DateTime.Now;
+            if (extModel.LableNameList != null && extModel.LableNameList.Any())
+            {
+                extModel.LableName = JsonConvert.SerializeObject(extModel.LableNameList);
+            }
+            else {
+                extModel.LableName = "";
+            }
             var flag = activityModule.SetCommerceActivityTypeModule(extModel);
             return flag ? ApiResult.Success() : ApiResult.Failed();
         }
@@ -458,6 +467,7 @@ namespace Mall.WebApi.Controllers.TradePavilion
             JObject parms = JObject.Parse(RequestParm.msg.ToString());
             var Id = parms.GetInt("Id", 0);
             var extModel = activityModule.GetCommerceActivityTypeModule(Id);
+            extModel.LableNameList = string.IsNullOrWhiteSpace(extModel.LableName) ? new List<string>() : JsonConvert.DeserializeObject<List<string>>(extModel.LableName);
             return ApiResult.Success(data: extModel);
         }