提交代码

Mall.Model/Entity/TradePavilion/RB_Brand.cs

@@ -8,7 +8,7 @@ using VT.FW.DB;
 namespace Mall.Model.Entity.TradePavilion
 {
     /// <summary>
-    /// 载体实体表
+    /// 品牌实体表
     /// </summary>
     [Serializable]
     [DB(ConnectionName = "DefaultConnection")]
@@ -54,12 +54,6 @@ namespace Mall.Model.Entity.TradePavilion
         public DateStateEnum Status { get; set; }
 
 
-        /// <summary>
-        /// 载体名称
-        /// </summary>
-        public string CarrierName { get; set; }
-
-
         /// <summary>
         /// logo
         /// </summary>
@@ -67,94 +61,133 @@ namespace Mall.Model.Entity.TradePavilion
 
 
         /// <summary>
-        /// 载体介绍图
+        /// 品牌介绍图
         /// </summary>
         public string Banner { get; set; }
 
         /// <summary>
-        /// 载体视频
+        /// 品牌视频
         /// </summary>
         public string VideoUrl { get; set; }
-
         /// <summary>
-        /// 省
+        /// 品牌全名
         /// </summary>
-        public int Province { get; set; }
+        public string FullBrandName { get; set; }
+
 
         /// <summary>
-        /// 市
+        /// 品牌名称
         /// </summary>
-        public int City { get; set; }
+        public string BrandName { get; set; }
 
+        /// <summary>
+        /// 店铺数量
+        /// </summary>
+        public int ShopNum { get; set; }
 
         /// <summary>
-        /// 区
+        /// 建筑面积
         /// </summary>
-        public int Area { get; set; }
+        public decimal BuiltUpArea { get; set; }
 
         /// <summary>
-        /// 载体地址
+        /// 建筑面积
         /// </summary>
-        public string Address { get; set; }
+        public decimal EndBuiltUpArea { get; set; }
+
 
         /// <summary>
-        /// 载体地址经纬度
+        /// 品牌定位
         /// </summary>
-        public string LatAndLon { get; set; }
+        public string BrandType { get; set; }
 
         /// <summary>
-        /// 开发商
+        /// 客户群体
         /// </summary>
-        public string Developers { get; set; }
+        public string CustomerType { get; set; }
+
+
+
 
         /// <summary>
-        /// 开业时间
+        /// 扩店区域
         /// </summary>
-        public DateTime? OpenTime { get; set; }
+        public string StoreExpansion { get; set; }
 
         /// <summary>
-        /// 项目类型
+        /// 性质
         /// </summary>
         public ProjectTypeEnum? ProjectType { get; set; }
 
         /// <summary>
-        /// 商业体量（单位：万平方米）
+        /// 面积要求
         /// </summary>
-        public decimal CarrierSize { get; set; }
+        public decimal AreaRequirement { get; set; }
 
         /// <summary>
-        /// 商业层数
+        /// 面积要求
         /// </summary>
-        public string LayersNum { get; set; }
+        public decimal EndAreaRequirement { get; set; }
+
 
         /// <summary>
-        /// 车位数量
+        /// 广告
         /// </summary>
-        public int CarNum { get; set; }
+        public string Advertising { get; set; }
+
+        /// <summary>
+        /// 其他
+        /// </summary>
+        public string Other { get; set; }
 
 
         /// <summary>
-        /// 业态规划
+        /// 店铺开口尺寸
         /// </summary>
-        public string CarrierPlan { get; set; }
+        public string ShopSize { get; set; }
 
         /// <summary>
-        /// 招引目标
+        /// 上下水（0-否1-有）
         /// </summary>
-        public string CarrierTarget { get; set; }
+        public int Plumbing { get; set; }
 
+        /// <summary>
+        /// 管径（0-否1-有）
+        /// </summary>
+        public int Caliber { get; set; }
+        /// <summary>
+        /// 排污（0-否1-有）
+        /// </summary>
+        public int Sewage { get; set; }
+
+        /// <summary>
+        /// 燃气（0-否1-有）
+        /// </summary>
+        public int RanQi { get; set; }
 
         /// <summary>
-        /// 定位
+        /// 电量
         /// </summary>
-        public string Location { get; set; }
+        public string DianLiang { get; set; }
 
+        /// <summary>
+        /// 排烟量（0-否1-有）
+        /// </summary>
+        public int PaiYan { get; set; }
 
         /// <summary>
-        /// 目标人群
+        /// 空调（0-否1-有）
         /// </summary>
-        public string Crowd { get; set; }
+        public int KongTiao { get; set; }
 
+        /// <summary>
+        /// 新风（0-否1-有）
+        /// </summary>
+        public int XinFeng { get; set; }
 
+        /// <summary>
+        /// 品牌分类Id
+        /// </summary>
+        public int BrandClassId { get; set; }
     }
 }

