Merge branch 'master' of http://gitlab.oytour.com/Kui2/mall.oytour.com

Mall.Common/Enum/TradePavilion/SZTBusinessExportEnum.cs

+using System;
+using System.Collections.Generic;
+using System.Text;
+using Mall.Common.Plugin;
+
+namespace Mall.Common.Enum.TradePavilion
+{
+    /// <summary>
+    /// 品牌下载枚举列表
+    /// </summary>
+    public enum SZTBusinessExportEnum
+    {
+
+        /// <summary>
+        /// 品牌全名
+        /// </summary>
+        [EnumField("品牌全名")]
+        FullBrandName = 1,
+        /// <summary>
+        /// 品牌名
+        /// </summary>
+        [EnumField("品牌名")]
+        BrandName = 2,
+
+        /// <summary>
+        /// 品牌视频
+        /// </summary>
+        [EnumField("品牌视频")]
+        VideoUrl = 3,
+        /// <summary>
+        /// Logo
+        /// </summary>
+        [EnumField("Logo")]
+        Logo = 4,
+
+
+        /// <summary>
+        /// 品牌分类
+        /// </summary>
+        [EnumField("品牌分类")]
+        CategoryId = 5,
+        /// <summary>
+        /// 品牌简介
+        /// </summary>
+        [EnumField("品牌简介")]
+        Introduce = 6,
+
+
+        /// <summary>
+        /// 店铺数量
+        /// </summary>
+        [EnumField("店铺数量")]
+        ShopNum = 7,
+        /// <summary>
+        /// 建筑面积
+        /// </summary>
+        [EnumField("建筑面积")]
+        BuiltUpArea = 8,
+        /// <summary>
+        /// 需求面积
+        /// </summary>
+        [EnumField("需求面积")]
+        AreaRequirement = 9,
+        /// <summary>
+        /// 客群定位
+        /// </summary>
+        [EnumField("客群定位")]
+        CustomerType = 10,
+        /// <summary>
+        /// 品牌定位
+        /// </summary>
+        [EnumField("品牌定位")]
+        BrandType = 11,
+        /// <summary>
+        /// 合作条件
+        /// </summary>
+        [EnumField("合作条件")]
+        Cooperation = 12,
+        /// <summary>
+        /// 物业需求
+        /// </summary>
+        [EnumField("物业需求")]
+        PropertyDemand = 13,
+        /// <summary>
+        /// 配套需求
+        /// </summary>
+        [EnumField("配套需求")]
+        Complementary = 14,
+        /// <summary>
+        /// 联系人
+        /// </summary>
+        [EnumField("联系人")]
+        ContactName = 15,
+        /// <summary>
+        /// 联系电话
+        /// </summary>
+        [EnumField("联系电话")]
+        ContactPhone = 16,
+
+    }
+
+
+    /// <summary>
+    /// 【商载通】企业服务下载枚举列表
+    /// </summary>
+    public enum SZTBrandServicesExportEnum
+    {
+        /// <summary>
+        /// 企业名称
+        /// </summary>
+        [EnumField("企业名称")]
+        Name = 1,
+        /// <summary>
+        /// LOGO
+        /// </summary>
+        [EnumField("LOGO")]
+        Banner = 2,
+        /// <summary>
+        /// 企业简介
+        /// </summary>
+        [EnumField("企业简介")]
+        Introduction = 3,
+        /// <summary>
+        /// 企业类别
+        /// </summary>
+        [EnumField("企业类别")]
+        EType = 4,
+
+        /// <summary>
+        /// 意向楼宇等级
+        /// </summary>
+        [EnumField("意向楼宇等级")]
+        CategoryId = 5,
+        /// <summary>
+        /// 意向楼宇位置
+        /// </summary>
+        [EnumField("意向楼宇位置")]
+        Address = 6,
+        /// <summary>
+        /// 经纬度
+        /// </summary>
+        [EnumField("经纬度")]
+        LatAndLon = 7,
+        /// <summary>
+        /// 投运时间
+        /// </summary>
+        [EnumField("投运时间")]
+        OperationTime = 8,
+        /// <summary>
+        /// 企业发展意向
+        /// </summary>
+        [EnumField("企业发展意向")]
+        DevIntention = 9,
+        /// <summary>
+        /// 楼宇装修
+        /// </summary>
+        [EnumField("楼宇装修")]
+        Renovation = 10,
+
+        /// <summary>
+        /// 支付方式
+        /// </summary>
+        [EnumField("支付方式")]
+        Payment = 11,
+
+        /// <summary>
+        /// 交房日期
+        /// </summary>
+        [EnumField("交房日期")]
+        HandoverDate = 12,
+
+        /// <summary>
+        /// 意向楼层
+        /// </summary>
+        [EnumField("意向楼层")]
+        IntentionalFloor = 13,
+
+        /// <summary>
+        /// 电梯数
+        /// </summary>
+        [EnumField("电梯数")]
+        ElevatorNum = 14,
+
+        /// <summary>
+        /// 物业费
+        /// </summary>
+        [EnumField("物业费")]
+        PropertyFee = 15,
+
+        /// <summary>
+        /// 月租金
+        /// </summary>
+        [EnumField("月租金")]
+        RentFee = 16,
+       
+        /// <summary>
+        /// 联系人名字
+        /// </summary>
+        [EnumField("联系人名字")]
+        ContactName = 17,
+        /// <summary>
+        /// 联系人电话
+        /// </summary>
+        [EnumField("联系人电话")]
+        ContactPhone = 18
+    }
+}

