11

Mall.Model/Entity/TradePavilion/RB_Brand.cs

@@ -104,9 +104,6 @@ namespace Mall.Model.Entity.TradePavilion
         /// </summary>
         public string CustomerType { get; set; }
 
-
-
-
         /// <summary>
         /// 扩店区域
         /// </summary>
@@ -138,8 +135,6 @@ namespace Mall.Model.Entity.TradePavilion
         /// </summary>
         public string Other { get; set; }
 
-
-
         /// <summary>
         /// 店铺开口尺寸（0-否1-有）
         /// </summary>
@@ -236,5 +231,14 @@ namespace Mall.Model.Entity.TradePavilion
         /// </summary>
         public string ContactPhone { get; set; }
 
+        /// <summary>
+        /// 是否推荐(1-是)
+        /// </summary>
+        public int IsRecommend { get; set; }
+
+        /// <summary>
+        /// 推荐时间
+        /// </summary>
+        public DateTime RecommendDate { get; set; }
     }
 }

Mall.Model/Entity/TradePavilion/RB_BrandClass.cs

@@ -29,13 +29,11 @@ namespace Mall.Model.Entity.TradePavilion
         /// </summary>
         public int MallBaseId { get; set; }
       
-
         /// <summary>
         /// 创建时间
         /// </summary>
         public DateTime CreateDate { get; set; }
 
-
         /// <summary>
         /// 修改时间
         /// </summary>
@@ -62,5 +60,10 @@ namespace Mall.Model.Entity.TradePavilion
         /// 品牌大类
         /// </summary>
         public BrandCategoryEnum BrandCategory { get; set; }
+
+        /// <summary>
+        /// 父级分类Id
+        /// </summary>
+        public int ParentId { get; set; }
     }
 }

Mall.Model/Entity/TradePavilion/RB_Building.cs

@@ -175,5 +175,15 @@ namespace Mall.Model.Entity.TradePavilion
         /// 排序
         /// </summary>
         public int SortNum { get; set; }
+
+        /// <summary>
+        /// 是否推荐(1-是)
+        /// </summary>
+        public int IsRecommend { get; set; }
+
+        /// <summary>
+        /// 推荐时间
+        /// </summary>
+        public DateTime RecommendDate { get; set; }
     }
 }

Mall.Model/Entity/TradePavilion/RB_Carrier.cs

@@ -202,8 +202,6 @@ namespace Mall.Model.Entity.TradePavilion
         /// </summary>
         public decimal? EndAreaRequirement { get; set; }
 
-
-
         /// <summary>
         /// 经营面积
         /// </summary>
@@ -245,5 +243,15 @@ namespace Mall.Model.Entity.TradePavilion
         ///// 首展政策
         ///// </summary>
         //public string FirstExhibition { get; set; }
+
+        /// <summary>
+        /// 是否推荐(1-是)
+        /// </summary>
+        public int IsRecommend { get; set; }
+
+        /// <summary>
+        /// 推荐时间
+        /// </summary>
+        public DateTime RecommendDate { get; set; }
     }
 }

Mall.Model/Entity/TradePavilion/RB_EnterpriseServices.cs

@@ -145,5 +145,15 @@ namespace Mall.Model.Entity.TradePavilion
         /// 楼宇等级
         /// </summary>
         public int EType { get; set; }
+
+        /// <summary>
+        /// 是否推荐(1-是)
+        /// </summary>
+        public int IsRecommend { get; set; }
+
+        /// <summary>
+        /// 推荐时间
+        /// </summary>
+        public DateTime RecommendDate { get; set; }
     }
 }

Mall.Module.TradePavilion/BuildingCarrierModule.cs

@@ -528,6 +528,23 @@ namespace Mall.Module.TradePavilion
             return flag;
         }
 
+        /// <summary>
+        /// 设置楼宇推荐
+        /// </summary>
+        /// <param name="BuildId"></param>
+        /// <param name="IsRecommend"></param>
+        /// <returns></returns>
+        public bool RecommendBuildingModule(int BuildId,int IsRecommend)
+        {
+            Dictionary<string, object> fileds = new Dictionary<string, object>()
+            {
+                {nameof(RB_Building_Extend.IsRecommend),IsRecommend },
+                {nameof(RB_Building_Extend.RecommendDate),DateTime.Now }
+            };
+            bool flag = buildingRepository.Update(fileds, new WhereHelper(nameof(RB_Building_Extend.BuildId), BuildId));
+            return flag;
+        }
+
         #endregion
 
         #region 企业服务