Mall.Model/Entity/TradePavilion/RB_BrandClass.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_BrandClass
+    {
+        /// <summary>
+        /// 编号
+        /// </summary>
+        public int ID { 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 DateTime UpdateDate { get; set; }
+
+        /// <summary>
+        /// 删除状态
+        /// </summary>
+        public DateStateEnum Status { get; set; }
+
+
+        /// <summary>
+        /// logo
+        /// </summary>
+        public string Logo { get; set; }
+
+
+        /// <summary>
+        /// 分类名称
+        /// </summary>
+        public string ClassName { get; set; }
+
+     
+    }
+}

Mall.Model/Entity/TradePavilion/RB_CompanyBrand.cs

@@ -21,6 +21,10 @@ namespace Mall.Model.Entity.TradePavilion
         /// </summary>
         public int CompanyId { get; set; }
 
+        /// <summary>
+        /// 品牌全名
+        /// </summary>
+        public string FullBrandName { get; set; }
 
         /// <summary>
         /// 品牌名称
@@ -43,10 +47,6 @@ namespace Mall.Model.Entity.TradePavilion
         public decimal EndBuiltUpArea { get; set; }
 
 
-        /// <summary>
-        /// 品牌定位
-        /// </summary>
-        public string FullBrandName { get; set; }
 
         /// <summary>
         /// 客户群体

Mall.Model/Extend/TradePavilion/RB_BrandClass_Extend.cs

+using System;
+using System.Collections.Generic;
+using System.Text;
+using Mall.Model.Entity.TradePavilion;
+
+namespace Mall.Model.Extend.TradePavilion
+{
+  public  class RB_BrandClass_Extend: RB_BrandClass
+    {
+
+    }
+}

Mall.Model/Extend/TradePavilion/RB_Brand_Extend.cs

+using System;
+using System.Collections.Generic;
+using System.Text;
+using Mall.Model.Entity.TradePavilion;
+
+namespace Mall.Model.Extend.TradePavilion
+{
+    public class RB_Brand_Extend : RB_Brand
+    {
+        /// <summary>
+        /// 分类名称
+        /// </summary>
+        public string ClassName { get; set; }
+
+
+        public List<string> BannerList { get; set; }
+    }
+}

Mall.Module.TradePavilion/CompanyModule.cs