Mall.Common/Enum/TradePavilion/SZTCarrierExportEnum.cs

+using System;
+using System.Collections.Generic;
+using System.Text;
+using Mall.Common.Plugin;
+
+namespace Mall.Common.Enum.TradePavilion
+{
+    /// <summary>
+    /// 载体
+    /// </summary>
+    public enum SZTCarrierExportEnum
+    {
+        /// <summary>
+        /// 项目名称
+        /// </summary>
+        [EnumField("项目名称")]
+        CarrierName = 1,
+        /// <summary>
+        /// Logo
+        /// </summary>
+        [EnumField("Logo")]
+        Logo = 2,
+        /// <summary>
+        /// 载体视频
+        /// </summary>
+        [EnumField("载体视频")]
+        VideoUrl = 3,
+
+
+        /// <summary>
+        /// 项目位置
+        /// </summary>
+        [EnumField("项目位置")]
+        Address = 4,
+
+        /// <summary>
+        /// 开业状态
+        /// </summary>
+        [EnumField("开业状态")]
+        OpeningStatus = 5,
+
+
+        /// <summary>
+        /// 商业体量
+        /// </summary>
+        [EnumField("商业体量")]
+        CarrierSize = 6,
+
+        /// <summary>
+        /// 商业层数
+        /// </summary>
+        [EnumField("商业层数")]
+        LayersNum = 7,
+
+        /// <summary>
+        /// 车位数量
+        /// </summary>
+        [EnumField("车位数量")]
+        CarNum = 8,
+
+
+        /// <summary>
+        /// 经营面积
+        /// </summary>
+        [EnumField("经营面积")]
+        BuiltUpArea = 9,
+
+
+        /// <summary>
+        /// 可租赁面积
+        /// </summary>
+        [EnumField("可租赁面积")]
+        AreaRequirement = 10,
+        /// <summary>
+        /// 开业时间
+        /// </summary>
+        [EnumField("开业时间")]
+        OpenTime = 11,
+        /// <summary>
+        /// 人流量参数
+        /// </summary>
+        [EnumField("人流量参数")]
+        VisitorsFlowrate = 12,
+        /// <summary>
+        /// 水电气及配套
+        /// </summary>
+        [EnumField("水电气及配套")]
+        SupportingFacilities = 13,
+        /// <summary>
+        /// 管理公司及管理费
+        /// </summary>
+        [EnumField("管理公司及管理费")]
+        ManagementCompany = 14,
+        /// <summary>
+        /// 开发商
+        /// </summary>
+        [EnumField("开发商")]
+        Developers = 15,
+        /// <summary>
+        /// 物业构成
+        /// </summary>
+        [EnumField("物业构成")]
+        CategoryId = 16,
+        /// <summary>
+        /// 资产权属
+        /// </summary>
+        [EnumField("资产权属")]
+        Ascription = 17,
+        /// <summary>
+        /// 业态规划
+        /// </summary>
+        [EnumField("业态规划")]
+        CarrierPlan = 18,
+        /// <summary>
+        /// 目标招商业态及品牌需求
+        /// </summary>
+        [EnumField("目标招商业态及品牌需求")]
+        BrandDemand = 19,
+
+
+        /// <summary>
+        /// 项目发展及定位
+        /// </summary>
+        [EnumField("项目发展及定位")]
+        Location = 20,
+
+
+        /// <summary>
+        /// 联系人
+        /// </summary>
+        [EnumField("联系人")]
+        ContactName = 21,
+
+
+        /// <summary>
+        /// 联系电话
+        /// </summary>
+        [EnumField("联系电话")]
+        ContactPhone = 22,
+
+    }
+
+    /// <summary>
+    /// 楼宇下载项目
+    /// </summary>
+    public enum SZTBuildExportEnum
+    {
+
+        /// <summary>
+        /// 楼宇名称
+        /// </summary>
+        [EnumField("楼宇名称")]
+        Name = 1,
+
+        /// <summary>
+        /// Logo
+        /// </summary>
+        [EnumField("Logo")]
+        Logo = 2,
+
+        /// <summary>
+        /// 楼宇位置
+        /// </summary>
+        [EnumField("楼宇位置")]
+        Address = 3,
+
+        /// <summary>
+        /// 经纬度
+        /// </summary>
+        [EnumField("经纬度")]
+        LatAndLon = 4,
+
+        /// <summary>
+        /// 投运时间
+        /// </summary>
+        [EnumField("投运时间")]
+        OperationTime = 5,
+
+        /// <summary>
+        /// 楼宇等级
+        /// </summary>
+        [EnumField("楼宇等级")]
+        CategoryId = 6,
+
+        /// <summary>
+        /// 楼宇建筑面积
+        /// </summary>
+        [EnumField("楼宇建筑面积")]
+        Areas = 7,
+
+
+        /// <summary>
+        /// 楼栋数
+        /// </summary>
+        [EnumField("楼栋数")]
+        BuildingNum = 8,
+
+        /// <summary>
+        /// 楼层数
+        /// </summary>
+        [EnumField("楼层数")]
+        FloorNum = 9,
+
+        /// <summary>
+        /// 电梯数
+        /// </summary>
+        [EnumField("电梯数")]
+        ElevatorNum = 10,
+
+        /// <summary>
+        /// 层高
+        /// </summary>
+        [EnumField("层高")]
+        FloorHeight = 11,
+
+        /// <summary>
+        /// 开发商
+        /// </summary>
+        [EnumField("开发商")]
+        Developers = 12,
+
+        /// <summary>
+        /// 物业公司
+        /// </summary>
+        [EnumField("物业公司")]
+        PropertyComp = 13,
+
+        /// <summary>
+        /// 销售自持比例
+        /// </summary>
+        [EnumField("销售自持比例")]
+        SaleOrSelf = 14,
+
+        /// <summary>
+        /// 是否统一运营
+        /// </summary>
+        [EnumField("是否统一运营")]
+        IsAllOperate = 15,
+
+        /// <summary>
+        /// 建设时间
+        /// </summary>
+        [EnumField("建设时间")]
+        ConstructionTime = 16,
+
+        /// <summary>
+        /// 物业费
+        /// </summary>
+        [EnumField("物业费")]
+        PropertyFee = 17,
+
+        /// <summary>
+        /// 月租金
+        /// </summary>
+        [EnumField("月租金")]
+        RentFee = 18,
+
+        /// <summary>
+        /// 产业方向
+        /// </summary>
+        [EnumField("产业方向")]
+        IndustryDirection = 19,
+
+        /// <summary>
+        /// 目标企业招引需求
+        /// </summary>
+        [EnumField("目标企业招引需求")]
+        BrandDemand = 20,
+
+
+        /// <summary>
+        /// 其他需求
+        /// </summary>
+        [EnumField("其他需求")]
+        Other = 21,
+
+        /// <summary>
+        /// 联系人
+        /// </summary>
+        [EnumField("联系人")]
+        ContactName = 22,
+        /// <summary>
+        /// 联系电话
+        /// </summary>
+        [EnumField("联系电话")]
+        ContactPhone = 23,
+    }
+
+
+
+}

