111

Mall.Common/Enum/TradePavilion/AuthenticationCategoryEnum.cs

-using System;
-using System.Collections.Generic;
-using System.Text;
-using Mall.Common.Plugin;
+using Mall.Common.Plugin;
 
 namespace Mall.Common.Enum.TradePavilion
 {

Mall.Common/Enum/TradePavilion/BrandCategoryEnum.cs

+using Mall.Common.Plugin;
+
+namespace Mall.Common.Enum.TradePavilion
+{
+    /// <summary>
+    ///品牌大类
+    /// </summary>
+    public enum BrandCategoryEnum
+    {
+        /// <summary>
+        /// 商业载体
+        /// </summary>
+        [EnumField("商业载体")]
+        Business = 1,
+
+        /// <summary>
+        /// 活力楼宇
+        /// </summary>
+        [EnumField("楼宇")]
+        VitalityBuilding = 2,
+
+
+        /// <summary>
+        /// 消费品牌
+        /// </summary>
+        [EnumField("消费品牌")]
+        ConsumerBrand = 3,
+
+
+        /// <summary>
+        /// 企业服务
+        /// </summary>
+        [EnumField("企业服务")]
+        EnterpriseServices = 4,
+    }
+}

Mall.Common/Plugin/WeiXinHelper.cs

@@ -54,11 +54,14 @@ namespace Mall.Common.Plugin
                     JObject jObj = JObject.Parse(result);
                     miniAppUserCache.UserOpenId = jObj.GetStringValue("openid");
                     miniAppUserCache.UserUnoinid = jObj.GetStringValue("unionid");
+                    if (string.IsNullOrEmpty(miniAppUserCache.UserOpenId) || string.IsNullOrEmpty(miniAppUserCache.UserUnoinid))
+                    {
+                        Common.Plugin.LogHelper.WriteInfo(string.Format("GetWeChatOpenId:AppId_{0}  result_{1}", AppId, result));
+                    }
                 }
             }
             catch (Exception ex)
             {
-                //GetWeChatOpenId:result={"errcode":40163,"errmsg":"code been used, hints: [ req_id: AHGbGiqNe-OhJh.a ]"}&&Code=051S1Ykl2wYCF64U7gnl2AK6ga0S1Yk2
                 //Code过期
                 if (result != null && !string.IsNullOrEmpty(result) && !result.Contains("40163"))
                 {

Mall.Model/Entity/TradePavilion/RB_BrandClass.cs

@@ -58,6 +58,9 @@ namespace Mall.Model.Entity.TradePavilion
         /// </summary>
         public string ClassName { get; set; }
 
-     
+        /// <summary>
+        /// 品牌大类
+        /// </summary>
+        public BrandCategoryEnum BrandCategory { get; set; }
     }
 }

Mall.Model/Entity/TradePavilion/RB_Building_Carrier.cs

