接口修改

Mall.Common/Enum/TradePavilion/BusinessExportEnum.cs

@@ -128,4 +128,93 @@ namespace Mall.Common.Enum.TradePavilion
         Other = 23,
        
     }
+
+
+    /// <summary>
+    /// 【商载通】品牌、企业服务下载枚举列表
+    /// </summary>
+    public enum BrandEnterpriseExportEnum
+    {
+        /// <summary>
+        /// 分类
+        /// </summary>
+        [EnumField("分类")]
+        CategoryId = 1,
+        /// <summary>
+        /// 品牌全名
+        /// </summary>
+        [EnumField("品牌全名")]
+        FullBrandName = 2,
+        /// <summary>
+        /// 品牌名
+        /// </summary>
+        [EnumField("品牌名")]
+        BrandName = 3,
+        /// <summary>
+        /// Logo
+        /// </summary>
+        [EnumField("Logo")]
+        Logo = 4,
+
+        /// <summary>
+        /// 品牌视频
+        /// </summary>
+        [EnumField("品牌视频")]
+        VideoUrl = 5,
+        /// <summary>
+        /// 店铺数量
+        /// </summary>
+        [EnumField("店铺数量")]
+        ShopNum = 6,
+        /// <summary>
+        /// 建筑面积
+        /// </summary>
+        [EnumField("建筑面积")]
+        BuiltUpArea = 7,
+        /// <summary>
+        /// 需求面积
+        /// </summary>
+        [EnumField("需求面积")]
+        AreaRequirement = 8,
+        /// <summary>
+        /// 客群定位
+        /// </summary>
+        [EnumField("客群定位")]
+        CustomerType = 9,
+        /// <summary>
+        /// 品牌定位
+        /// </summary>
+        [EnumField("品牌定位")]
+        BrandType = 10,
+
+        /// <summary>
+        /// 简介
+        /// </summary>
+        [EnumField("简介")]
+        Introduce =11,
+
+        /// <summary>
+        /// 发展意向
+        /// </summary>
+        [EnumField("发展意向")]
+        DevIntention = 12,
+
+        /// <summary>
+        /// 物业需求
+        /// </summary>
+        [EnumField("物业需求")]
+        PropertyDemand = 13,
+
+        /// <summary>
+        /// 合作条件
+        /// </summary>
+        [EnumField("合作条件")]
+        Cooperation =14,
+
+        /// <summary>
+        /// 配套需求
+        /// </summary>
+        [EnumField("配套需求")]
+        Complementary =15
+    }
 }

Mall.Common/Enum/TradePavilion/CarrierExportEnum.cs

@@ -86,4 +86,119 @@ namespace Mall.Common.Enum.TradePavilion
         [EnumField("地铁信息")]
         CarrierMetro = 15,
     }
+
+    /// <summary>
+    /// 载体、楼宇下载项目
+    /// </summary>
+    public enum BuildCarrierExportEnum {
+
+        /// <summary>
+        /// 项目名称
+        /// </summary>
+        [EnumField("项目名称")]
+        CarrierName = 1,
+
+        /// <summary>
+        /// Logo
+        /// </summary>
+        [EnumField("Logo")]
+        Logo = 2,
+
+        /// <summary>
+        /// 开发商
+        /// </summary>
+        [EnumField("开发商")]
+        Developers = 3,
+
+        /// <summary>
+        /// 载体视频
+        /// </summary>
+        [EnumField("载体视频")]
+        VideoUrl = 4,
+
+        /// <summary>
+        /// 项目地址
+        /// </summary>
+        [EnumField("项目地址")]
+        Address = 5,
+
+        /// <summary>
+        /// 开业时间
+        /// </summary>
+        [EnumField("开业时间")]
+        OpenTime = 6,
+
+        /// <summary>
+        /// 项目分类
+        /// </summary>
+        [EnumField("项目分类")]
+        CategoryType = 7,
+
+
+        /// <summary>
+        /// 项目分类
+        /// </summary>
+        [EnumField("资产权属")]
+        Ascription = 8,
+
+        /// <summary>
+        /// 项目面积
+        /// </summary>
+        [EnumField("项目面积")]
+        CarrierSize = 9,
+
+        /// <summary>
+        /// 物业构成
+        /// </summary>
+        [EnumField("物业构成")]
+        PropertyComposition = 10,
+
+        /// <summary>
+        /// 项目发展及定位
+        /// </summary>
+        [EnumField("项目发展及定位")]
+        Location = 11,
+
+        /// <summary>
+        /// 项目发展及定位
+        /// </summary>
+        [EnumField("周边人群结构特征")]
+        Crowd = 12,
+
+        /// <summary>
+        /// 人流量参数
+        /// </summary>
+        [EnumField("人流量参数")]
+        VisitorsFlowrate = 13,
+
+        /// <summary>
+        /// 商业楼层
+        /// </summary>
+        [EnumField("商业楼层")]
+        LayersNum = 14,
+
+        /// <summary>
+        /// 水电气及配套
+        /// </summary>
+        [EnumField("水电气及配套")]
+        SupportingFacilities = 15,
+
+        /// <summary>
+        /// 管理公司及管理费
+        /// </summary>
+        [EnumField("管理公司及管理费")]
+        ManagementCompany = 16,
+
+        /// <summary>
+        /// 目标招商业态及品牌需求
+        /// </summary>
+        [EnumField("目标招商业态及品牌需求")]
+        BrandDemand = 17,
+
+        /// <summary>
+        /// 地铁信息
+        /// </summary>
+        [EnumField("地铁信息")]
+        MetroInfo = 18,
+    }
 }

Mall.Module.TradePavilion/BuildingCarrierModule.cs