Mall.Module.TradePavilion/BuildingCarrierModule.cs

@@ -411,6 +411,32 @@ namespace Mall.Module.TradePavilion
             return list;
         }
 
+        /// <summary>
+        /// 获取活力楼宇分页列表
+        /// </summary>
+        /// <param name="pageIndex"></param>
+        /// <param name="pageSize"></param>
+        /// <param name="rowsCount"></param>
+        /// <param name="query"></param>
+        /// <returns></returns>
+        public List<RB_Building_Extend> GetBuildingModule(RB_Building_Extend query)
+        {
+            var list = buildingRepository.GetBuildingRepository(query);
+            if (list != null && list.Any())
+            {
+                foreach (var item in list)
+                {
+
+                    item.BannerList = new List<string>();
+                    if (!string.IsNullOrWhiteSpace(item.Banner))
+                    {
+                        item.BannerList = Newtonsoft.Json.JsonConvert.DeserializeObject<List<string>>(item.Banner);
+                    }
+                }
+            }
+            return list;
+        }
+
         /// <summary>
         /// 新增修改活力楼宇
         /// </summary>
@@ -517,7 +543,7 @@ namespace Mall.Module.TradePavilion
         public List<RB_EnterpriseServices_Extend> GetEnterpriseServicesPageModule(int pageIndex, int pageSize, out long rowsCount, RB_EnterpriseServices_Extend query)
         {
             var list = enterpriseServicesRepository.GetEnterpriseServicesPageRepository(pageIndex, pageSize, out rowsCount, query);
-            if (list!=null&&list.Any())
+            if (list != null && list.Any())
             {
                 foreach (var item in list)
                 {
@@ -527,11 +553,35 @@ namespace Mall.Module.TradePavilion
                         item.BannerList = Newtonsoft.Json.JsonConvert.DeserializeObject<List<string>>(item.Banner);
                     }
                 }
-                
+
             }
             return list;
         }
 