+using Mall.Common.Enum;
+using Mall.Common.Enum.TradePavilion;
+using System;
+using VT.FW.DB;
+
+namespace Mall.Model.Entity.TradePavilion
+{
+    /// <summary>
+    /// 楼宇实体类
+    /// </summary>
+    [Serializable]
+    [DB(ConnectionName = "DefaultConnection")]
+    public class RB_Building_Carrier
+    {
+        /// <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 int CreateBy { get; set; }
+
+        /// <summary>
+        /// 创建时间
+        /// </summary>
+        public DateTime CreateDate { get; set; }
+
+        /// <summary>
+        /// 修改人
+        /// </summary>
+        public int UpdateBy { get; set; }
+
+        /// <summary>
+        /// 修改时间
+        /// </summary>
+        public DateTime UpdateDate { get; set; }
+
+        /// <summary>
+        /// 删除状态
+        /// </summary>
+        public DateStateEnum Status { get; set; }
+
+
+        /// <summary>
+        /// 载体名称
+        /// </summary>
+        public string CarrierName { get; set; }
+
+
+        /// <summary>
+        /// logo
+        /// </summary>
+        public string Logo { get; set; }
+
+
+        /// <summary>
+        /// 载体介绍图
+        /// </summary>
+        public string Banner { get; set; }
+
+        /// <summary>
+        /// 载体视频
+        /// </summary>
+        public string VideoUrl { get; set; }
+
+        /// <summary>
+        /// 省
+        /// </summary>
+        public int Province { get; set; }
+
+        /// <summary>
+        /// 市
+        /// </summary>
+        public int City { get; set; }
+
+
+        /// <summary>
+        /// 区
+        /// </summary>
+        public int Area { get; set; }
+
+        /// <summary>
+        /// 载体地址
+        /// </summary>
+        public string Address { get; set; }
+
+        /// <summary>
+        /// 载体地址经纬度
+        /// </summary>
+        public string LatAndLon { get; set; }
+
+        /// <summary>
+        /// 开发商
+        /// </summary>
+        public string Developers { get; set; }
+
+        /// <summary>
+        /// 开业时间
+        /// </summary>
+        public DateTime OpenTime { get; set; }
+
+        /// <summary>
+        /// 项目类型
+        /// </summary>
+        public ProjectTypeEnum ProjectType { get; set; }
+
+        /// <summary>
+        /// 商业体量（单位：万平方米）
+        /// </summary>
+        public decimal CarrierSize { get; set; }
+
+        /// <summary>
+        /// 商业层数
+        /// </summary>
+        public string LayersNum { get; set; }
+
+        /// <summary>
+        /// 车位数量
+        /// </summary>
+        public int CarNum { get; set; }
+
+
+        /// <summary>
+        /// 业态规划
+        /// </summary>
+        public string CarrierPlan { get; set; }
+
+        /// <summary>
+        /// 招引目标
+        /// </summary>
+        public string CarrierTarget { get; set; }
+
+        /// <summary>
+        /// 目标人群[周边人群结构特征]
+        /// </summary>
+        public string Crowd { get; set; }
+
+        /// <summary>
+        /// 归属于用户
+        /// </summary>
+        public int UserId { get; set; }
+
+
+        /// <summary>
+        /// 开业状态0-即将开业，1-已开业
+        /// </summary>
+        public int OpeningStatus { get; set; }
+
+        /// <summary>
+        /// 首店试验场 0-否，1-是
+        /// </summary>
+        public int FirstStoreTest { get; set; }
+
+
+        /// <summary>
+        /// 招商优惠政策
+        /// </summary>
+        public string Discount { get; set; }
+
+        /// <summary>
+        /// 载体荣誉
+        /// </summary>
+        public string Honor { get; set; }
+
+        /// <summary>
+        /// 去年业绩（单位：W）
+        /// </summary>
+        public decimal YeJi { get; set; }
+
+        /// <summary>
+        /// 店铺数量
+        /// </summary>
+        public int ShopNum { get; set; }
+
+        /// <summary>
+        /// 可租赁面积
+        /// </summary>
+        public decimal AreaRequirement { get; set; }
+
+        /// <summary>
+        /// 可租赁面积
+        /// </summary>
+        public decimal EndAreaRequirement { get; set; }
+
+
+        /// <summary>
+        /// 经营面积
+        /// </summary>
+        public decimal BuiltUpArea { get; set; }
+
+        /// <summary>
+        /// 经营面积
+        /// </summary>
+        public decimal EndBuiltUpArea { get; set; }
+
+
+        /// <summary>
+        /// 首店数量
+        /// </summary>
+        public string FirstShopNum { get; set; }
+
+        /// <summary>
+        /// 首发政策
+        /// </summary>
+        public string StartingInfo { get; set; }
+
+
+        /// <summary>
+        /// 项目类型
+        /// </summary>
+        public int CategoryId { get; set; }
+
+        /// <summary>
+        /// 类型(1-载体,2-楼宇)
+        /// </summary>
+        public int BuildingCarrierType { get; set; }
+
+        /// <summary>
+        /// 是否为成都载体(1-是)
+        /// </summary>
+        public int IsChengDu { get; set; }
+
+        /// <summary>
+        /// 资产权属
+        /// </summary>
+        public string Ascription { get; set;}
+
+        /// <summary>
+        /// 物业构成
+        /// </summary>
+        public string PropertyComposition { get; set; }
+
+ 
+        /// <summary>
+        /// 项目发展及定位
+        /// </summary>
+        public string Location { get; set; }
+
+        /// <summary>
+        /// 人流量参数
+        /// </summary>
+        public string VisitorsFlowrate { get; set;}
+
+        /// <summary>
+        /// 水电气及配套
+        /// </summary>
+        public string SupportingFacilities { get; set; }
+
+        /// <summary>
+        /// 管理公司及管理费
+        /// </summary>
+        public string ManagementCompany { get; set; }
+
+        /// <summary>
+        /// 目标招商业态及品牌需求
+        /// </summary>
+        public string BrandDemand { get; set; }
+    }
+}

Mall.Model/Extend/TradePavilion/RB_Building_Carrier_Extend.cs

+using Mall.Model.Entity.TradePavilion;
+
+namespace Mall.Model.Extend.TradePavilion
+{
+    /// <summary>
+    /// 楼宇扩展实体类
+    /// </summary>
+    public class RB_Building_Carrier_Extend : RB_Building_Carrier
+    {
+        /// <summary>
+        /// 分类名称
+        /// </summary>
+        public string CategoryName { get; set; }
+
+        /// <summary>
+        /// 开业开始时间
+        /// </summary>
+        public string QStartDate { get; set; }
+
+        /// <summary>
+        /// 开业结束时间
+        /// </summary>
+        public string QEndDate { get; set; }
+    }
+}

Mall.Module.TradePavilion/CarrierModule.cs

@@ -8,6 +8,8 @@ using Newtonsoft.Json;
 using VT.FW.DB;
 using Mall.Common.Plugin;
 using Mall.Common;
