收藏实体

Mall.Model/Entity/TradePavilion/RB_Collect.cs

+using System;
+using System.Collections.Generic;
+using System.Text;
+using Mall.Common.Enum;
+using Mall.Common.Enum.TradePavilion;
+using VT.FW.DB;
+
+namespace Mall.Model.Entity.TradePavilion
+{
+    /// <summary>
+    /// 收藏实体表
+    /// </summary>
+    [Serializable]
+    [DB(ConnectionName = "DefaultConnection")]
+    public class RB_Collect
+    {
+        /// <summary>
+        /// 编号
+        /// </summary>
+        public int Id { get; set; }
+
+        /// <summary>
+        /// 类型  1载体  2品牌
+        /// </summary>
+        public int Type { get; set; }
+
+        /// <summary>
+        /// 用户id
+        /// </summary>
+        public int UserId { get; set; }
+
+        /// <summary>
+        /// 来源id
+        /// </summary>
+        public int SourceId { get; set; }
+
+        /// <summary>
+        /// 商户号id
+        /// </summary>
+        public int TenantId { get; set; }
+
+        /// <summary>
+        /// 小程序id
+        /// </summary>
+        public int MallBaseId { get; set; }
+
+        /// <summary>
+        /// 创建时间
+        /// </summary>
+        public DateTime CreateDate { get; set; }
+
+        /// <summary>
+        /// 删除状态
+        /// </summary>
+        public DateStateEnum Status { get; set; }
+    }
+}

Mall.Model/Extend/TradePavilion/RB_Carrier_Extend.cs

@@ -41,10 +41,5 @@ namespace Mall.Model.Extend.TradePavilion
         /// 站点名称
         /// </summary>
         public string MetroName { get; set; }
-
-        /// <summary>
-        /// 项目类型名称
-        /// </summary>
-        public string ProjectTypeName { get { return this.ProjectType != null ? this.ProjectType.GetEnumName() : ""; } }
     }
 }

Mall.Model/Extend/TradePavilion/RB_Collect_Extend.cs

+using System;
+using System.Collections.Generic;
+using System.Text;
+using Mall.Common.Plugin;
+using Mall.Model.Entity.TradePavilion;
+
+namespace Mall.Model.Extend.TradePavilion
+{
+    public class RB_Collect_Extend : RB_Collect
+    {
+        
+    }
+}

Mall.Repository/TradePavilion/RB_CollectRepository.cs

+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using Mall.Model.Entity.TradePavilion;
+using Mall.Model.Extend.TradePavilion;
+
+namespace Mall.Repository.TradePavilion
+{
+    /// <summary>
+    /// 收藏仓储层
+    /// </summary>
+    public class RB_CollectRepository : BaseRepository<RB_Collect>
+    {
+        /// <summary>
+        /// 表名称
+        /// </summary>
+        public string TableName { get { return nameof(RB_Collect); } }
+
+        /// <summary>
+        /// 分页列表
+        /// </summary>
+        /// <param name="pageIndex">页码</param>
+        /// <param name="pageSize">每页显示条数</param>
+        /// <param name="rowCount">总条数</param>
+        /// <param name="query">查询条件</param>
+        /// <returns></returns>
+        public List<RB_Collect_Extend> GetPageList(int pageIndex, int pageSize, out long rowCount, RB_Collect_Extend query)
+        {
+            StringBuilder builder = new StringBuilder();
+            builder.Append($" SELECT * FROM {TableName} WHERE {nameof(RB_Collect_Extend.Status)}=0 ");
+            if (query != null)
+            {
+
+                if (query.TenantId > 0)
+                {
+                    builder.Append($" AND {nameof(RB_Collect_Extend.TenantId)}={query.TenantId}");
+                }
+                if (query.MallBaseId > 0)
+                {
+                    builder.Append($" AND {nameof(RB_Collect_Extend.MallBaseId)}={query.MallBaseId}");
+                }
+                if (query.Type > 0)
+                {
+                    builder.Append($" AND {nameof(RB_Collect_Extend.Type)}={query.Type}");
+                }
+                if (query.UserId > 0)
+                {
+                    builder.Append($" AND {nameof(RB_Collect_Extend.UserId)}={query.UserId}");
+                }
+                if (query.SourceId > 0)
+                {
+                    builder.Append($" AND {nameof(RB_Collect_Extend.SourceId)}={query.SourceId}");
+                }
+            }
+            builder.Append($" order by Id desc");
+            return GetPage<RB_Collect_Extend>(pageIndex, pageSize, out rowCount, builder.ToString()).ToList();
+        }
+
+        /// <summary>
+        /// 收藏列表
+        /// </summary>
+        /// <param name="query">查询条件</param>
+        /// <returns></returns>
+        public List<RB_Collect_Extend> GetList(RB_Collect_Extend query)
+        {
+            StringBuilder builder = new StringBuilder();
+            builder.Append($" SELECT * FROM {TableName} WHERE {nameof(RB_Collect_Extend.Status)}=0 ");
+            if (query != null)
+            {
+
+                if (query.TenantId > 0)
+                {
+                    builder.Append($" AND {nameof(RB_Collect_Extend.TenantId)}={query.TenantId}");
+                }
+                if (query.MallBaseId > 0)
+                {
+                    builder.Append($" AND {nameof(RB_Collect_Extend.MallBaseId)}={query.MallBaseId}");
+                }
+                if (query.Type > 0)
+                {
+                    builder.Append($" AND {nameof(RB_Collect_Extend.Type)}={query.Type}");
+                }
+                if (query.UserId > 0)
+                {
+                    builder.Append($" AND {nameof(RB_Collect_Extend.UserId)}={query.UserId}");
+                }
+                if (query.SourceId > 0)
+                {
+                    builder.Append($" AND {nameof(RB_Collect_Extend.SourceId)}={query.SourceId}");
+                }
+            }
+            builder.Append($" order by Id desc");
+            return Get<RB_Collect_Extend>(builder.ToString()).ToList();
+        }
+    }
+}

