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

Mall.Module.TradePavilion/BuildingCarrierModule.cs

@@ -673,5 +673,35 @@ namespace Mall.Module.TradePavilion
             return flag;
         }
         #endregion
+
+
+        #region 首店与商载体数据合集
+        /// <summary>
+        /// 获取首店以及商载体信息
+        /// </summary>
+        /// <param name="pageIndex"></param>
+        /// <param name="pageSize"></param>
+        /// <param name="rowsCount"></param>
+        /// <param name="query"></param>
+        /// <returns></returns>
+        public List<RB_Building_Carrier_Extend> GetAllCarrierPageModule(int pageIndex, int pageSize, out long rowsCount, RB_Building_Carrier_Extend query)
+        {
+            return building_CarrierRepository.GetAllCarrierPageRepository(pageIndex, pageSize, out rowsCount, query);
+        }
+
+
+        /// <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> GetAllBrandEnterprisePageModule(int pageIndex, int pageSize, out long rowsCount, RB_Brand_Enterprise_Extend query)
+        {
+            return brand_EnterpriseRepository.GetAllBrandEnterprisePageRepository(pageIndex, pageSize, out rowsCount, query);
+        }
+        #endregion
     }
 }

Mall.Repository/TradePavilion/RB_Brand_EnterpriseRepository.cs

@@ -154,5 +154,49 @@ WHERE 1=1
             }
             return Get<RB_Brand_Enterprise_Extend>(builder.ToString(), parameters).ToList();
         }
+
+
+        /// <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> GetAllBrandEnterprisePageRepository(int pageIndex, int pageSize, out long rowsCount, RB_Brand_Enterprise_Extend query)
+        {
+            DynamicParameters parameters = new DynamicParameters();
+            StringBuilder builder = new StringBuilder();
+            builder.AppendFormat(@" SELECT A.*  FROM all_brand AS A  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.CategoryId > 0)
+                {
+                    builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_Brand_Enterprise_Extend.CategoryId), query.CategoryId);
+                }
+                if (query.IsInChengdu > -1)
+                {
+                    builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_Brand_Enterprise_Extend.IsInChengdu), query.IsInChengdu);
+                }
+                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.Repository/TradePavilion/RB_Building_CarrierRepository.cs

@@ -224,5 +224,52 @@ WHERE 1=1
             }
             return Get<RB_Building_Carrier_Extend>(builder.ToString(), parameters).ToList();
         }
+
+
+        /// <summary>
+        /// 获取首店以及商载体楼宇信息
+        /// </summary>
+        /// <param name="pageIndex"></param>
+        /// <param name="pageSize"></param>
+        /// <param name="rowsCount"></param>
+        /// <param name="query"></param>
+        /// <returns></returns>
+        public List<RB_Building_Carrier_Extend> GetAllCarrierPageRepository(int pageIndex, int pageSize, out long rowsCount, RB_Building_Carrier_Extend query)
+        {
+            DynamicParameters parameters = new DynamicParameters();
+            StringBuilder builder = new StringBuilder();
+            builder.AppendFormat(@" SELECT A.* FROM all_carrier AS A  WHERE 1=1  ");
+          //  builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_Building_Carrier_Extend.Status), (int)DateStateEnum.Normal);
+            if (query != null)
+            {
+                if (query.TenantId > 0)
+                {
+                    builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_Building_Carrier_Extend.TenantId), query.TenantId);
+                }
+                if (query.MallBaseId > 0)
+                {
+                    builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_Building_Carrier_Extend.MallBaseId), query.MallBaseId);
+                }
+               
+                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 (query.FirstStoreTest > -1)
+                {
+                    builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_Building_Carrier_Extend.FirstStoreTest), query.FirstStoreTest);
+                }
+               
+                if (query.CategoryId > 0)
+                {
+                    builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_Building_Carrier_Extend.CategoryId), query.CategoryId);
+                }
+               
+            }
+            builder.AppendFormat(" ORDER BY A.ID DESC ");
+            return GetPage<RB_Building_Carrier_Extend>(pageIndex, pageSize, out rowsCount, builder.ToString(), parameters).ToList();
+        }
+
     }
 }

Mall.WebApi/Controllers/TradePavilion/AppletTradeController.cs

@@ -776,9 +776,9 @@ namespace Mall.WebApi.Controllers.TradePavilion
                 Title = parms.GetStringValue("Title"),
                 Type = parms.GetInt("Type")
             };