+using Mall.Common.Enum;
+using VT.FW.DB.Dapper;
 
 namespace Mall.Module.TradePavilion
 {
@@ -69,6 +71,11 @@ namespace Mall.Module.TradePavilion
         /// </summary>
         private readonly RB_PrizeRepository prizeRepository = new RB_PrizeRepository();
 
+        /// <summary>
+        /// 楼宇仓储层
+        /// </summary>
+        private readonly RB_Building_CarrierRepository buildingRepository = new RB_Building_CarrierRepository();
+
         #region 载体
         /// <summary>
         /// 载体信息列表
@@ -868,11 +875,14 @@ namespace Mall.Module.TradePavilion
                 if (flag)
                 {
                     //更新认证表  资料状态为完成
-                    Dictionary<string, object> keyValues = new Dictionary<string, object>() {
+                    Dictionary<string, object> keyValues = new Dictionary<string, object>()
+                    {
                         { nameof(RB_Company_Extend.IsComplete),1}
                     };
-                    List<WhereHelper> wheres = new List<WhereHelper>() {
-                        new WhereHelper(){
+                    List<WhereHelper> wheres = new List<WhereHelper>()
+                    {
+                        new WhereHelper()
+                        {
                              FiledName=nameof(RB_Company_Extend.CompanyId),
                              FiledValue= model.CompanyId,
                              OperatorEnum=OperatorEnum.Equal
@@ -897,12 +907,15 @@ namespace Mall.Module.TradePavilion
                     if (Config.IsFirtsShopAutoExamine == "1")//自动审核
                     {
                         //更新认证表  资料状态为完成
-                        Dictionary<string, object> keyValues = new Dictionary<string, object>() {
+                        Dictionary<string, object> keyValues = new Dictionary<string, object>()
+                        {
                             { nameof(RB_Company_Extend.IsComplete),1},
                             { nameof(RB_Company_Extend.CompanyStatus),1}
                          };
-                        List<WhereHelper> wheres = new List<WhereHelper>() {
-                            new WhereHelper(){
+                        List<WhereHelper> wheres = new List<WhereHelper>()
+                        {
+                            new WhereHelper()
+                            {
                                  FiledName=nameof(RB_Company_Extend.CompanyId),
                                  FiledValue= model.CompanyId,
                                  OperatorEnum=OperatorEnum.Equal
@@ -973,11 +986,14 @@ namespace Mall.Module.TradePavilion
                     else
                     {
                         //更新认证表  资料状态为完成
-                        Dictionary<string, object> keyValues = new Dictionary<string, object>() {
+                        Dictionary<string, object> keyValues = new Dictionary<string, object>()
+                        {
                             { nameof(RB_Company_Extend.IsComplete),1}
                         };
-                        List<WhereHelper> wheres = new List<WhereHelper>() {
-                        new WhereHelper(){
+                        List<WhereHelper> wheres = new List<WhereHelper>()
+                        {
+                            new WhereHelper()
+                                {
                                     FiledName=nameof(RB_Company_Extend.CompanyId),
                                     FiledValue= model.CompanyId,
                                     OperatorEnum=OperatorEnum.Equal
@@ -1015,30 +1031,30 @@ namespace Mall.Module.TradePavilion
         /// <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)
+        public List<RB_BrandClass_Extend> GetBrandClassPageModule(int pageIndex, int pageSize, out long rowsCount, RB_BrandClass_Extend query)
         {
-            return brandClassRepository.GetBrandClassPageListRepository(pageIndex, pageSize, out rowsCount, query);
+            return brandClassRepository.GetBrandClassPageRepository(pageIndex, pageSize, out rowsCount, query);
         }
 
         /// <summary>
-        /// 根据查询条件获取品牌信息实体
+        /// 获取品牌分类实体
         /// </summary>
-        /// <param name="query"></param>
+        /// <param name="Id"></param>
         /// <returns></returns>
-        public RB_BrandClass_Extend GetBrandClassRepository(RB_BrandClass_Extend query)
+        public RB_BrandClass_Extend GetBrandClassModule(int Id)
         {
-            return brandClassRepository.GetBrandClassRepository(query);
-
+            var extModel = brandClassRepository.GetEntity<RB_BrandClass_Extend>(Id);
+            return extModel;
         }
 
         /// <summary>
-        /// 根据查询条件获取品牌信息
+        /// 根据查询条件获取品牌信息实体
         /// </summary>
         /// <param name="query"></param>
         /// <returns></returns>
-        public List<RB_BrandClass_Extend> GetBrandClassList(RB_BrandClass_Extend query)
+        public List<RB_BrandClass_Extend> GetBrandClassListModule(RB_BrandClass_Extend query)
         {
-            return brandClassRepository.GetBrandClassList(query);
+            return brandClassRepository.GetBrandClassListRepository(query);
         }
 
 
@@ -1047,23 +1063,28 @@ namespace Mall.Module.TradePavilion
         /// </summary>
         /// <param name="model"></param>
         /// <returns></returns>
-        public bool SetBrandClass(RB_BrandClass_Extend model)
-        {
-            if (model.ID == 0)
+        public bool SetBrandClassModule(RB_BrandClass_Extend model)
         {
-                return brandClassRepository.Insert(model) > 0;
-            }
-            else
+            bool flag = false;
+            if (model.ID > 0)
             {
                 Dictionary<string, object> fileds = new Dictionary<string, object>()
                 {
                     {nameof(RB_BrandClass_Extend.ClassName),model.ClassName },
                     {nameof(RB_BrandClass_Extend.Logo),model.Logo },
+                    {nameof(RB_BrandClass_Extend.BrandCategory),model.BrandCategory},
                     {nameof(RB_BrandClass_Extend.Status),model.Status },
                     {nameof(RB_BrandClass_Extend.UpdateDate),model.UpdateDate },
                 };
-                return brandClassRepository.Update(fileds, new WhereHelper(nameof(RB_BrandClass_Extend.ID), model.ID));
+                flag = brandClassRepository.Update(fileds, new WhereHelper(nameof(RB_BrandClass_Extend.ID), model.ID));
             }
+            else
+            {
+                var newId = brandClassRepository.Insert(model);
+                model.ID = newId;
+                flag = newId > 0;
+            }
+            return flag;
         }
 
         /// <summary>
@@ -1276,9 +1297,105 @@ namespace Mall.Module.TradePavilion
             bool flag = prizeRepository.Update(fileds, new WhereHelper(nameof(RB_Prize_Extend.Id), prizeId));
             return flag;
         }
+        #endregion
 
+        /// <summary>
+        /// 获取楼宇分页列表
+        /// </summary>
+        /// <param name="pageIndex"></param>
+        /// <param name="pageSize"></param>
+        /// <param name="rowsCount"></param>
+        /// <param name="query"></param>
+        /// <returns></returns>
+        public List<RB_Building_Carrier_Extend> GetBuildingPageModule(int pageIndex, int pageSize, out long rowsCount, RB_Building_Carrier_Extend query)
+        {
+            return buildingRepository.GetBuildingPageRepository(pageIndex, pageSize, out rowsCount, query);
+        }
 
 
-        #endregion
+        /// <summary>
+        /// 获取楼宇列表
+        /// </summary>
+        /// <param name="query"></param>
+        /// <returns></returns>
+        public List<RB_Building_Carrier_Extend> GetBuildingListModule(RB_Building_Carrier_Extend query)
+        {
+            return buildingRepository.GetBuildingListRepository(query);
+        }
+
+        /// <summary>
+        /// 新增修改楼宇
+        /// </summary>
+        /// <param name="extModel"></param>
+        /// <returns></returns>
+        public bool SetBuildingCarrierModule(RB_Building_Carrier_Extend extModel)
+        {
+            bool flag = false;
+            if (extModel.ID > 0)
+            {
+                Dictionary<string, object> fileds = new Dictionary<string, object>()
+                {
+                    {nameof(RB_Building_Carrier_Extend.CarrierName),extModel.CarrierName },
+                    {nameof(RB_Building_Carrier_Extend.Logo),extModel.Logo },
+                    {nameof(RB_Building_Carrier_Extend.Banner),extModel.Banner },
+                    {nameof(RB_Building_Carrier_Extend.Honor),extModel.Honor },
+                    {nameof(RB_Building_Carrier_Extend.Developers),extModel.Developers },
+                    {nameof(RB_Building_Carrier_Extend.OpeningStatus),extModel.OpeningStatus },
+                    {nameof(RB_Building_Carrier_Extend.VideoUrl),extModel.VideoUrl },
+                    {nameof(RB_Building_Carrier_Extend.Address),extModel.Address },
+                    {nameof(RB_Building_Carrier_Extend.LatAndLon),extModel.LatAndLon },
+                    {nameof(RB_Building_Carrier_Extend.OpenTime),extModel.OpenTime },
+                    {nameof(RB_Building_Carrier_Extend.BuildingCarrierType),extModel.BuildingCarrierType },
+                    {nameof(RB_Building_Carrier_Extend.CategoryId),extModel.CategoryId },
+                    {nameof(RB_Building_Carrier_Extend.Ascription),extModel.Ascription },
+                    {nameof(RB_Building_Carrier_Extend.CarrierSize),extModel.CarrierSize },
+                    {nameof(RB_Building_Carrier_Extend.PropertyComposition),extModel.PropertyComposition },
+                    {nameof(RB_Building_Carrier_Extend.Location),extModel.Location },
+                    {nameof(RB_Building_Carrier_Extend.Crowd),extModel.Crowd },
+                    {nameof(RB_Building_Carrier_Extend.VisitorsFlowrate),extModel.VisitorsFlowrate },
+                    {nameof(RB_Building_Carrier_Extend.LayersNum),extModel.LayersNum },
+                    {nameof(RB_Building_Carrier_Extend.SupportingFacilities),extModel.SupportingFacilities },
+                    {nameof(RB_Building_Carrier_Extend.ManagementCompany),extModel.ManagementCompany },
+                    {nameof(RB_Building_Carrier_Extend.BrandDemand),extModel.BrandDemand },
+                    {nameof(RB_Building_Carrier_Extend.UpdateBy),extModel.UpdateBy },
+                    {nameof(RB_Building_Carrier_Extend.UpdateDate),extModel.UpdateDate },
+                };
+                flag = buildingRepository.Update(fileds, new WhereHelper(nameof(RB_Building_Carrier_Extend.ID), extModel.ID));
+            }
+            else
+            {
+                var newId = buildingRepository.Insert(extModel);
+                extModel.ID = newId;
+                flag = newId > 0;
+            }
+            return flag;
+        }
+
+        /// <summary>
+        /// 删除楼宇
+        /// </summary>
+        /// <param name="ID"></param>
+        /// <returns></returns>
+        public bool RemoveBuildingModule(int ID)
+        {
+            Dictionary<string, object> fileds = new Dictionary<string, object>()
+            {
+                {nameof(RB_Building_Carrier_Extend.Status),(int)DateStateEnum.Delete },
+                {nameof(RB_Building_Carrier_Extend.UpdateDate),DateTime.Now }
+            };
+            bool flag = buildingRepository.Update(fileds, new WhereHelper(nameof(RB_Building_Carrier_Extend.ID), ID));
+            return flag;
+        }
+
+        /// <summary>
+        /// 根据编号获取楼宇详情
+        /// </summary>
+        /// <param name="ID"></param>
+        /// <returns></returns>
+        public RB_Building_Carrier_Extend GetBuildingModule(int ID)
+        {
+            var extModel = buildingRepository.GetEntity<RB_Building_Carrier_Extend>(ID);
+            return extModel;
+        }
     }
 }

Mall.Repository/TradePavilion/RB_BrandClassRepository.cs

-using System;
+using Mall.Common.Enum;
+using Mall.Model.Entity.TradePavilion;
+using Mall.Model.Extend.TradePavilion;
 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
@@ -19,7 +18,7 @@ namespace Mall.Repository.TradePavilion
         /// <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)
+        public List<RB_BrandClass_Extend> GetBrandClassPageRepository(int pageIndex, int pageSize, out long rowsCount, RB_BrandClass_Extend query)
         {
             rowsCount = 0;
             DynamicParameters parameters = new DynamicParameters();
@@ -44,10 +43,14 @@ WHERE 1=1
                 {
                     builder.AppendFormat(" AND {0}={1} ", nameof(RB_BrandClass_Extend.MallBaseId), query.MallBaseId);
                 }
+                if (query.BrandCategory > 0)
+                {
+                    builder.AppendFormat(" AND {0}={1} ", nameof(RB_BrandClass_Extend.BrandCategory), (int)query.BrandCategory);
+                }
                 if (!string.IsNullOrEmpty(query.ClassName))
                 {
-                    builder.AppendFormat(" AND {0} LIKE @Name ", nameof(RB_BrandClass_Extend.ClassName));
-                    parameters.Add("Name", "%" + query.ClassName.Trim() + "%");
+                    builder.AppendFormat(" AND {0} LIKE @ClassName ", nameof(RB_BrandClass_Extend.ClassName));
+                    parameters.Add("@ClassName", "%" + query.ClassName.Trim() + "%");
                 }
             }
             return GetPage<RB_BrandClass_Extend>(pageIndex, pageSize, out rowsCount, builder.ToString(), parameters).ToList();
@@ -58,7 +61,7 @@ WHERE 1=1
         /// </summary>
         /// <param name="query"></param>
         /// <returns></returns>
-        public RB_BrandClass_Extend GetBrandClassRepository(RB_BrandClass_Extend query)
+        public List<RB_BrandClass_Extend> GetBrandClassListRepository(RB_BrandClass_Extend query)
         {
             DynamicParameters parameters = new DynamicParameters();
             StringBuilder builder = new StringBuilder();
@@ -70,7 +73,7 @@ WHERE 1=1
             builder.AppendFormat(" AND {0}={1} ", nameof(RB_BrandClass_Extend.Status), (int)DateStateEnum.Normal);
             if (query == null)
             {
-                return new RB_BrandClass_Extend();
+                return new List<RB_BrandClass_Extend>();
             }
             else
             {
@@ -87,54 +90,15 @@ WHERE 1=1
                     builder.AppendFormat(" AND {0} LIKE @Name ", nameof(RB_BrandClass_Extend.ClassName));
                     parameters.Add("Name", "%" + query.ClassName.Trim() + "%");
                 }
-                if (query.ID > 0)
+                if (query.BrandCategory > 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() + "%");
+                    builder.AppendFormat(" AND {0}={1} ", nameof(RB_BrandClass_Extend.BrandCategory), (int)query.BrandCategory);
                 }
                 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_Building_CarrierRepository.cs

+using Mall.Common.Enum;
+using Mall.Model.Entity.TradePavilion;
+using Mall.Model.Extend.TradePavilion;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using VT.FW.DB.Dapper;
+
+namespace Mall.Repository.TradePavilion
+{
+    /// <summary>
+    /// 楼宇仓储层
+    /// </summary>
+    public class RB_Building_CarrierRepository :BaseRepository<RB_Building_Carrier>
+    {
+        /// <summary>
+        /// 获取楼宇分页列表
+        /// </summary>
+        /// <param name="pageIndex"></param>
+        /// <param name="pageSize"></param>
+        /// <param name="rowsCount"></param>
+        /// <param name="query"></param>
+        /// <returns></returns>
+        public List<RB_Building_Carrier_Extend> GetBuildingPageRepository(int pageIndex, int pageSize, out long rowsCount, RB_Building_Carrier_Extend query)
+        {
+            DynamicParameters parameters = new DynamicParameters();
+            StringBuilder builder = new StringBuilder();
+            builder.AppendFormat(@"
+SELECT A.*,IFNULL(B.ClassName,'') AS CategoryName
+FROM RB_Building_Carrier AS A LEFT JOIN rb_brandclass AS B ON A.CategoryId=B.ID
+WHERE 1=1 
+");
+            builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_Building_Carrier_Extend.Status), (int)DateStateEnum.Normal);
+            if (query != null)
+            {
+                if (query.TenantId > 0)
+                {
+                    builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_Building_Carrier_Extend.TenantId), query.TenantId);
+                }
+                if (query.MallBaseId > 0)
+                {
+                    builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_Building_Carrier_Extend.MallBaseId), query.MallBaseId);
+                }
+                if (!string.IsNullOrEmpty(query.CarrierName))
+                {
+                    builder.AppendFormat(" AND A.{0} LIKE @CarrierName ", nameof(RB_Building_Carrier_Extend.CarrierName));
+                    parameters.Add("@CarrierName", "%" + query.CarrierName.Trim() + "%");
+                }
+                if (query.CategoryId > 0)
+                {
+                    builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_Building_Carrier_Extend.CategoryId), query.CategoryId);
+                }
+            }
+            builder.AppendFormat(" ORDER BY A.BuildingId DESC ");
+            return GetPage<RB_Building_Carrier_Extend>(pageIndex, pageSize, out rowsCount, builder.ToString(), parameters).ToList();
+        }
+
+
+        /// <summary>
+        /// 获取楼宇列表
+        /// </summary>
+        /// <param name="query"></param>
+        /// <returns></returns>
+        public List<RB_Building_Carrier_Extend> GetBuildingListRepository(RB_Building_Carrier_Extend query)
+        {
+            DynamicParameters parameters = new DynamicParameters();
+            StringBuilder builder = new StringBuilder();
+            builder.AppendFormat(@"
+SELECT A.*,IFNULL(B.ClassName,'') AS CategoryName
+FROM RB_Building_Carrier AS A LEFT JOIN rb_brandclass AS B ON A.CategoryId=B.ID
+WHERE 1=1 
+");
+            builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_Building_Carrier_Extend.Status), (int)DateStateEnum.Normal);
+            if (query != null)
+            {
+                if (query.TenantId > 0)
+                {
+                    builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_Building_Carrier_Extend.TenantId), query.TenantId);
+                }
+                if (query.MallBaseId > 0)
+                {
+                    builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_Building_Carrier_Extend.MallBaseId), query.MallBaseId);
+                }
+                if (!string.IsNullOrEmpty(query.CarrierName))
+                {
+                    builder.AppendFormat(" AND A.{0} LIKE @CarrierName ", nameof(RB_Building_Carrier_Extend.CarrierName));
+                    parameters.Add("@CarrierName", "%" + query.CarrierName.Trim() + "%");
+                }
+                if (query.CategoryId > 0)
+                {
+                    builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_Building_Carrier_Extend.CategoryId), query.CategoryId);
+                }
+            }
+            return Get<RB_Building_Carrier_Extend>(builder.ToString(), parameters).ToList();
+        }
+    }
+}

Mall.WebApi/Controllers/TradePavilion/AppletTradeController.cs

@@ -2134,12 +2134,14 @@ namespace Mall.WebApi.Controllers.TradePavilion
         [AllowAnonymous] [RateValve(Policy = Policy.Ip, Limit = 10, Duration = 60)]
         public ApiResult GetBrandClassList()
         {
+            JObject parms = JObject.Parse(RequestParm.msg.ToString());
             var query = new RB_BrandClass_Extend
             {
                 MallBaseId = RequestParm.MallBaseId,
-                TenantId = RequestParm.TenantId
+                TenantId = RequestParm.TenantId,
+                BrandCategory=(BrandCategoryEnum)parms.GetInt("BrandCategory"),
             };
-            var list = carrierModule.GetBrandClassList(query);
+            var list = carrierModule.GetBrandClassListModule(query);
             return ApiResult.Success(data: list);
         }
 

Mall.WebApi/Controllers/TradePavilion/TradeController.cs

 using System;
 using System.Collections.Generic;
 using System.Collections.Specialized;
+using System.Drawing;
 using System.IO;
 using System.Linq;
 using System.Net;
+using System.Reflection;
 using System.Text;
 using System.Threading.Tasks;
 using System.Web;
@@ -1757,15 +1759,33 @@ namespace Mall.WebApi.Controllers.TradePavilion
         [HttpPost]
         public ApiResult GetBrandClassPageList()
         {
-            ResultPageModel pageModel = JsonConvert.DeserializeObject<ResultPageModel>(RequestParm.msg.ToString());
             JObject parms = JObject.Parse(RequestParm.msg.ToString());
+            ResultPageModel pageModel = new ResultPageModel()
+            {
+                 pageIndex=parms.GetInt("pageIndex"),
+                 pageSize=parms.GetInt("pageSize"),
+            };
             var query = new RB_BrandClass_Extend()
             {
-                ClassName = parms.GetStringValue("ClassName")
+                ClassName = parms.GetStringValue("ClassName"),
+                BrandCategory=(BrandCategoryEnum)parms.GetInt("BrandCategory"),
             };
             query.MallBaseId = RequestParm.MallBaseId;
             query.TenantId = RequestParm.TenantId;
-            var list = carrierModule.GetBrandClassPageListRepository(pageModel.pageIndex, pageModel.pageSize, out long rowsCount, query);
+            List<object> list = new List<object>();
+            var dataList = carrierModule.GetBrandClassPageModule(pageModel.pageIndex, pageModel.pageSize, out long rowsCount, query);
+            foreach (var item in dataList)
+            {
+                list.Add(new
+                {
+                    item.ID,
+                    item.ClassName,
+                    item.Logo,
+                    item.BrandCategory,
+                    BrandCategoryName = item.BrandCategory.GetEnumName(),
+                    CreateDate = Common.ConvertHelper.FormatTime(item.CreateDate),
+                });
+            }
             pageModel.count = Convert.ToInt32(rowsCount);
             pageModel.pageData = list;
             return ApiResult.Success(data: pageModel);
@@ -1779,12 +1799,26 @@ namespace Mall.WebApi.Controllers.TradePavilion
         [HttpPost]
         public ApiResult GetBrandClassList()
         {
+            JObject parms = JObject.Parse(RequestParm.msg.ToString());
             var query = new RB_BrandClass_Extend
             {
                 MallBaseId = RequestParm.MallBaseId,
-                TenantId = RequestParm.TenantId
+                TenantId = RequestParm.TenantId,
+                BrandCategory = (BrandCategoryEnum)parms.GetInt("BrandCategory"),
             };
-            var list = carrierModule.GetBrandClassList(query);
+            List<object> list = new List<object>();
+            var dataList = carrierModule.GetBrandClassListModule(query);
+            foreach (var item in dataList)
+            {
+                list.Add(new
+                {
+                    item.ID,
+                    item.ClassName,
+                    item.Logo,
+                    item.BrandCategory,
+                    BrandCategoryName = item.BrandCategory.GetEnumName(),
+                });
+            }
             return ApiResult.Success(data: list);
         }
 
@@ -1797,13 +1831,12 @@ namespace Mall.WebApi.Controllers.TradePavilion
         public ApiResult GetBrandClassDetails()
         {
             JObject parms = JObject.Parse(RequestParm.msg.ToString());
-            var query = new RB_BrandClass_Extend()
+            int ID = parms.GetInt("ID", 0);
+            if (ID <= 0)
             {
-                ID = parms.GetInt("ID", 0),
-            };
-            query.MallBaseId = RequestParm.MallBaseId;
-            query.TenantId = RequestParm.TenantId;
-            var extModel = carrierModule.GetBrandClassRepository(query);
+                return ApiResult.ParamIsNull(message: "请传递分类编号");
+            }
+            var extModel = carrierModule.GetBrandClassModule(ID);
             return ApiResult.Success(data: extModel);
         }
 
@@ -1814,7 +1847,14 @@ namespace Mall.WebApi.Controllers.TradePavilion
         [HttpPost]
         public ApiResult GetSetBrandClass()
         {
-            RB_BrandClass_Extend query = JsonConvert.DeserializeObject<RB_BrandClass_Extend>(RequestParm.msg.ToString());
+            JObject parms = JObject.Parse(RequestParm.msg.ToString());
+            RB_BrandClass_Extend query = new RB_BrandClass_Extend()
+            {
+                ID = parms.GetInt("ID"),
+                Logo = parms.GetStringValue("Logo"),
+                ClassName = parms.GetStringValue("ClassName"),
+                BrandCategory = (BrandCategoryEnum)parms.GetInt("BrandCategory"),
+            };
             if (string.IsNullOrWhiteSpace(query.ClassName))
             {
                 return ApiResult.Failed("请输入分类名称");
@@ -1827,7 +1867,7 @@ namespace Mall.WebApi.Controllers.TradePavilion
             }
             query.Status = 0;
             query.UpdateDate = System.DateTime.Now;
-            bool flag = carrierModule.SetBrandClass(query);
+            bool flag = carrierModule.SetBrandClassModule(query);
             return flag ? ApiResult.Success() : ApiResult.Failed();
         }
 
@@ -1911,10 +1951,8 @@ namespace Mall.WebApi.Controllers.TradePavilion
             var query = new RB_Brand_Extend()
             {
                 ID = parms.GetInt("ID", 0),
-
             };
             query.MallBaseId = RequestParm.MallBaseId;
-            //query.TenantId = RequestParm.TenantId;
             query.RanQi = -1;
             query.KongTiao = -1;
             query.XinFeng = -1;
@@ -2532,7 +2570,16 @@ namespace Mall.WebApi.Controllers.TradePavilion
                 Id = Convert.ToInt32(x.Value)
             }));
         }
