新增字段

Mall.Model/Entity/TradePavilion/RB_Commerce_News.cs

@@ -16,6 +16,11 @@ namespace Mall.Model.Entity.TradePavilion
         /// </summary>
         public int Id { get; set; }
 
+        /// <summary>
+        /// 类型(1-新闻，2-服务类型)
+        /// </summary>
+        public int Type { get; set; }
+
         /// <summary>
         /// 封面图
         /// </summary>

Mall.Module.TradePavilion/CommerceNewsModule.cs

@@ -30,17 +30,6 @@ namespace Mall.Module.TradePavilion
             return commerce_NewsRepository.GetCommerceNewsPageListRepository(pageIndex, pageSize, out rowsCount, query);
         }
 
-        /// <summary>
-        /// 获取新闻分页列表
-        /// </summary>
-        /// <param name="Top"></param>
-        /// <param name="query"></param>
-        /// <returns></returns>
-        public List<RB_Commerce_News_Extend> GetCommerceNewsTopListModule(int Top, RB_Commerce_News_Extend query)
-        {
-            return commerce_NewsRepository.GetCommerceNewsTopListRepository(Top, query);
-        }
-
         /// <summary>
         /// 新增修改新闻
         /// </summary>
@@ -54,6 +43,7 @@ namespace Mall.Module.TradePavilion
                 Dictionary<string, object> fileds = new Dictionary<string, object>()
                 {
                     { nameof(RB_Commerce_News_Extend.CoverImg),model.CoverImg},
+                    { nameof(RB_Commerce_News_Extend.Type),model.Type},
                     { nameof(RB_Commerce_News_Extend.Title),model.Title},
                     { nameof(RB_Commerce_News_Extend.Industry),model.Industry},
                     { nameof(RB_Commerce_News_Extend.PublishTime),model.PublishTime},

Mall.Repository/TradePavilion/RB_Commerce_NewsRepository.cs

@@ -47,46 +47,9 @@ WHERE 1=1
                 {
                     builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_Commerce_News_Extend.MallBaseId), query.MallBaseId);
                 }
-                if (!string.IsNullOrEmpty(query.Title))
+                if (query.Type > 0)
                 {
-                    builder.AppendFormat(" AND A.{0} LIKE @Name ", nameof(RB_Commerce_News_Extend.Title));
-                    parameters.Add("Name", "%" + query.Title.Trim() + "%");
-                }
-            }
-            builder.AppendFormat(" ORDER BY A.{0} DESC ", nameof(RB_Commerce_News_Extend.Id));
-            return GetPage<RB_Commerce_News_Extend>(pageIndex, pageSize, out rowsCount, builder.ToString(), parameters).ToList();
-        }
-
-
-        /// <summary>
-        /// 获取新闻分页列表
-        /// </summary>
-        /// <param name="Top"></param>
-        /// <param name="query"></param>
-        /// <returns></returns>
-        public List<RB_Commerce_News_Extend> GetCommerceNewsTopListRepository(int Top, RB_Commerce_News_Extend query)
-        {
-            DynamicParameters parameters = new DynamicParameters();
-            StringBuilder builder = new StringBuilder();
-            builder.AppendFormat(@"
-SELECT A.*
-FROM rb_commerce_news AS A
-WHERE 1=1
-");
-            builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_Commerce_News_Extend.Status), (int)DateStateEnum.Normal);
-            if (query == null)
-            {
-                return new List<RB_Commerce_News_Extend>();
-            }
-            else
-            {
-                if (query.TenantId > 0)
-                {
-                    builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_Commerce_News_Extend.TenantId), query.TenantId);
-                }
-                if (query.MallBaseId > 0)
-                {
-                    builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_Commerce_News_Extend.MallBaseId), query.MallBaseId);
+                    builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_Commerce_News_Extend.Type), query.Type);
                 }
                 if (!string.IsNullOrEmpty(query.Title))
                 {
@@ -94,12 +57,8 @@ WHERE 1=1
                     parameters.Add("Name", "%" + query.Title.Trim() + "%");
                 }
             }
-            builder.AppendFormat(" ORDER BY A.{0} DESC ", nameof(RB_Commerce_News_Extend.PublishTime));
-            if (Top > 0)
-            {
-                builder.AppendFormat(" LIMIT {0} ", Top);
-            }
-            return Get<RB_Commerce_News_Extend>(builder.ToString(), parameters).ToList();
+            builder.AppendFormat(" ORDER BY A.{0} DESC ", nameof(RB_Commerce_News_Extend.Id));
+            return GetPage<RB_Commerce_News_Extend>(pageIndex, pageSize, out rowsCount, builder.ToString(), parameters).ToList();
         }
     }
 }

Mall.WebApi/Controllers/TradePavilion/AppletTradeController.cs

@@ -137,7 +137,8 @@ namespace Mall.WebApi.Controllers.TradePavilion
             JObject parms = JObject.Parse(RequestParm.msg.ToString());
             var query = new RB_Commerce_News_Extend()
             {
-                Title = parms.GetStringValue("Title")
+                Title = parms.GetStringValue("Title"),
+                Type=parms.GetInt("Type")
             };
             var userInfo = AppletUserInfo;
             query.MallBaseId = RequestParm.MallBaseId;

Mall.WebApi/Controllers/TradePavilion/TradeController.cs

@@ -530,7 +530,8 @@ namespace Mall.WebApi.Controllers.TradePavilion
             JObject parms = JObject.Parse(RequestParm.msg.ToString());
             var query = new RB_Commerce_News_Extend()
             {
-                Title = parms.GetStringValue("Title")
+                Title = parms.GetStringValue("Title"),
+                Type=parms.GetInt("Type"),
             };
             query.MallBaseId = RequestParm.MallBaseId;
             query.TenantId = RequestParm.TenantId;
@@ -581,6 +582,7 @@ namespace Mall.WebApi.Controllers.TradePavilion
                 Industry = jObj.GetStringValue("Industry"),
                 PublishTime = jObj.GetDateTime("PublishTime"),
                 NewsInfo = jObj.GetStringValue("NewsInfo"),
+                Type=jObj.GetInt("Type"),
             };
             extModel.Status = Common.Enum.DateStateEnum.Normal;
             extModel.MallBaseId = RequestParm.MallBaseId;