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

Mall.Model/Entity/TradePavilion/RB_Brand_Enterprise.cs

@@ -67,12 +67,12 @@ namespace Mall.Model.Entity.TradePavilion
         /// 品牌视频
         /// </summary>
         public string VideoUrl { get; set; }
+
         /// <summary>
         /// 品牌全名
         /// </summary>
         public string FullBrandName { get; set; }
 
-
         /// <summary>
         /// 品牌名称
         /// </summary>
@@ -99,7 +99,7 @@ namespace Mall.Model.Entity.TradePavilion
         public string BrandType { get; set; }
 
         /// <summary>
-        /// 客户群体
+        /// 客户群体[客户定位]
         /// </summary>
         public string CustomerType { get; set; }
 
@@ -111,7 +111,7 @@ namespace Mall.Model.Entity.TradePavilion
         /// <summary>
         /// 性质
         /// </summary>
-        public ProjectTypeEnum? ProjectType { get; set; }
+        public ProjectTypeEnum ProjectType { get; set; }
 
         /// <summary>
         /// 面积要求
@@ -214,7 +214,7 @@ namespace Mall.Model.Entity.TradePavilion
         /// <summary>
         /// 是否已在成都落地 0-否，1-是，-1未填写
         /// </summary>
-        public int? IsInChengdu { get; set; }
+        public int IsInChengdu { get; set; }
         
         /// <summary>
         /// 奖项来源ids
@@ -240,5 +240,20 @@ namespace Mall.Model.Entity.TradePavilion
         /// 发展意向
         /// </summary>
         public string DevIntention { get; set; }
+
+        /// <summary>
+        /// 物业需求
+        /// </summary>
+        public string PropertyDemand { get; set; }
+
+        /// <summary>
+        /// 合作条件
+        /// </summary>
+        public string Cooperation { get; set; }
+
+        /// <summary>
+        /// 配套需求
+        /// </summary>
+        public string Complementary { get; set; }
     }
 }

Mall.Module.TradePavilion/BuildingCarrierModule.cs

@@ -180,7 +180,22 @@ namespace Mall.Module.TradePavilion
                     { 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},
+                    { nameof(RB_Brand_Enterprise_Extend.Logo),model.Logo},
+                    { nameof(RB_Brand_Enterprise_Extend.Banner),model.Banner},
+                    { nameof(RB_Brand_Enterprise_Extend.ShopNum),model.ShopNum},
+                    { nameof(RB_Brand_Enterprise_Extend.BuiltUpArea),model.BuiltUpArea},
+                    { nameof(RB_Brand_Enterprise_Extend.EndBuiltUpArea),model.EndBuiltUpArea},
+                    { nameof(RB_Brand_Enterprise_Extend.BrandType),model.BrandType},
+                    { nameof(RB_Brand_Enterprise_Extend.CustomerType),model.CustomerType},
+                    { nameof(RB_Brand_Enterprise_Extend.AreaRequirement),model.AreaRequirement},
+                    { nameof(RB_Brand_Enterprise_Extend.EndAreaRequirement),model.EndAreaRequirement},
+                    { nameof(RB_Brand_Enterprise_Extend.CategoryId),model.CategoryId},
+                    { nameof(RB_Brand_Enterprise_Extend.BrandEnterpriseType),model.BrandEnterpriseType},
+                    { nameof(RB_Brand_Enterprise_Extend.Introduce),model.Introduce},
+                    { nameof(RB_Brand_Enterprise_Extend.DevIntention),model.DevIntention},
+                    { nameof(RB_Brand_Enterprise_Extend.PropertyDemand),model.PropertyDemand},
+                    { nameof(RB_Brand_Enterprise_Extend.Cooperation),model.Cooperation},
+                    { nameof(RB_Brand_Enterprise_Extend.Complementary),model.Complementary},
                 };
                 flag = brand_EnterpriseRepository.Update(fileds, new WhereHelper(nameof(RB_Brand_Enterprise_Extend.ID), model.ID));
             }

Mall.WebApi/Controllers/TradePavilion/TradeController.cs

@@ -17,7 +17,7 @@ using Mall.Common.API;
 using Mall.Common.Enum;
 using Mall.Common.Enum.TradePavilion;
 using Mall.Common.Plugin;
-using Mall.Model.Entity.WeChatStatistics;
+ 
 using Mall.Model.Extend.TradePavilion;
 using Mall.Module.TradePavilion;
 using Mall.WebApi.Filter;
@@ -3667,6 +3667,123 @@ namespace Mall.WebApi.Controllers.TradePavilion
             return ApiResult.Success(data: extModel);
         }
 