Mall.WebApi/Controllers/TradePavilion/AppletTradeController.cs

@@ -580,7 +580,28 @@ namespace Mall.WebApi.Controllers.TradePavilion
 
             var list = carrierModule.GetCarrierPageList(pageModel.pageIndex, pageModel.pageSize, out long count, query);
             pageModel.count = Convert.ToInt32(count);
-            pageModel.pageData = list;
+            pageModel.pageData = list.Select(x => new
+            {
+                x.ID,
+                x.CarrierName,
+                x.Logo,
+                CreateDate = x.CreateDate.ToString("yyyy-MM-dd HH:mm"),
+                x.Address,
+                x.LatAndLon,
+                x.Developers,
+                OpenTime = x.OpenTime.HasValue ? x.OpenTime.Value.ToString("yyyy-MM-dd HH:mm") : "",
+                x.ProjectType,
+                ProjectTypeName = x.ProjectType.GetEnumName(),
+                x.CarrierSize,
+                x.LayersNum,
+                x.CarNum,
+                x.CarrierPlan,
+                x.CarrierTarget,
+                x.Location,
+                x.Crowd,
+                x.VideoUrl,
+                x.CarrierMetroList
+            });
             return ApiResult.Success(data: pageModel);
         }
 
@@ -601,7 +622,29 @@ namespace Mall.WebApi.Controllers.TradePavilion
             query.MallBaseId = RequestParm.MallBaseId;
             query.TenantId = userInfo?.TenantId ?? 0;
             var extModel = carrierModule.GetCarrierModel(query);
-            return ApiResult.Success(data: extModel);
+            return ApiResult.Success(data: new
+            {
+                extModel.ID,
+                extModel.CarrierName,
+                extModel.Logo,
+                CreateDate = extModel.CreateDate.ToString("yyyy-MM-dd HH:mm"),
+                extModel.Address,
+                extModel.LatAndLon,
+                extModel.Developers,
+                OpenTime = extModel.OpenTime.HasValue ? extModel.OpenTime.Value.ToString("yyyy-MM-dd HH:mm") : "",
+                extModel.ProjectType,
+                ProjectTypeName = extModel.ProjectType.GetEnumName(),
+                extModel.CarrierSize,
+                extModel.LayersNum,
+                extModel.CarNum,
+                extModel.CarrierPlan,
+                extModel.CarrierTarget,
+                extModel.Location,
+                extModel.Crowd,
+                extModel.VideoUrl,
+                extModel.CarrierMetroList,
+                extModel.BannerList
+            });
         }
 
         #endregion