@@ -58,7 +58,32 @@ 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)
+        {
+            var list = building_CarrierRepository.GetBuildingCarrierListRepository(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 });
+                }
+                foreach (var item in list)
+                {
+                    item.BuildingCarriermetroList = metroList.Where(qitem => qitem.CarrierId == item.ID)?.ToList() ?? new List<RB_Building_Carriermetro_Extend>();
+                }
+            }
+            return list;
+        }
 
         /// <summary>
         /// 新增修改载体、楼宇
@@ -169,6 +194,17 @@ namespace Mall.Module.TradePavilion
             return list;
         }
 
+
+        /// <summary>
+        /// 【商载通】品牌、企业服务仓储层
+        /// </summary>
+        /// <param name="query"></param>
+        /// <returns></returns>
+        public List<RB_Brand_Enterprise_Extend> GetBrandEnterpriseListModule(RB_Brand_Enterprise_Extend query)
+        {
+            return brand_EnterpriseRepository.GetBrandEnterpriseListRepository(query);
+        }
+
         /// <summary>
         /// 新增修改品牌和企业服务
         /// </summary>

Mall.Repository/TradePavilion/RB_Brand_EnterpriseRepository.cs

@@ -62,5 +62,51 @@ WHERE 1=1
             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();
         }
+
+        /// <summary>
+        /// 【商载通】品牌、企业服务仓储层
+        /// </summary>
+        /// <param name="query"></param>
+        /// <returns></returns>
+        public List<RB_Brand_Enterprise_Extend> GetBrandEnterpriseListRepository( 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 (query.BrandEnterpriseType > 0)
+                {
+                    builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_Brand_Enterprise_Extend.BrandEnterpriseType), query.BrandEnterpriseType);
+                }
+                if (query.CategoryId > 0)
+                {
+                    builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_Brand_Enterprise_Extend.CategoryId), query.CategoryId);
+                }
+                if (query.UserId > 0)
+                {
+                    builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_Brand_Enterprise_Extend.UserId), query.UserId);
+                }
+                if (!string.IsNullOrEmpty(query.BrandName))
+                {
+                    builder.AppendFormat(" AND A.{0} LIKE @BrandName ", nameof(RB_Brand_Enterprise_Extend.BrandName));
+                    parameters.Add("@BrandName", "%" + query.BrandName + "%");
+                }
+            }
+            return Get<RB_Brand_Enterprise_Extend>(builder.ToString(), parameters).ToList();
+        }
     }
 }

Mall.Repository/TradePavilion/RB_Building_CarrierRepository.cs

@@ -124,16 +124,60 @@ WHERE 1=1
                 {
                     builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_Building_Carrier_Extend.MallBaseId), query.MallBaseId);
                 }
+                if (query.BuildingCarrierType > 0)
+                {
+                    builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_Building_Carrier_Extend.BuildingCarrierType), query.BuildingCarrierType);
+                }
                 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 (!string.IsNullOrWhiteSpace(query.Developers))
+                {
+                    builder.AppendFormat(" AND A.{0} LIKE @Developers ", nameof(RB_Building_Carrier_Extend.Developers));
+                    parameters.Add("@Developers", "%" + query.Developers.Trim() + "%");
+                }
+                if (query.OpeningStatus > -1)
+                {
+                    builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_Building_Carrier_Extend.OpeningStatus), query.OpeningStatus);
+                }
                 if (query.CategoryId > 0)
                 {
                     builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_Building_Carrier_Extend.CategoryId), query.CategoryId);
                 }
+                if (!string.IsNullOrEmpty(query.QStartDate))
+                {
+                    builder.AppendFormat(" AND A.{0}>='{1}' ", nameof(RB_Building_Carrier_Extend.OpenTime), query.QStartDate);
+                }
+                if (!string.IsNullOrEmpty(query.QEndDate))
+                {
+                    builder.AppendFormat(" AND A.{0}<='{1} 23:59:59' ", nameof(RB_Building_Carrier_Extend.OpenTime), query.QEndDate);
+                }
+                if (query.MetroNum > 0 || !string.IsNullOrWhiteSpace(query.MetroName))
+                {
+                    builder.Append($" AND A.{nameof(RB_Building_Carrier_Extend.ID)} IN (SELECT CarrierId FROM RB_Building_Carriermetro WHERE `Status`=0  ");
+                    if (query.MetroNum > 0)
+                    {
+                        builder.Append($" AND {nameof(RB_Building_Carriermetro.MetroNum)} = {query.MetroNum}");
+                    }
+                    if (!string.IsNullOrWhiteSpace(query.MetroName))
+                    {
+                        builder.Append($" AND {nameof(RB_Building_Carriermetro.MetroName)} LIKE @MetroName ");
+                        parameters.Add("@MetroName", "%" + query.MetroName.Trim() + "%");
+                    }
+                    builder.Append(" )");
+                }
+                if (query.QShopType == 1)
+                {
+                    builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_Building_Carrier_Extend.IsChengDu), 1);
+                }
+                if (query.QShopType == 2)
+                {
+                    builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_Building_Carrier_Extend.OpenTime), 0);
+                }
             }
+            builder.AppendFormat(" ORDER BY A.ID DESC ");
             return Get<RB_Building_Carrier_Extend>(builder.ToString(), parameters).ToList();
         }
     }

Mall.WebApi/Controllers/TradePavilion/AppletTradeController.cs

-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
-using Dnc.Api.Throttle;
+using Dnc.Api.Throttle;
 using Mall.CacheManager.User;
 using Mall.Common;
 using Mall.Common.API;
@@ -15,10 +11,12 @@ using Mall.Module.TradePavilion;
 using Mall.WebApi.Filter;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Cors;
-using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
+using System;
+using System.Collections.Generic;
+using System.Linq;
 
 namespace Mall.WebApi.Controllers.TradePavilion
 {