@@ -672,6 +689,24 @@ namespace Mall.Module.TradePavilion
             bool flag = enterpriseServicesRepository.Update(fileds, new WhereHelper(nameof(RB_EnterpriseServices_Extend.ServiceId), ServiceId));
             return flag;
         }
+
+
+        /// <summary>
+        /// 设置企业服务推荐
+        /// </summary>
+        /// <param name="ServiceId"></param>
+        ///<param name="IsRecommend"></param>
+        /// <returns></returns>
+        public bool RecommendEnterpriseServicesModule(int ServiceId,int IsRecommend)
+        {
+            Dictionary<string, object> fileds = new Dictionary<string, object>()
+            {
+                {nameof(RB_EnterpriseServices_Extend.IsRecommend), IsRecommend},
+                {nameof(RB_EnterpriseServices_Extend.RecommendDate), DateTime.Now}
+            };
+            bool flag = enterpriseServicesRepository.Update(fileds, new WhereHelper(nameof(RB_EnterpriseServices_Extend.ServiceId), ServiceId));
+            return flag;
+        }
         #endregion
 
 

Mall.Module.TradePavilion/CarrierModule.cs

@@ -579,6 +579,23 @@ namespace Mall.Module.TradePavilion
             return flag;
         }
 
+        /// <summary>
+        ///设置载体推荐状态
+        /// </summary>
+        /// <param name="CarrierId">载体Id</param>
+        /// <param name="IsRecommend">推荐状态(1-推荐)</param>
+        /// <returns></returns>
+        public bool RecommendCarrierModule(int CarrierId, int IsRecommend)
+        {
+            Dictionary<string, object> fileds = new Dictionary<string, object>()
+            {
+                {nameof(RB_Carrier_Extend.IsRecommend),IsRecommend },
+                {nameof(RB_Carrier_Extend.RecommendDate),DateTime.Now },
+            };
+            bool flag = carrierRepository.Update(fileds, new WhereHelper(nameof(RB_Carrier_Extend.ID), CarrierId));
+            return flag;
+        }
+
 
 
         #endregion
@@ -1036,6 +1053,23 @@ namespace Mall.Module.TradePavilion
             return flag;
         }
 
+        /// <summary>
+        /// 设置品牌推荐状态
+        /// </summary>
+        /// <param name="Id"></param>
+        /// <param name="IsRecommend"></param>
+        /// <returns></returns>
+        public bool RecommendBrandModule(int Id,int IsRecommend)
+        {
+            Dictionary<string, object> fileds = new Dictionary<string, object>()
+            {
+                {nameof(RB_Brand_Extend.IsRecommend),IsRecommend },
+                {nameof(RB_Brand_Extend.RecommendDate),DateTime.Now },
+            };
+            bool flag = brandRepository.Update(fileds, new WhereHelper(nameof(RB_Brand_Extend.ID), Id));
+            return flag;
+        }
+
         /// <summary>
         /// 获取品牌信息分页列表
         /// </summary>

Mall.WebApi/Controllers/TradePavilion/TradeController.cs

@@ -12,6 +12,7 @@ using System.Threading.Tasks;
 using System.Web;
 using COSXML.Log;
 using Dnc.Api.Throttle;
+using Google.Protobuf.WellKnownTypes;
 using Mall.CacheManager.Base;
 using Mall.CacheManager.User;
 using Mall.Common.API;
@@ -1505,6 +1506,8 @@ namespace Mall.WebApi.Controllers.TradePavilion
                 x.CarrierMetroList,
                 x.ContactName,
                 x.ContactPhone,
+                x.IsRecommend,
+                RecommendDate = Common.ConvertHelper.FormatTime(x.RecommendDate)
             });
             return ApiResult.Success(data: pageModel);
         }
@@ -1515,7 +1518,6 @@ namespace Mall.WebApi.Controllers.TradePavilion
         /// </summary>
         /// <returns></returns>
         [HttpGet]
-
         [HttpPost]
         public ApiResult GetCarrierDetails()
         {
@@ -1711,8 +1713,6 @@ namespace Mall.WebApi.Controllers.TradePavilion
             return flag ? ApiResult.Success() : ApiResult.Failed();
         }
 
-
-
         /// <summary>
         /// 删除载体信息
         /// </summary>
@@ -1726,6 +1726,21 @@ namespace Mall.WebApi.Controllers.TradePavilion
             return flag ? ApiResult.Success() : ApiResult.Failed();
         }
 