-          //  var userInfo = AppletUserInfo;
-           // query.MallBaseId = RequestParm.MallBaseId;
-          //  query.TenantId = userInfo?.TenantId ?? 0;
+            //  var userInfo = AppletUserInfo;
+            // query.MallBaseId = RequestParm.MallBaseId;
+            //  query.TenantId = userInfo?.TenantId ?? 0;
 
 
             query.MallBaseId = RequestParm.MallBaseId;
@@ -3707,7 +3707,7 @@ namespace Mall.WebApi.Controllers.TradePavilion
                 BrandDemand = parms.GetStringValue("BrandDemand"),
                 CategoryId = parms.GetInt("CategoryId", 0),
                 BuildingCarrierType = parms.GetInt("BuildingCarrierType", 1),
-                ContactPhone= parms.GetStringValue("ContactPhone"),
+                ContactPhone = parms.GetStringValue("ContactPhone"),
                 ContactName = parms.GetStringValue("ContactName"),
             };
             var bannerList = parms.GetStringValue("BannerList");
@@ -4159,6 +4159,86 @@ namespace Mall.WebApi.Controllers.TradePavilion
         }
         #endregion
 
+
+        #region 首店以及商载通品牌、载体合集
+        /// <summary>
+        /// 获取列表
+        /// </summary>
+        /// <returns></returns>
+        [HttpGet]
+        [HttpPost]
+        [AllowAnonymous]
+        [RateValve(Policy = Policy.Ip, Limit = 10, Duration = 60)]
+        public ApiResult GetAllCarrierPageList()
+        {
+            ResultPageModel pageModel = JsonConvert.DeserializeObject<ResultPageModel>(RequestParm.msg.ToString());
+            JObject parms = JObject.Parse(RequestParm.msg.ToString());
+            var query = new RB_Building_Carrier_Extend()
+            {
+                CarrierName = parms.GetStringValue("CarrierName"),
+                CategoryId = parms.GetInt("ProjectType", 0),
+                FirstStoreTest = parms.GetInt("FirstStoreTest", -1),
+                MallBaseId = parms.GetInt("MallBaseId", 0),
+                TenantId = parms.GetInt("TenantId", 0),
+            };
+            var list = buildingCarrierModule.GetAllCarrierPageModule(pageModel.pageIndex, pageModel.pageSize, out long count, query);
+            pageModel.count = Convert.ToInt32(count);
+            pageModel.pageData = list.Select(x => new
+            {
+                x.ID,
+                x.CarrierName,
+                Logo = x.Logo ?? "",
+                x.TenantId,
+                x.MallBaseId,
+                OpenTime = StringHelper.FormatDate(x.OpenTime),
+                ProjectType = x.CategoryId,
+                ProjectTypeName = x.CategoryName,
+                x.CategoryName,
+                x.OpeningStatus,
+                x.Address,
+                x.FirstStoreTest,
+            });
+            return ApiResult.Success(data: pageModel);
+        }
+
+
+        /// <summary>
+        /// 获取列表
+        /// </summary>
+        /// <returns></returns>
+        [HttpGet]
+        [HttpPost]
+        [AllowAnonymous]
+        [RateValve(Policy = Policy.Ip, Limit = 10, Duration = 60)]
+        public ApiResult GetAllBrandEnterprisePageList()
+        {
+            ResultPageModel pageModel = JsonConvert.DeserializeObject<ResultPageModel>(RequestParm.msg.ToString());
+            JObject parms = JObject.Parse(RequestParm.msg.ToString());
+            var query = new RB_Brand_Enterprise_Extend()
+            {
+                BrandName = parms.GetStringValue("BrandName"),
+                CategoryId = parms.GetInt("CategoryId", 0),
+                IsInChengdu = parms.GetInt("IsInChengdu", -1),
+                MallBaseId = parms.GetInt("MallBaseId", 0),
+                TenantId = parms.GetInt("TenantId", 0),
+            };
+            var list = buildingCarrierModule.GetAllBrandEnterprisePageModule(pageModel.pageIndex, pageModel.pageSize, out long count, query);
+            pageModel.count = Convert.ToInt32(count);
+            pageModel.pageData = list.Select(x => new
+            {
+                x.ID,
+                x.BrandName,
+                Logo = x.Logo ?? "",
+                x.TenantId,
+                x.MallBaseId,
+                x.FullBrandName,
+                ProjectType = x.CategoryId,
+                ProjectTypeName = x.CategoryName,
+                x.IsInChengdu,
+            });
+            return ApiResult.Success(data: pageModel);
+        }
+        #endregion
         /// <summary>
         /// 获取配置项
         /// </summary>