111

Mall.Model/Entity/TradePavilion/RB_Brand.cs

-using System;
-using System.Collections.Generic;
-using System.Text;
-using Mall.Common.Enum;
+using Mall.Common.Enum;
 using Mall.Common.Enum.TradePavilion;
+using System;
 using VT.FW.DB;
 
 namespace Mall.Model.Entity.TradePavilion
@@ -218,8 +216,6 @@ namespace Mall.Model.Entity.TradePavilion
         /// </summary>
         public decimal OpenShopWish { get; set; }
 
-
-
         /// <summary>
         /// 是否已在成都落地 0-否，1-是，-1未填写
         /// </summary>

Mall.Model/Entity/TradePavilion/RB_Brand_Enterprise.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_Brand_Enterprise
+    {
+        /// <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>
+        /// logo
+        /// </summary>
+        public string Logo { get; set; }
+
+
+        /// <summary>
+        /// 品牌介绍图
+        /// </summary>
+        public string Banner { get; set; }
+
+        /// <summary>
+        /// 品牌视频
+        /// </summary>
+        public string VideoUrl { get; set; }
+        /// <summary>
+        /// 品牌全名
+        /// </summary>
+        public string FullBrandName { get; set; }
+
+
+        /// <summary>
+        /// 品牌名称
+        /// </summary>
+        public string BrandName { get; set; }
+
+        /// <summary>
+        /// 店铺数量
+        /// </summary>
+        public int ShopNum { get; set; }
+
+        /// <summary>
+        /// 建筑面积
+        /// </summary>
+        public decimal BuiltUpArea { get; set; }
+
+        /// <summary>
+        /// 建筑面积
+        /// </summary>
+        public decimal EndBuiltUpArea { get; set; }
+
+        /// <summary>
+        /// 品牌定位
+        /// </summary>
+        public string BrandType { get; set; }
+
+        /// <summary>
+        /// 客户群体
+        /// </summary>
+        public string CustomerType { get; set; }
+
+        /// <summary>
+        /// 扩店区域
+        /// </summary>
+        public string StoreExpansion { get; set; }
+
+        /// <summary>
+        /// 性质
+        /// </summary>
+        public ProjectTypeEnum? ProjectType { get; set; }
+
+        /// <summary>
+        /// 面积要求
+        /// </summary>
+        public decimal AreaRequirement { get; set; }
+
+        /// <summary>
+        /// 面积要求
+        /// </summary>
+        public decimal EndAreaRequirement { get; set; }
+
+
+        /// <summary>
+        /// 广告
+        /// </summary>
+        public string Advertising { get; set; }
+
+        /// <summary>
+        /// 其他
+        /// </summary>
+        public string Other { get; set; }
+
+
+        /// <summary>
+        /// 店铺开口尺寸（0-否1-有）
+        /// </summary>
+        public int IsShopSize { get; set; }
+        /// <summary>
+        /// 店铺开口尺寸
+        /// </summary>
+        public string ShopSize { get; set; }
+
+        /// <summary>
+        /// 上下水（0-否1-有）
+        /// </summary>
+        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 RanQiBZ { get; set; }
+        /// <summary>
+        /// 电量
+        /// </summary>
+        public string DianLiang { get; set; }
+
+
+        /// <summary>
+        /// /电量（0-否1-有）
+        /// </summary>
+        public int IsDianLiang { get; set; }
+        /// <summary>
+        /// 排烟量（0-否1-有）
+        /// </summary>
+        public int PaiYan { get; set; }
+
+        /// <summary>
+        /// 排烟量
+        /// </summary>
+        public string PaiYanBZ { get; set; }
+
+        /// <summary>
+        /// 空调（0-否1-有）
+        /// </summary>
+        public int KongTiao { get; set; }
+
+        /// <summary>
+        /// 新风（0-否1-有）
+        /// </summary>
+        public int XinFeng { get; set; }
+
+        /// <summary>
+        /// 品牌分类Id
+        /// </summary>
+        public int BrandClassId { get; set; }
+
+        /// <summary>
+        /// 归属于用户
+        /// </summary>
+        public int UserId { get; set; }
+
+        /// <summary>
+        /// 开店意愿（打分制）
+        /// </summary>
+        public decimal OpenShopWish { get; set; }
+
+        /// <summary>
+        /// 是否已在成都落地 0-否，1-是，-1未填写
+        /// </summary>
+        public int? IsInChengdu { get; set; }
+        
+        /// <summary>
+        /// 奖项来源ids
+        /// </summary>
+        public string SourceIds { get; set; }
+
+        /// <summary>
+        /// 分类ID
+        /// </summary>
+        public int CategoryId { get; set; }
+
+        /// <summary>
+        /// 类型(1-品牌,2-企业服务)
+        /// </summary>
+        public int BrandEnterpriseType { get; set; }
+
+        /// <summary>
+        /// 品牌简介/企业简介
+        /// </summary>
+        public string Introduce { get; set; }
+
+        /// <summary>
+        /// 发展意向
+        /// </summary>
+        public string DevIntention { get; set; }
+    }
+}