+        /// <summary>
+        /// 设置载体推荐状态
+        /// </summary>
+        /// <returns></returns>
+        [HttpPost]
+        [AllowRepeat]
+        public ApiResult RecommendCarrier()
+        {
+            JObject parms = JObject.Parse(RequestParm.msg.ToString());
+            var CarrierId = parms.GetInt("CarrierId", 0);
+            var IsRecommend = parms.GetInt("IsRecommend", 0);
+            var flag = carrierModule.RecommendCarrierModule(CarrierId, IsRecommend);
+            return flag ? ApiResult.Success() : ApiResult.Failed();
+        }
+
 
         /// <summary>
         /// 获取载体下载枚举列表
@@ -1903,7 +1918,6 @@ namespace Mall.WebApi.Controllers.TradePavilion
         /// <returns></returns>
         [HttpGet]
         [HttpPost]
-
         public ApiResult GetBrandPageList()
         {
             ResultPageModel pageModel = JsonConvert.DeserializeObject<ResultPageModel>(RequestParm.msg.ToString());
@@ -1934,8 +1948,9 @@ namespace Mall.WebApi.Controllers.TradePavilion
             }
             query.MallBaseId = RequestParm.MallBaseId;
             query.TenantId = RequestParm.TenantId;
-            var list = carrierModule.GetBrandPageList(pageModel.pageIndex, pageModel.pageSize, out long rowsCount, query, true);
-            foreach (var item in list)
+            List<object> list = new List<object>();
+            var dataList = carrierModule.GetBrandPageList(pageModel.pageIndex, pageModel.pageSize, out long rowsCount, query, true);
+            foreach (var item in dataList)
             {
                 item.ProjectName = item.ProjectType.GetEnumName();
                 if (!string.IsNullOrWhiteSpace(item.Banner))
@@ -1946,6 +1961,26 @@ namespace Mall.WebApi.Controllers.TradePavilion
                 {
                     item.BannerList = new List<string>();
                 }
+
+                list.Add(new
+                {
+                    item.ID,
+                    item.BrandName,
+                    item.ProjectName,
+                    item.ProjectType,
+                    item.ClassName,
+                    item.Logo,
+                    item.ShopNum,
+                    item.BuiltUpArea,
+                    item.EndBuiltUpArea,
+                    item.BrandType,
+                    item.CustomerType,
+                    item.ContactName,
+                    item.ContactPhone,
+                    item.UserName,
+                    item.IsRecommend,
+                    RecommendDate = Common.ConvertHelper.FormatTime(item.RecommendDate)
+                });
             }
             pageModel.count = Convert.ToInt32(rowsCount);
             pageModel.pageData = list;
@@ -2046,6 +2081,20 @@ namespace Mall.WebApi.Controllers.TradePavilion
             return flag ? ApiResult.Success() : ApiResult.Failed();
         }
 
+        /// <summary>
+        /// 设置品牌推荐状态
+        /// </summary>
+        /// <returns></returns>
+        [HttpPost]
+        [AllowRepeat]
+        public ApiResult RecommendBrand()
+        {
+            JObject parms = JObject.Parse(RequestParm.msg.ToString());
+            var Id = parms.GetInt("Id", 0);
+            int IsRecommend = parms.GetInt("IsRecommend", 0);
+            var flag = carrierModule.RecommendBrandModule(Id, IsRecommend);
+            return flag ? ApiResult.Success() : ApiResult.Failed();
+        }
 
         /// <summary>
         /// 检查品牌文件是否存在
@@ -3108,9 +3157,6 @@ namespace Mall.WebApi.Controllers.TradePavilion
             }));
         }
 
-
-
-
         /// <summary>
         /// 报名列表批量导出
         /// </summary>
@@ -3138,6 +3184,7 @@ namespace Mall.WebApi.Controllers.TradePavilion
                 return ApiResult.Failed(errmsg);
             }
         }
+       
         /// <summary>
         /// 报名列表批量导出
         /// </summary>
@@ -3799,7 +3846,7 @@ namespace Mall.WebApi.Controllers.TradePavilion
         /// <param name="ExcelEnumIdList">下载列</param>
         /// <param name="filePath">Logo文件存放路径</param>
         /// <param name="excelFileUrl">Excel文件路径</param>
-        private async void GetBuildingCarrierListToExcel(RB_Building_Carrier_Extend demodel, List<int> ExcelEnumIdList, string filePath, string excelFileUrl)
+        private void GetBuildingCarrierListToExcel(RB_Building_Carrier_Extend demodel, List<int> ExcelEnumIdList, string filePath, string excelFileUrl)
         {
             byte[] bytes = null;
             string ExcelName = "载体列表" + DateTime.Now.ToString("yyyyMMddHHmmss") + ".xls";