-
+        /// <summary>
+        /// 获取品牌大类
+        /// </summary>
+        /// <returns></returns>
+        [HttpPost]
+        public ApiResult GetBrandCategory()
+        {
+            var list = Common.Plugin.EnumHelper.EnumToList(typeof(BrandCategoryEnum));
+            return ApiResult.Success(data: list);
+        }
         #endregion
 
         #region 榜单管理
@@ -3104,10 +3151,6 @@ namespace Mall.WebApi.Controllers.TradePavilion
             }
         }
 
-
-
-
-
         /// <summary>
         /// 报名列表批量导出
         /// </summary>
@@ -3284,7 +3327,6 @@ namespace Mall.WebApi.Controllers.TradePavilion
         /// </summary>
         /// <returns></returns>
         [HttpGet]
-
         [HttpPost]
         public ApiResult GetPrizeDetails()
         {
@@ -3367,7 +3409,192 @@ namespace Mall.WebApi.Controllers.TradePavilion
             return flag ? ApiResult.Success() : ApiResult.Failed();
         }
 
-
         #endregion
+
+        /// <summary>
+        /// 获取楼宇分页列表
+        /// </summary>
+        /// <returns></returns>
+        [HttpPost]
+        public ApiResult GetBuildingPage()
+        {
+            JObject parms = JObject.Parse(RequestParm.msg.ToString());
+            ResultPageModel pageModel = new ResultPageModel()
+            {
+                pageIndex = parms.GetInt("pageIndex"),
+                pageSize = parms.GetInt("pageSize"),
+            };
+            RB_Building_Carrier_Extend query = new RB_Building_Carrier_Extend()
+            {
+                CarrierName = parms.GetStringValue("CarrierName"),
+                CategoryId = parms.GetInt("CategoryId"),
+                MallBaseId = RequestParm.MallBaseId,
+                TenantId = RequestParm.TenantId,
+            };
+            List<object> list = new List<object>();
+            var dataList = carrierModule.GetBuildingPageModule(pageModel.pageIndex, pageModel.pageSize, out long rowsCount, query);
+            foreach (var item in dataList)
+            {
+                list.Add(new
+                {
+                    item.ID,
+                    item.CarrierName,
+                    item.Logo,
+                    OpenTime= Common.ConvertHelper.FormatDate(item.OpenTime),
+                    item.Address,
+                    item.LatAndLon,
+                    item.Developers,
+                    item.CategoryId,
+                    item.CategoryName,
+                    item.LayersNum,
+                    CreateDate=Common.ConvertHelper.FormatTime(item.CreateDate),
+                });
+            }
+            pageModel.count = Convert.ToInt32(rowsCount);
+            pageModel.pageData = list;
+            return ApiResult.Success(data: pageModel);
+        }
+
+        /// <summary>
+        /// 新增修改楼宇
+        /// </summary>
+        /// <returns></returns>
+        [HttpPost]
+        public ApiResult SetBuilding()
+        {
+            JObject parms = JObject.Parse(RequestParm.msg.ToString());
+            RB_Building_Carrier_Extend extModel = new RB_Building_Carrier_Extend()
+            {
+                ID = parms.GetInt("ID"),
+                CarrierName = parms.GetStringValue("CarrierName"),
+                Logo = parms.GetStringValue("Logo"),
+                Honor=parms.GetStringValue("Honor"),
+                Developers = parms.GetStringValue("Developers"),
+                OpeningStatus=parms.GetInt("OpeningStatus"),
+                VideoUrl = parms.GetStringValue("VideoUrl"),
+                Address = parms.GetStringValue("Address"),
+                LatAndLon = parms.GetStringValue("LatAndLon"),
+                OpenTime = parms.GetDateTime("OpenTime"),
+                BuildingCarrierType=parms.GetInt("BuildingCarrierType"),
+                CategoryId = parms.GetInt("CategoryId"),
+                Ascription = parms.GetStringValue("Ascription"),
+                CarrierSize =parms.GetDecimal("CarrierSize"),
+                PropertyComposition=parms.GetStringValue("PropertyComposition"),
+                Location = parms.GetStringValue("Location"),
+                Crowd=parms.GetStringValue("Crowd"),
+                VisitorsFlowrate=parms.GetStringValue("VisitorsFlowrate"),
+                LayersNum=parms.GetStringValue("LayersNum"),
+                SupportingFacilities=parms.GetStringValue("SupportingFacilities"),
+                ManagementCompany=parms.GetStringValue("ManagementCompany"),
+                BrandDemand=parms.GetStringValue("BrandDemand"),
+            };
+            List<string> bannerList = new List<string>();
+            string BannerStr = parms.GetStringValue("Banner");
+            if (!string.IsNullOrEmpty(BannerStr))
+            {
+                try
+                {
+                    bannerList = Common.Plugin.JsonHelper.DeserializeObject<List<string>>(BannerStr);
+                }
+                catch
+                {
+
+                }
+            }
+            extModel.Banner = Common.Plugin.JsonHelper.Serialize(bannerList);
+            if (extModel.ID == 0)
+            {
+                extModel.TenantId = RequestParm.TenantId;
+                extModel.MallBaseId = RequestParm.MallBaseId;
+                extModel.CreateBy = RequestParm.TenantId;
+                extModel.CreateDate = DateTime.Now;
+            }
+            else
+            {
+                extModel.UpdateBy = RequestParm.TenantId;
+                extModel.UpdateDate = DateTime.Now;
+            }
+            bool flag = carrierModule.SetBuildingCarrierModule(extModel);
+            return flag ? ApiResult.Success() : ApiResult.Failed();
+        }
+
+        /// <summary>
+        /// 根据编号获取楼宇信息
+        /// </summary>
+        /// <returns></returns>
+        [HttpPost]
+        public ApiResult GetBuildingInfo()
+        {
+            JObject parms = JObject.Parse(RequestParm.msg.ToString());
+            int BuildingId = parms.GetInt("BuildingId");
+            if (BuildingId <= 0)
+            {
+                return ApiResult.ParamIsNull(message: "参数不能为空");
+            }
+            var extModel = carrierModule.GetBuildingModule(BuildingId);
+            List<string> Banner = new List<string>();
+            string BannerStr = extModel?.Banner ?? "";
+            if (!string.IsNullOrEmpty(BannerStr))
+            {
+                try
+                {
+                    Banner = Common.Plugin.JsonHelper.DeserializeObject<List<string>>(BannerStr);
+                }
+                catch
+                { 
+                
+                }
+            }
+            string CategoryName = "";
+            if ((extModel?.CategoryId ?? 0) > 0)
+            {
+                CategoryName = carrierModule.GetBrandClassModule((extModel?.CategoryId ?? 0))?.ClassName ?? "";
+            }
+            var dataObj = new
+            {
+                ID = extModel?.ID ?? 0,
+                CarrierName = extModel?.CarrierName ?? "",
+                Logo = extModel?.Logo ?? "",
+                Banner,
+                Honor=  extModel?.Honor??"",
+                Developers= extModel?.Developers??"",
+                OpeningStatus= extModel?.OpeningStatus??0,
+                VideoUrl= extModel?.VideoUrl??"",
+                Address = extModel?.Address ?? "",
+                LatAndLon = extModel?.LatAndLon ?? "",
+                OpenTime= Common.ConvertHelper.FormatDate(extModel?.OpenTime),
+                BuildingCarrierType=  extModel?.BuildingCarrierType??0,
+                CategoryId = extModel?.CategoryId ?? 0,
+                CategoryName,
+                Ascription = extModel?.Ascription ?? "",
+                CarrierSize = extModel?.CarrierSize ?? 0,
+                PropertyComposition = extModel?.PropertyComposition ?? "",
+                Location = extModel?.Location ?? "",
+                Crowd = extModel?.Crowd ?? "",
+                VisitorsFlowrate = extModel?.VisitorsFlowrate ?? "",
+                LayersNum = extModel?.LayersNum ?? "",
+                SupportingFacilities = extModel?.SupportingFacilities ?? "",
+                ManagementCompany = extModel?.ManagementCompany ?? "",
+                BrandDemand = extModel?.BrandDemand ?? "",
+            };
+            return ApiResult.Success(data: dataObj);
+        }
+
+        /// <summary>
+        /// 根据编号删除楼宇
+        /// </summary>
+        /// <returns></returns>
+        [HttpPost]
+        public ApiResult RemoveBuildingInfo()
+        {
+            JObject parms = JObject.Parse(RequestParm.msg.ToString());
+            int ID = parms.GetInt("ID");
+            if (ID <= 0)
+            {
+                return ApiResult.ParamIsNull(message: "参数不能为空");
+            }
+            var extModel = carrierModule.RemoveBuildingModule(ID);
+            return ApiResult.Success(data: extModel);
+        }
     }
 }
\ No newline at end of file

Mall.WebApi/Startup.cs

@@ -64,10 +64,7 @@ namespace Mall.WebApi
             {
                 corsArray.Add(item);
             }
- 
             services.AddCors(options => options.AddPolicy("AllowCors", policy => policy.AllowAnyHeader().AllowAnyMethod().AllowCredentials().WithOrigins(corsArray.ToArray())));
-
-
             string redisConnStr = $"{Common.Config.RedisServer},password={Common.Config.RedisPwd},connectTimeout=5000,allowAdmin=false,defaultDatabase=0";
             //Api限流
             services.AddApiThrottle(options =>