Mall.Model/Extend/TradePavilion/RB_Brand_Enterprise_Extend.cs

+using Mall.Model.Entity.TradePavilion;
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace Mall.Model.Extend.TradePavilion
+{
+    /// <summary>
+    /// 【商载通】 品牌、企业服务 扩展 实体表
+    /// </summary>
+    public class RB_Brand_Enterprise_Extend: RB_Brand_Enterprise
+    {
+
+    }
+}

Mall.Module.TradePavilion/BuildingCarrierModule.cs

 using Mall.Common.Enum;
 using Mall.Model.Extend.TradePavilion;
 using Mall.Repository.TradePavilion;
+using RabbitMQ.Client.Framing.Impl;
 using System;
 using System.Collections.Generic;
 using System.Linq;
 using VT.FW.DB;
+using static ICSharpCode.SharpZipLib.Zip.ExtendedUnixData;
 
 namespace Mall.Module.TradePavilion
 {
     /// <summary>
-    /// 载体处理类
+    /// 宜宾商载通新方法处理类
     /// </summary>
     public class BuildingCarrierModule
     {
-        
-
         /// <summary>
         /// 【商载通】楼宇、载体仓储层
         /// </summary>
-        private readonly RB_Building_CarrierRepository  building_CarrierRepository = new RB_Building_CarrierRepository();
+        private readonly RB_Building_CarrierRepository building_CarrierRepository = new RB_Building_CarrierRepository();
         /// <summary>
         /// 【商载通】楼宇、载体地铁仓储层
         /// </summary>
         private readonly RB_Building_CarriermetroRepository building_CarriermetroRepository = new RB_Building_CarriermetroRepository();
 
-        
+        /// <summary>
+        /// 【商载通】 品牌、企业服务仓储层
+        /// </summary>
+        private readonly RB_Brand_EnterpriseRepository brand_EnterpriseRepository = new RB_Brand_EnterpriseRepository();
 
         /// <summary>
-        /// 获取楼宇分页列表
+        /// 获取载体、楼宇分页列表
         /// </summary>
         /// <param name="pageIndex"></param>
         /// <param name="pageSize"></param>
@@ -36,14 +39,14 @@ namespace Mall.Module.TradePavilion
         /// <returns></returns>
         public List<RB_Building_Carrier_Extend> GetBuildingCarrierPageModule(int pageIndex, int pageSize, out long rowsCount, RB_Building_Carrier_Extend query)
         {
-            var list= building_CarrierRepository.GetBuildingCarrierPageRepository(pageIndex, pageSize, out rowsCount, query);
+            var list = building_CarrierRepository.GetBuildingCarrierPageRepository(pageIndex, pageSize, out rowsCount, query);
             if (list != null && list.Count > 0)
             {
                 string Ids = string.Join(",", list.Select(qitem => qitem.ID));
                 List<RB_Building_Carriermetro_Extend> metroList = new List<RB_Building_Carriermetro_Extend>();
                 if (!string.IsNullOrEmpty(Ids))
                 {
-                    metroList= building_CarriermetroRepository.GetBuildingCarrierMetroListRepository(new RB_Building_Carriermetro_Extend() { CarrierIds = Ids });
+                    metroList = building_CarriermetroRepository.GetBuildingCarrierMetroListRepository(new RB_Building_Carriermetro_Extend() { CarrierIds = Ids });
                 }
                 foreach (var item in list)
                 {
@@ -51,27 +54,16 @@ namespace Mall.Module.TradePavilion
                 }
             }
             return list;
-        }
-
+        } 
 
         /// <summary>
-        /// 获取楼宇列表
-        /// </summary>
-        /// <param name="query"></param>
-        /// <returns></returns>
-        public List<RB_Building_Carrier_Extend> GetBuildingCarrierListModule(RB_Building_Carrier_Extend query)
-        {
-            return building_CarrierRepository.GetBuildingCarrierListRepository(query);
-        }
-
-        /// <summary>
-        /// 新增修改楼宇
+        /// 新增修改载体、楼宇
         /// </summary>
         /// <param name="extModel"></param>
         /// <returns></returns>
         public bool SetBuildingCarrierModule(RB_Building_Carrier_Extend extModel)
         {
-            bool flag = false;
+            bool flag;
             if (extModel.ID > 0)
             {
                 Dictionary<string, object> fileds = new Dictionary<string, object>()
@@ -112,7 +104,7 @@ namespace Mall.Module.TradePavilion
 
             if (flag)
             {
-                var oldCarrierMetroList = building_CarriermetroRepository.GetBuildingCarrierMetroListRepository(new  RB_Building_Carriermetro_Extend { TenantId = extModel.TenantId, MallBaseId = extModel.MallBaseId, CarrierId = extModel.ID });
+                var oldCarrierMetroList = building_CarriermetroRepository.GetBuildingCarrierMetroListRepository(new RB_Building_Carriermetro_Extend { TenantId = extModel.TenantId, MallBaseId = extModel.MallBaseId, CarrierId = extModel.ID });
                 building_CarriermetroRepository.DeleteBatch(oldCarrierMetroList);
                 foreach (var item in extModel.BuildingCarriermetroList)
                 {
@@ -128,7 +120,7 @@ namespace Mall.Module.TradePavilion
         }
 
         /// <summary>
-        /// 删除楼宇
+        /// 删除载体、楼宇
         /// </summary>
         /// <param name="ID"></param>
         /// <returns></returns>
@@ -144,7 +136,7 @@ namespace Mall.Module.TradePavilion
         }
 
         /// <summary>
-        /// 根据编号获取楼宇详情
+        /// 根据编号获取载体、楼宇详情
         /// </summary>
         /// <param name="ID"></param>
         /// <returns></returns>
@@ -158,5 +150,74 @@ namespace Mall.Module.TradePavilion
             }
             return extModel;
         }
+
+        /// <summary>
+        /// 【商载通】品牌、企业服务仓储层
+        /// </summary>
+        /// <param name="pageIndex"></param>
+        /// <param name="pageSize"></param>
+        /// <param name="rowsCount"></param>
+        /// <param name="query"></param>
+        /// <returns></returns>
+        public List<RB_Brand_Enterprise_Extend> GetBrandEnterprisePageModule(int pageIndex, int pageSize, out long rowsCount, RB_Brand_Enterprise_Extend query)
+        {
+            var list = brand_EnterpriseRepository.GetBrandEnterprisePageRepository(pageIndex, pageSize, out rowsCount, query);
+            return list;
+        }
+
+        /// <summary>
+        /// 新增修改品牌和企业服务
+        /// </summary>
+        /// <param name="model"></param>
+        /// <returns></returns>
+        public bool SetBrandEnterpriseModule(RB_Brand_Enterprise_Extend model)
+        {
+            bool flag;
+            if (model.ID > 0)
+            {
+                Dictionary<string, object> fileds = new Dictionary<string, object>()
+                {
+                    { nameof(RB_Brand_Enterprise_Extend.BrandName),model.BrandName},
+                    { nameof(RB_Brand_Enterprise_Extend.FullBrandName),model.FullBrandName},
+                    { nameof(RB_Brand_Enterprise_Extend.VideoUrl),model.VideoUrl},
+                    { nameof(RB_Brand_Enterprise_Extend.VideoUrl),model.VideoUrl},
+                };
+                flag = brand_EnterpriseRepository.Update(fileds, new WhereHelper(nameof(RB_Brand_Enterprise_Extend.ID), model.ID));
+            }
+            else
+            {
+                var newId = brand_EnterpriseRepository.Insert(model);
+                model.ID = newId;
+                flag = newId > 0;
+            }
+            return flag;
+        }
+
+        /// <summary>
+        /// 根据编号获取品牌和企业服务
+        /// </summary>
+        /// <param name="ID"></param>
+        /// <returns></returns>
+        public RB_Brand_Enterprise_Extend GetBrandEnterpriseModule(int ID)
+        {
+            var extModel = brand_EnterpriseRepository.GetEntity<RB_Brand_Enterprise_Extend>(ID);
+            return extModel;
+        }
+
+        /// <summary>
+        /// 根据编号删除品牌和企业服务
+        /// </summary>
+        /// <param name="ID"></param>
+        /// <returns></returns>
+        public bool RemoveBrandEnterpriseModule(int ID)
+        {
+            Dictionary<string, object> fileds = new Dictionary<string, object>()
+            {
+                {nameof(RB_Brand_Enterprise_Extend.Status), (int)DateStateEnum.Delete},
+                {nameof(RB_Brand_Enterprise_Extend.UpdateDate),DateTime.Now },
+            };
+            bool flag = brand_EnterpriseRepository.Update(fileds, new WhereHelper(nameof(RB_Brand_Enterprise_Extend.ID), ID));
+            return flag;
+        }
     }
 }