@@ -12,7 +12,7 @@ namespace Mall.Module.TradePavilion
     public class CompanyModule
     {
         private readonly RB_CompanyRepository companyRepository = new RB_CompanyRepository();
-        private readonly RB_BrandRepository brandRepository = new RB_BrandRepository();
+        private readonly RB_CompanyBrandRepository brandRepository = new RB_CompanyBrandRepository();
 
         /// <summary>
         /// 获取公司信息分页列表

Mall.Repository/TradePavilion/RB_BrandClassRepository.cs

+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using Mall.Common.Enum;
+using Mall.Model.Entity.TradePavilion;
+using Mall.Model.Extend.TradePavilion;
+using VT.FW.DB.Dapper;
+
+namespace Mall.Repository.TradePavilion
+{
+   public class RB_BrandClassRepository:BaseRepository<RB_BrandClass>
+    {
+        /// <summary>
+        /// 获取品牌信息分页列表
+        /// </summary>
+        /// <param name="pageIndex"></param>
+        /// <param name="pageSize"></param>
+        /// <param name="rowsCount"></param>
+        /// <param name="query"></param>
+        /// <returns></returns>
+        public List<RB_BrandClass_Extend> GetBrandClassPageListRepository(int pageIndex, int pageSize, out long rowsCount, RB_BrandClass_Extend query)
+        {
+            rowsCount = 0;
+            DynamicParameters parameters = new DynamicParameters();
+            StringBuilder builder = new StringBuilder();
+            builder.AppendFormat(@"
+SELECT * 
+FROM RB_BrandClass
+WHERE 1=1
+");
+            builder.AppendFormat(" AND {0}={1} ", nameof(RB_BrandClass_Extend.Status), (int)DateStateEnum.Normal);
+            if (query == null)
+            {
+                return new List<RB_BrandClass_Extend>();
+            }
+            else
+            {
+                if (query.TenantId > 0)
+                {
+                    builder.AppendFormat(" AND {0}={1} ", nameof(RB_BrandClass_Extend.TenantId), query.TenantId);
+                }
+                if (query.MallBaseId > 0)
+                {
+                    builder.AppendFormat(" AND {0}={1} ", nameof(RB_BrandClass_Extend.MallBaseId), query.MallBaseId);
+                }
+                if (!string.IsNullOrEmpty(query.ClassName))
+                {
+                    builder.AppendFormat(" AND {0} LIKE @Name ", nameof(RB_BrandClass_Extend.ClassName));
+                    parameters.Add("Name", "%" + query.ClassName.Trim() + "%");
+                }
+            }
+            return GetPage<RB_BrandClass_Extend>(pageIndex, pageSize, out rowsCount, builder.ToString(), parameters).ToList();
+        }
+
+        /// <summary>
+        /// 根据查询条件获取品牌信息实体
+        /// </summary>
+        /// <param name="query"></param>
+        /// <returns></returns>
+        public RB_BrandClass_Extend GetBrandClassRepository(RB_BrandClass_Extend query)
+        {
+            DynamicParameters parameters = new DynamicParameters();
+            StringBuilder builder = new StringBuilder();
+            builder.AppendFormat(@"
+SELECT * 
+FROM RB_BrandClass
+WHERE 1=1
+");
+            builder.AppendFormat(" AND {0}={1} ", nameof(RB_BrandClass_Extend.Status), (int)DateStateEnum.Normal);
+            if (query == null)
+            {
+                return new RB_BrandClass_Extend();
+            }
+            else
+            {
+                if (query.TenantId > 0)
+                {
+                    builder.AppendFormat(" AND {0}={1} ", nameof(RB_BrandClass_Extend.TenantId), query.TenantId);
+                }
+                if (query.MallBaseId > 0)
+                {
+                    builder.AppendFormat(" AND {0}={1} ", nameof(RB_BrandClass_Extend.MallBaseId), query.MallBaseId);
+                }
+                if (!string.IsNullOrEmpty(query.ClassName))
+                {
+                    builder.AppendFormat(" AND {0} LIKE @Name ", nameof(RB_BrandClass_Extend.ClassName));
+                    parameters.Add("Name", "%" + query.ClassName.Trim() + "%");
+                }
+                if (query.ID > 0)
+                {
+                    builder.AppendFormat(" AND {0}={1} ", nameof(RB_BrandClass_Extend.ID), query.ID);
+                }
+               
+            }
+            return Get<RB_BrandClass_Extend>(builder.ToString(), parameters).FirstOrDefault();
+        }
+
+
+        /// <summary>
+        /// 根据查询条件获取品牌信息
+        /// </summary>
+        /// <param name="query"></param>
+        /// <returns></returns>
+        public List<RB_BrandClass_Extend> GetBrandClassList(RB_BrandClass_Extend query)
+        {
+            DynamicParameters parameters = new DynamicParameters();
+            StringBuilder builder = new StringBuilder();
+            builder.AppendFormat(@"
+SELECT * 
+FROM RB_BrandClass
+WHERE 1=1
+");
+            builder.AppendFormat(" AND {0}={1} ", nameof(RB_BrandClass_Extend.Status), (int)DateStateEnum.Normal);
+            if (query == null)
+            {
+                return new List<RB_BrandClass_Extend>();
+            }
+            else
+            {
+                if (query.TenantId > 0)
+                {
+                    builder.AppendFormat(" AND {0}={1} ", nameof(RB_BrandClass_Extend.TenantId), query.TenantId);
+                }
+                if (query.MallBaseId > 0)
+                {
+                    builder.AppendFormat(" AND {0}={1} ", nameof(RB_BrandClass_Extend.MallBaseId), query.MallBaseId);
+                }
+                if (!string.IsNullOrEmpty(query.ClassName))
+                {
+                    builder.AppendFormat(" AND {0} LIKE @Name ", nameof(RB_BrandClass_Extend.ClassName));
+                    parameters.Add("Name", "%" + query.ClassName.Trim() + "%");
+                }
+                if (query.ID > 0)
+                {
+                    builder.AppendFormat(" AND {0}={1} ", nameof(RB_BrandClass_Extend.ID), query.ID);
+                }
+            }
+            return Get<RB_BrandClass_Extend>(builder.ToString(), parameters).ToList();
+        }
+    }
+}

Mall.Repository/TradePavilion/RB_CompanyBrandRepository.cs

+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using Mall.Common.Enum;
+using Mall.Model.Entity.TradePavilion;
+using Mall.Model.Extend.TradePavilion;
+using VT.FW.DB.Dapper;
+
+namespace Mall.Repository.TradePavilion
+{
+    /// <summary>
+    /// 品牌信息仓储层
+    /// </summary>
+    public class RB_CompanyBrandRepository:BaseRepository<RB_CompanyBrand>
+    {
+        /// <summary>
+        /// 获取品牌信息分页列表
+        /// </summary>
+        /// <param name="pageIndex"></param>
+        /// <param name="pageSize"></param>
+        /// <param name="rowsCount"></param>
+        /// <param name="query"></param>
+        /// <returns></returns>
+        public List<RB_CompanyBrand_Extend> GetBrandPageListRepository(int pageIndex, int pageSize, out long rowsCount, RB_CompanyBrand_Extend query)
+        {
+            rowsCount = 0;
+            DynamicParameters parameters = new DynamicParameters();
+            StringBuilder builder = new StringBuilder();
+            builder.AppendFormat(@"
+SELECT * 
+FROM RB_CompanyBrand
+WHERE 1=1
+");
+            builder.AppendFormat(" AND {0}={1} ", nameof(RB_CompanyBrand_Extend.Status), (int)DateStateEnum.Normal);
+            if (query == null)
+            {
+                return new List<RB_CompanyBrand_Extend>();
+            }
+            else
+            {
+                if (query.TenantId > 0)
+                {
+                    builder.AppendFormat(" AND {0}={1} ", nameof(RB_CompanyBrand_Extend.TenantId), query.TenantId);
+                }
+                if (query.MallBaseId > 0)
+                {
+                    builder.AppendFormat(" AND {0}={1} ", nameof(RB_CompanyBrand_Extend.MallBaseId), query.MallBaseId);
+                }
+                if (!string.IsNullOrEmpty(query.BrandName))
+                {
+                    builder.AppendFormat(" AND {0} LIKE @Name ", nameof(RB_CompanyBrand_Extend.BrandName));
+                    parameters.Add("Name", "%" + query.BrandName.Trim() + "%");
+                }
+            }
+            return GetPage<RB_CompanyBrand_Extend>(pageIndex, pageSize, out rowsCount, builder.ToString(), parameters).ToList();
+        }
+
+        /// <summary>
+        /// 根据查询条件获取品牌信息实体
+        /// </summary>
+        /// <param name="query"></param>
+        /// <returns></returns>
+        public RB_CompanyBrand_Extend GetBrandRepository(RB_CompanyBrand_Extend query)
+        {
+            DynamicParameters parameters = new DynamicParameters();
+            StringBuilder builder = new StringBuilder();
+            builder.AppendFormat(@"
+SELECT * 
+FROM RB_CompanyBrand
+WHERE 1=1
+");
+            builder.AppendFormat(" AND {0}={1} ", nameof(RB_CompanyBrand_Extend.Status), (int)DateStateEnum.Normal);
+            if (query == null)
+            {
+                return new RB_CompanyBrand_Extend();
+            }
+            else
+            {
+                if (query.TenantId > 0)
+                {
+                    builder.AppendFormat(" AND {0}={1} ", nameof(RB_CompanyBrand_Extend.TenantId), query.TenantId);
+                }
+                if (query.MallBaseId > 0)
+                {
+                    builder.AppendFormat(" AND {0}={1} ", nameof(RB_CompanyBrand_Extend.MallBaseId), query.MallBaseId);
+                }
+                if (!string.IsNullOrEmpty(query.BrandName))
+                {
+                    builder.AppendFormat(" AND {0} LIKE @Name ", nameof(RB_CompanyBrand_Extend.BrandName));
+                    parameters.Add("Name", "%" + query.BrandName.Trim() + "%");
+                }
+                if (query.CompanyId > 0)
+                {
+                    builder.AppendFormat(" AND {0}={1} ", nameof(RB_CompanyBrand_Extend.CompanyId), query.CompanyId);
+                }
+                if (!string.IsNullOrWhiteSpace(query.CompanyIds))
+                {
+                    builder.AppendFormat(" AND {0} in({1})", nameof(RB_CompanyBrand_Extend.CompanyId), query.CompanyIds);
+                }
+            }
+            return Get<RB_CompanyBrand_Extend>(builder.ToString(), parameters).FirstOrDefault();
+        }
+
+
+        /// <summary>
+        /// 根据查询条件获取品牌信息
+        /// </summary>
+        /// <param name="query"></param>
+        /// <returns></returns>
+        public List<RB_CompanyBrand_Extend> GetBrandList(RB_CompanyBrand_Extend query)
+        {
+            DynamicParameters parameters = new DynamicParameters();
+            StringBuilder builder = new StringBuilder();
+            builder.AppendFormat(@"
+SELECT * 
+FROM RB_CompanyBrand
+WHERE 1=1
+");
+            builder.AppendFormat(" AND {0}={1} ", nameof(RB_CompanyBrand_Extend.Status), (int)DateStateEnum.Normal);
+            if (query == null)
+            {
+                return new List<RB_CompanyBrand_Extend>();
+            }
+            else
+            {
+                if (query.TenantId > 0)
+                {
+                    builder.AppendFormat(" AND {0}={1} ", nameof(RB_CompanyBrand_Extend.TenantId), query.TenantId);
+                }
+                if (query.MallBaseId > 0)
+                {
+                    builder.AppendFormat(" AND {0}={1} ", nameof(RB_CompanyBrand_Extend.MallBaseId), query.MallBaseId);
+                }
+                if (!string.IsNullOrEmpty(query.BrandName))
+                {
+                    builder.AppendFormat(" AND {0} LIKE @Name ", nameof(RB_CompanyBrand_Extend.BrandName));
+                    parameters.Add("Name", "%" + query.BrandName.Trim() + "%");
+                }
+                if (query.CompanyId > 0)
+                {
+                    builder.AppendFormat(" AND {0}={1} ", nameof(RB_CompanyBrand_Extend.CompanyId), query.CompanyId);
+                }
+                if (!string.IsNullOrWhiteSpace(query.CompanyIds))
+                {
+                    builder.AppendFormat(" AND {0} in({1})", nameof(RB_CompanyBrand_Extend.CompanyId), query.CompanyIds);
+                }
+            }
+            return Get<RB_CompanyBrand_Extend>(builder.ToString(), parameters).ToList();
+        }
+    }
+}

Mall.WebApi/Controllers/TradePavilion/AppletTradeController.cs

@@ -604,7 +604,7 @@ namespace Mall.WebApi.Controllers.TradePavilion
             {
                 extModel.ID = extModel.ID;
             }
-            var flag = carrierModule.SetBrand(extModel);
+            var flag = carrierModule.SetCompanyBrand(extModel);
             return flag ? ApiResult.Success() : ApiResult.Failed();
         }
 

Mall.WebApi/Controllers/TradePavilion/TradeController.cs

@@ -811,7 +811,7 @@ namespace Mall.WebApi.Controllers.TradePavilion
             {
                 query.Banner = "";
             }
-            if (query.ID==0)
+            if (query.ID == 0)
             {
                 query.CreateDate = System.DateTime.Now;
                 query.MallBaseId = RequestParm.MallBaseId;
@@ -837,5 +837,227 @@ namespace Mall.WebApi.Controllers.TradePavilion
             return flag ? ApiResult.Success() : ApiResult.Failed();
         }
         #endregion
+
+
+        #region 品牌管理
+        /// <summary>
+        /// 获取品牌分类分页列表
+        /// </summary>
+        /// <returns></returns>
+        [HttpGet]
+        [HttpPost]
+        public ApiResult GetBrandClassPageList()
+        {
+            ResultPageModel pageModel = JsonConvert.DeserializeObject<ResultPageModel>(RequestParm.msg.ToString());
+            JObject parms = JObject.Parse(RequestParm.msg.ToString());
+            var query = new RB_BrandClass_Extend()
+            {
+                ClassName = parms.GetStringValue("ClassName")
+            };
+            query.MallBaseId = RequestParm.MallBaseId;
+            query.TenantId = RequestParm.TenantId;
+            var list = carrierModule.GetBrandClassPageListRepository(pageModel.pageIndex, pageModel.pageSize, out long rowsCount, query);
+
+            pageModel.count = Convert.ToInt32(rowsCount);
+            pageModel.pageData = list;
+            return ApiResult.Success(data: pageModel);
+        }
+
+
+        /// <summary>
+        /// 获取品牌分类实体
+        /// </summary>
+        /// <returns></returns>
+        [HttpGet]
+
+        [HttpPost]
+        public ApiResult GetBrandClassDetails()
+        {
+            JObject parms = JObject.Parse(RequestParm.msg.ToString());
+            var query = new RB_BrandClass_Extend()
+            {
+                ID = parms.GetInt("ID", 0),
+            };
+            query.MallBaseId = RequestParm.MallBaseId;
+            query.TenantId = RequestParm.TenantId;
+            var extModel = carrierModule.GetBrandClassRepository(query);
+            return ApiResult.Success(data: extModel);
+        }
+
+        /// <summary>
+        /// 新增/修改品牌信息
+        /// </summary>
+        /// <returns></returns>
+        [HttpPost]
+        public ApiResult GetSetBrandClass()
+        {
+            JObject parms = JObject.Parse(RequestParm.msg.ToString());
+            RB_BrandClass_Extend query = JsonConvert.DeserializeObject<RB_BrandClass_Extend>(RequestParm.msg.ToString());
+            if (string.IsNullOrWhiteSpace(query.ClassName))
+            {
+                return ApiResult.Failed("请输入分类名称");
+            }
+            if (string.IsNullOrWhiteSpace(query.Logo))
+            {
+                return ApiResult.Failed("请上传Logo");
+            }
+
+            if (query.ID == 0)
+            {
+                query.CreateDate = System.DateTime.Now;
+                query.MallBaseId = RequestParm.MallBaseId;
+                query.TenantId = RequestParm.TenantId;
+            }
+            query.Status = 0;
+            query.UpdateDate = System.DateTime.Now;
+            bool flag = carrierModule.SetBrandClass(query);
+            return flag ? ApiResult.Success() : ApiResult.Failed();
+        }
+
+
+
+        /// <summary>
+        /// 删除品牌信息
+        /// </summary>
+        /// <returns></returns>
+        public ApiResult RemoveBrandClass()
+        {
+            JObject parms = JObject.Parse(RequestParm.msg.ToString());
+            var CarrierId = parms.GetInt("Id", 0);
+            var flag = carrierModule.RemoveBrandClassModule(CarrierId);
+            return flag ? ApiResult.Success() : ApiResult.Failed();
+        }
+
+
+
+
+        /// <summary>
+        /// 获取品牌分页列表
+        /// </summary>
+        /// <returns></returns>
+        [HttpGet]
+        [HttpPost]
+        public ApiResult GetBrandPageList()
+        {
+            ResultPageModel pageModel = JsonConvert.DeserializeObject<ResultPageModel>(RequestParm.msg.ToString());
+            JObject parms = JObject.Parse(RequestParm.msg.ToString());
+            var query = new RB_Brand_Extend()
+            {
+                BrandName = parms.GetStringValue("BrandName"),
+                ProjectType = (Common.Enum.TradePavilion.ProjectTypeEnum)parms.GetInt("ProjectType", 0),
+                BrandClassId= parms.GetInt("BrandClassId",0),
+                RanQi = parms.GetInt("RanQi", -1),
+                KongTiao = parms.GetInt("KongTiao", -1),
+                XinFeng = parms.GetInt("XinFeng", -1),
+                Plumbing = parms.GetInt("Plumbing", -1),
+                Caliber = parms.GetInt("Caliber", -1),
+                Sewage = parms.GetInt("Sewage", -1),
+            };
+            query.MallBaseId = RequestParm.MallBaseId;
+            query.TenantId = RequestParm.TenantId;
+            var list = carrierModule.GetBrandPageList(pageModel.pageIndex, pageModel.pageSize, out long rowsCount, query);
+            foreach (var item in list)
+            {
+                if (!string.IsNullOrWhiteSpace(item.Banner))
+                {
+                    item.BannerList = JsonConvert.DeserializeObject<List<string>>(item.Banner);
+                }
+                else
+                {
+                    item.BannerList = new List<string>();
+                }
+            }
+            pageModel.count = Convert.ToInt32(rowsCount);
+            pageModel.pageData = list;
+            return ApiResult.Success(data: pageModel);
+        }
+
+
+        /// <summary>
+        /// 获取品牌分类实体
+        /// </summary>
+        /// <returns></returns>
+        [HttpGet]
+
+        [HttpPost]
+        public ApiResult GetBrandDetails()
+        {
+            JObject parms = JObject.Parse(RequestParm.msg.ToString());
+            var query = new RB_Brand_Extend()
+            {
+                ID = parms.GetInt("ID", 0),
+               
+            };
+            query.MallBaseId = RequestParm.MallBaseId;
+            query.TenantId = RequestParm.TenantId;
+            var extModel = carrierModule.GetBrand(query);
+
+            if (!string.IsNullOrWhiteSpace(extModel.Banner))
+            {
+                extModel.BannerList = JsonConvert.DeserializeObject<List<string>>(extModel.Banner);
+            }
+            else
+            {
+                extModel.BannerList = new List<string>();
+            }
+            return ApiResult.Success(data: extModel);
+        }
+
+        /// <summary>
+        /// 新增/修改品牌信息
+        /// </summary>
+        /// <returns></returns>
+        [HttpPost]
+        public ApiResult GetSetBrand()
+        {
+            JObject parms = JObject.Parse(RequestParm.msg.ToString());
+            RB_Brand_Extend query = JsonConvert.DeserializeObject<RB_Brand_Extend>(RequestParm.msg.ToString());
+            if (string.IsNullOrWhiteSpace(query.BrandName))
+            {
+                return ApiResult.Failed("请输入品牌名称");
+            }
+            if (string.IsNullOrWhiteSpace(query.Logo))
+            {
+                return ApiResult.Failed("请上传Logo");
+            }
+
+            if (query.BrandClassId == 0)
+            {
+                return ApiResult.Failed("请选择品牌分类");
+            }
+            if (query.BannerList != null && query.BannerList.Any())
+            {
+                query.Banner = JsonConvert.SerializeObject(query.BannerList);
+            }
+            else
+            {
+                query.Banner = "";
+            }
+            if (query.ID == 0)
+            {
+                query.CreateDate = System.DateTime.Now;
+                query.MallBaseId = RequestParm.MallBaseId;
+                query.TenantId = RequestParm.TenantId;
+            }
+            query.Status = 0;
+            query.UpdateDate = System.DateTime.Now;
+            bool flag = carrierModule.SetBrand(query);
+            return flag ? ApiResult.Success() : ApiResult.Failed();
+        }
+
+
+
+        /// <summary>
+        /// 删除品牌信息
+        /// </summary>
+        /// <returns></returns>
+        public ApiResult RemoveBrand()
+        {
+            JObject parms = JObject.Parse(RequestParm.msg.ToString());
+            var CarrierId = parms.GetInt("Id", 0);
+            var flag = carrierModule.RemoveBrandModule(CarrierId);
+            return flag ? ApiResult.Success() : ApiResult.Failed();
+        }
+        #endregion
     }
 }