+        /// <summary>
+        /// 获取企业服务列表
+        /// </summary>
+        /// <param name="query"></param>
+        /// <returns></returns>
+        public List<RB_EnterpriseServices_Extend> GetEnterpriseServicesModule(RB_EnterpriseServices_Extend query)
+        {
+            var list = enterpriseServicesRepository.GetEnterpriseServicesListRepository(query);
+            if (list != null && list.Any())
+            {
+                foreach (var item in list)
+                {
+                    item.BannerList = new List<string>();
+                    if (!string.IsNullOrWhiteSpace(item?.Banner ?? ""))
+                    {
+                        item.BannerList = Newtonsoft.Json.JsonConvert.DeserializeObject<List<string>>(item.Banner);
+                    }
+                }
+
+            }
+            return list;
+        }
+
+
         /// <summary>
         /// 新增修改企业服务
         /// </summary>

Mall.Repository/TradePavilion/RB_EnterpriseServicesRepository.cs

@@ -70,8 +70,9 @@ WHERE 1=1
             DynamicParameters parameters = new DynamicParameters();
             StringBuilder builder = new StringBuilder();
             builder.AppendFormat(@"
-SELECT A.*,IFNULL(B.ClassName,'') AS CategoryName
+SELECT A.*,IFNULL(B.ClassName,'') AS CategoryName,IFNULL(C.ClassName,'') AS ETypeName
 FROM rb_enterpriseservices AS A LEFT JOIN rb_brandclass AS B ON A.CategoryId=B.ID
+     LEFT JOIN rb_brandclass AS C ON A.EType=C.ID
 WHERE 1=1
 ");
             builder.AppendFormat(@" AND A.{0}={1} ", nameof(RB_EnterpriseServices_Extend.Status), (int)DateStateEnum.Normal);

Mall.WebApi/Controllers/TradePavilion/AppletTradeController.cs

@@ -3384,6 +3384,110 @@ namespace Mall.WebApi.Controllers.TradePavilion
         }
 
 