Mall.Repository/TradePavilion/RB_Brand_EnterpriseRepository.cs

+using Mall.Model.Entity.TradePavilion;
+using Mall.Model.Extend.TradePavilion;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using VT.FW.DB.Dapper;
+
+namespace Mall.Repository.TradePavilion
+{
+    /// <summary>
+    /// 【商载通】 品牌、企业服务仓储层
+    /// </summary>
+    public class RB_Brand_EnterpriseRepository:BaseRepository<RB_Brand_Enterprise>
+    {
+        /// <summary>
+        /// 【商载通】品牌、企业服务仓储层
+        /// </summary>
+        /// <param name="pageIndex"></param>
+        /// <param name="pageSize"></param>
+        /// <param name="rowsCount"></param>
+        /// <param name="query"></param>
+        /// <returns></returns>
+        public List<RB_Brand_Enterprise_Extend> GetBrandEnterprisePageRepository(int pageIndex, int pageSize, out long rowsCount, RB_Brand_Enterprise_Extend query)
+        {
+            DynamicParameters parameters = new DynamicParameters();
+            StringBuilder builder = new StringBuilder();
+
+            builder.AppendFormat(@"
+SELECT A.*,IFNULL(B.ClassName,'') AS CategoryName 
+FROM rb_brand_Enterprise AS A LEFT JOIN rb_brandclass AS B ON A.CategoryId=B.ID
+WHERE 1=1
+");
+
+            if (query != null)
+            {
+                if (query.TenantId > 0)
+                {
+                    builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_Brand_Enterprise_Extend.TenantId), query.TenantId);
+                }
+                if (query.MallBaseId > 0)
+                {
+                    builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_Brand_Enterprise_Extend.MallBaseId), query.MallBaseId);
+                }
+                if (!string.IsNullOrEmpty(query.BrandName))
+                {
+                    builder.AppendFormat(" AND A.{0} LIKE @BrandName ", nameof(RB_Brand_Enterprise_Extend.BrandName));
+                    parameters.Add("@BrandName", "%" + query.BrandName + "%");
+                }
+            }
+            builder.AppendFormat(" ORDER BY A.{0} DESC ", nameof(RB_Brand_Enterprise_Extend.ID));
+            return GetPage<RB_Brand_Enterprise_Extend>(pageIndex, pageSize, out rowsCount, builder.ToString(),parameters).ToList();
+        }
+    }
+}

Mall.WebApi/Controllers/TradePavilion/TradeController.cs

@@ -3460,6 +3460,7 @@ namespace Mall.WebApi.Controllers.TradePavilion
                     {
                         qitem.MetroNum,
                         qitem.MetroName,
+                        qitem.Distance,
                     })
                 });
             }