+ 
+        [HttpPost]
+        public ApiResult GetBrandEnterprisePage()
+        {
+            JObject parms = JObject.Parse(RequestParm.msg.ToString());
+            ResultPageModel pageModel = new ResultPageModel()
+            {
+                pageIndex = parms.GetInt("pageIndex"),
+                pageSize = parms.GetInt("pageSize"),
+            };
+            RB_Brand_Enterprise_Extend query = new RB_Brand_Enterprise_Extend()
+            {
+                BrandEnterpriseType = parms.GetInt("BrandEnterpriseType"),
+                BrandName = parms.GetStringValue("BrandName"),
+                FullBrandName = parms.GetStringValue("FullBrandName"),
+            };
+            List<object> list = new List<object>();
+            var dataList = buildingCarrierModule.GetBrandEnterprisePageModule(pageModel.pageIndex, pageModel.pageSize, out long rowsCount, query);
+            foreach (var item in dataList)
+            {
+                list.Add(new
+                {
+                    item.ID,
+                    item.BrandName,
+                    item.FullBrandName,
+
+                    CreateDate = Common.ConvertHelper.FormatDate(item.CreateDate),
+                });
+            }
+            pageModel.count = Convert.ToInt32(rowsCount);
+            pageModel.pageData = list;
+            return ApiResult.Success(data: pageModel);
+        }
+
+        /// <summary>
+        /// 【商载通】新增修改品牌、企业
+        /// </summary>
+        /// <returns></returns>
+        public ApiResult SetBrandEnterprise()
+        {
+            JObject parms = JObject.Parse(RequestParm.msg.ToString());
+            RB_Brand_Enterprise_Extend model = new RB_Brand_Enterprise_Extend()
+            {
+                ID = parms.GetInt("ID"),
+                BrandName = parms.GetStringValue("BrandName"),
+                FullBrandName = parms.GetStringValue("FullBrandName"),
+                VideoUrl = parms.GetStringValue("VideoUrl"),
+                Logo = parms.GetStringValue("Logo"),
+                ShopNum = parms.GetInt("ShopNum"),
+                BuiltUpArea = parms.GetDecimal("BuiltUpArea"),
+                EndBuiltUpArea = parms.GetDecimal("EndBuiltUpArea"),
+                BrandType = parms.GetStringValue("BrandType"),
+                CustomerType = parms.GetStringValue("CustomerType"),
+                AreaRequirement = parms.GetDecimal("AreaRequirement"),
+                EndAreaRequirement = parms.GetDecimal("EndAreaRequirement"),
+                CategoryId = parms.GetInt("CategoryId"),
+                BrandEnterpriseType = parms.GetInt("BrandEnterpriseType"),
+                Introduce = parms.GetStringValue("Introduce"),
+                DevIntention = parms.GetStringValue("DevIntention"),
+                PropertyDemand=parms.GetStringValue("PropertyDemand"),
+                Cooperation = parms.GetStringValue("Cooperation"),
+                Complementary = parms.GetStringValue("Complementary"),
+            };
+            List<string> BannerList = new List<string>();
+            string bannerListStr= parms.GetStringValue("BannerList");
+            if (!string.IsNullOrEmpty(bannerListStr))
+            {
+                try
+                {
+                    BannerList = Common.Plugin.JsonHelper.DeserializeObject<List<string>>(bannerListStr);
+                }
+                catch
+                { 
+                
+                }
+            }
+            model.Banner = Common.Plugin.JsonHelper.Serialize(BannerList);
+            model.TenantId = RequestParm.TenantId;
+            model.MallBaseId = RequestParm.MallBaseId;
+            if (model.ID > 0)
+            {
+                model.UpdateBy = RequestParm.TenantId;
+                model.UpdateDate = DateTime.Now;
+            }
+            else
+            {
+                model.CreateBy = RequestParm.TenantId;
+                model.CreateDate = DateTime.Now;
+            }
+            bool flag = buildingCarrierModule.SetBrandEnterpriseModule(model);
+            return flag ? ApiResult.Success() : ApiResult.Failed();
+        }
+
+        /// <summary>
+        /// 根据编号获取品牌、企业服务
+        /// </summary>
+        /// <returns></returns>
+        public ApiResult GetBrandEnterpriseInfo()
+        {
+            JObject parms = JObject.Parse(RequestParm.msg.ToString());
+            int Id = parms.GetInt("ID");
+            var extModel = buildingCarrierModule.GetBrandEnterpriseModule(Id);
+            return ApiResult.Success(data: extModel);
+        }
+
+        /// <summary>
+        /// 根据编号删除品牌、企业服务
+        /// </summary>
+        /// <returns></returns>
+        public ApiResult RemoveBrandEnterpriseInfo()
+        {
+            JObject parms = JObject.Parse(RequestParm.msg.ToString());
+            int Id = parms.GetInt("ID");
+            bool flag = buildingCarrierModule.RemoveBrandEnterpriseModule(Id);
+            return flag ? ApiResult.Success() : ApiResult.Failed();
+        }
+ 
         /// <summary>
         /// 获取微信统计信息
         /// </summary>