+        /// <summary>
+        /// 修改企业
+        /// </summary>
+        /// <returns></returns>
+        [HttpPost]
+        public ApiResult SetEnterpriseServicesUpdate()
+        {
+            var userInfo = AppletUserInfo;
+            RB_EnterpriseServices_Extend query = JsonConvert.DeserializeObject<RB_EnterpriseServices_Extend>(RequestParm.msg.ToString());
+
+            if (query.ServiceId <= 0)
+            {
+                return ApiResult.ParamIsNull("请传递企业id");
+            }
+            if (string.IsNullOrWhiteSpace(query.Name))
+            {
+                return ApiResult.Failed("请输入企业名称");
+            }
+            if (query.CategoryId == 0)
+            {
+                return ApiResult.Failed("请选择企业类别");
+            }
+            if (query.BannerList != null && query.BannerList.Any())
+            {
+                query.Banner = JsonConvert.SerializeObject(query.BannerList);
+            }
+            else
+            {
+                query.Banner = "";
+            }
+            query.CreateDate = System.DateTime.Now;
+            query.MallBaseId = userInfo.MallBaseId;
+            query.TenantId = userInfo.TenantId;
+            query.Status = 0;
+            query.UpdateDate = System.DateTime.Now;
+            query.CreateBy = userInfo.UserId;
+
+            var oldModel = buildingCarrierModule.GetBrandEnterpriseModule(query.ServiceId);
+            if (oldModel == null) { return ApiResult.Failed("企业信息不存在"); }
+            if (oldModel.UserId != userInfo.UserId) { return ApiResult.Failed("无法修改此企业信息"); }
+
+            bool flag = buildingCarrierModule.SetEnterpriseServicesModule(query);
+            if (flag)
+            {
+                return ApiResult.Success();
+            }
+            else
+            {
+                return ApiResult.Failed();
+            }
+        }
+
+        /// <summary>
+        /// 修改楼宇
+        /// </summary>
+        /// <returns></returns>
+        [HttpPost]
+        public ApiResult SetBuildingServicesUpdate()
+        {
+            var userInfo = AppletUserInfo;
+            RB_Building_Extend query = JsonConvert.DeserializeObject<RB_Building_Extend>(RequestParm.msg.ToString());
+
+            if (query.BuildId <= 0)
+            {
+                return ApiResult.ParamIsNull("请传递楼宇id");
+            }
+            if (string.IsNullOrWhiteSpace(query.Name))
+            {
+                return ApiResult.Failed("请输入楼宇名称");
+            }
+            if (query.CategoryId == 0)
+            {
+                return ApiResult.Failed("请选择楼宇类别");
+            }
+            if (query.BannerList != null && query.BannerList.Any())
+            {
+                query.Banner = JsonConvert.SerializeObject(query.BannerList);
+            }
+            else
+            {
+                query.Banner = "";
+            }
+            query.CreateDate = System.DateTime.Now;
+            query.MallBaseId = userInfo.MallBaseId;
+            query.TenantId = userInfo.TenantId;
+            query.Status = 0;
+            query.UpdateDate = System.DateTime.Now;
+            query.CreateBy = userInfo.UserId;
+
+            var oldModel = buildingCarrierModule.GetBuildingInfoModule(query.BuildId);
+            if (oldModel == null) { return ApiResult.Failed("楼宇信息不存在"); }
+            if (oldModel.UserId != userInfo.UserId) { return ApiResult.Failed("无法修改此楼宇信息"); }
+
+            bool flag = buildingCarrierModule.SetBuildingModule(query);
+            if (flag)
+            {
+                return ApiResult.Success();
+            }
+            else
+            {
+                return ApiResult.Failed();
+            }
+        }
+
 
         #region 入驻
 
@@ -3505,7 +3609,7 @@ namespace Mall.WebApi.Controllers.TradePavilion
 
             if (model.CategoryId == 0)
             {
-                return ApiResult.Failed("请选择楼宇等级");
+                return ApiResult.Failed("请选择企业类别");
             }
             List<string> BannerList = new List<string>();
             string bannerListStr = parms.GetStringValue("BannerList");