111

Mall.Common/Enum/TradePavilion/AuthenticationCategoryEnum.cs

-using System;
-using System.Collections.Generic;
-using System.Text;
-using Mall.Common.Plugin;
+using Mall.Common.Plugin;
 
 namespace Mall.Common.Enum.TradePavilion
 {

Mall.Common/Enum/TradePavilion/BrandCategoryEnum.cs

+using Mall.Common.Plugin;
+
+namespace Mall.Common.Enum.TradePavilion
+{
+    /// <summary>
+    ///品牌大类
+    /// </summary>
+    public enum BrandCategoryEnum
+    {
+        /// <summary>
+        /// 商业载体
+        /// </summary>
+        [EnumField("商业载体")]
+        Business = 1,
+
+        /// <summary>
+        /// 活力楼宇
+        /// </summary>
+        [EnumField("楼宇")]
+        VitalityBuilding = 2,
+
+
+        /// <summary>
+        /// 消费品牌
+        /// </summary>
+        [EnumField("消费品牌")]
+        ConsumerBrand = 3,
+
+
+        /// <summary>
+        /// 企业服务
+        /// </summary>
+        [EnumField("企业服务")]
+        EnterpriseServices = 4,
+    }
+}

Mall.Common/Plugin/WeiXinHelper.cs

@@ -54,11 +54,14 @@ namespace Mall.Common.Plugin
                     JObject jObj = JObject.Parse(result);
                     miniAppUserCache.UserOpenId = jObj.GetStringValue("openid");
                     miniAppUserCache.UserUnoinid = jObj.GetStringValue("unionid");
+                    if (string.IsNullOrEmpty(miniAppUserCache.UserOpenId) || string.IsNullOrEmpty(miniAppUserCache.UserUnoinid))
+                    {
+                        Common.Plugin.LogHelper.WriteInfo(string.Format("GetWeChatOpenId:AppId_{0}  result_{1}", AppId, result));
+                    }
                 }
             }
             catch (Exception ex)
             {
-                //GetWeChatOpenId:result={"errcode":40163,"errmsg":"code been used, hints: [ req_id: AHGbGiqNe-OhJh.a ]"}&&Code=051S1Ykl2wYCF64U7gnl2AK6ga0S1Yk2
                 //Code过期
                 if (result != null && !string.IsNullOrEmpty(result) && !result.Contains("40163"))
                 {

Mall.Model/Entity/TradePavilion/RB_BrandClass.cs

@@ -58,6 +58,9 @@ namespace Mall.Model.Entity.TradePavilion
         /// </summary>
         public string ClassName { get; set; }
 
-     
+        /// <summary>
+        /// 品牌大类
+        /// </summary>
+        public BrandCategoryEnum BrandCategory { get; set; }
     }
 }

Mall.Model/Entity/TradePavilion/RB_Building_Carrier.cs

+using Mall.Common.Enum;
+using Mall.Common.Enum.TradePavilion;
+using System;
+using VT.FW.DB;
+
+namespace Mall.Model.Entity.TradePavilion
+{
+    /// <summary>
+    /// 楼宇实体类
+    /// </summary>
+    [Serializable]
+    [DB(ConnectionName = "DefaultConnection")]
+    public class RB_Building_Carrier
+    {
+        /// <summary>
+        /// 编号
+        /// </summary>
+        public int ID { get; set; }
+
+        /// <summary>
+        /// 商户号id
+        /// </summary>
+        public int TenantId { get; set; }
+
+        /// <summary>
+        /// 小程序id
+        /// </summary>
+        public int MallBaseId { get; set; }
+        /// <summary>
+        /// 创建人
+        /// </summary>
+        public int CreateBy { get; set; }
+
+        /// <summary>
+        /// 创建时间
+        /// </summary>
+        public DateTime CreateDate { get; set; }
+
+        /// <summary>
+        /// 修改人
+        /// </summary>
+        public int UpdateBy { get; set; }
+
+        /// <summary>
+        /// 修改时间
+        /// </summary>
+        public DateTime UpdateDate { get; set; }
+
+        /// <summary>
+        /// 删除状态
+        /// </summary>
+        public DateStateEnum Status { get; set; }
+
+
+        /// <summary>
+        /// 载体名称
+        /// </summary>
+        public string CarrierName { get; set; }
+
+
+        /// <summary>
+        /// logo
+        /// </summary>
+        public string Logo { get; set; }
+
+
+        /// <summary>
+        /// 载体介绍图
+        /// </summary>
+        public string Banner { get; set; }
+
+        /// <summary>
+        /// 载体视频
+        /// </summary>
+        public string VideoUrl { get; set; }
+
+        /// <summary>
+        /// 省
+        /// </summary>
+        public int Province { get; set; }
+
+        /// <summary>
+        /// 市
+        /// </summary>
+        public int City { get; set; }
+
+
+        /// <summary>
+        /// 区
+        /// </summary>
+        public int Area { get; set; }
+
+        /// <summary>
+        /// 载体地址
+        /// </summary>
+        public string Address { get; set; }
+
+        /// <summary>
+        /// 载体地址经纬度
+        /// </summary>
+        public string LatAndLon { get; set; }
+
+        /// <summary>
+        /// 开发商
+        /// </summary>
+        public string Developers { get; set; }
+
+        /// <summary>
+        /// 开业时间
+        /// </summary>
+        public DateTime OpenTime { get; set; }
+
+        /// <summary>
+        /// 项目类型
+        /// </summary>
+        public ProjectTypeEnum ProjectType { get; set; }
+
+        /// <summary>
+        /// 商业体量（单位：万平方米）
+        /// </summary>
+        public decimal CarrierSize { get; set; }
+
+        /// <summary>
+        /// 商业层数
+        /// </summary>
+        public string LayersNum { get; set; }
+
+        /// <summary>
+        /// 车位数量
+        /// </summary>
+        public int CarNum { get; set; }
+
+
+        /// <summary>
+        /// 业态规划
+        /// </summary>
+        public string CarrierPlan { get; set; }
+
+        /// <summary>
+        /// 招引目标
+        /// </summary>
+        public string CarrierTarget { get; set; }
+
+        /// <summary>
+        /// 目标人群[周边人群结构特征]
+        /// </summary>
+        public string Crowd { get; set; }
+
+        /// <summary>
+        /// 归属于用户
+        /// </summary>
+        public int UserId { get; set; }
+
+
+        /// <summary>
+        /// 开业状态0-即将开业，1-已开业
+        /// </summary>
+        public int OpeningStatus { get; set; }
+
+        /// <summary>
+        /// 首店试验场 0-否，1-是
+        /// </summary>
+        public int FirstStoreTest { get; set; }
+
+
+        /// <summary>
+        /// 招商优惠政策
+        /// </summary>
+        public string Discount { get; set; }
+
+        /// <summary>
+        /// 载体荣誉
+        /// </summary>
+        public string Honor { get; set; }
+
+        /// <summary>
+        /// 去年业绩（单位：W）
+        /// </summary>
+        public decimal YeJi { get; set; }
+
+        /// <summary>
+        /// 店铺数量
+        /// </summary>
+        public int ShopNum { get; set; }
+
+        /// <summary>
+        /// 可租赁面积
+        /// </summary>
+        public decimal AreaRequirement { get; set; }
+
+        /// <summary>
+        /// 可租赁面积
+        /// </summary>
+        public decimal EndAreaRequirement { get; set; }
+
+
+        /// <summary>
+        /// 经营面积
+        /// </summary>
+        public decimal BuiltUpArea { get; set; }
+
+        /// <summary>
+        /// 经营面积
+        /// </summary>
+        public decimal EndBuiltUpArea { get; set; }
+
+
+        /// <summary>
+        /// 首店数量
+        /// </summary>
+        public string FirstShopNum { get; set; }
+
+        /// <summary>
+        /// 首发政策
+        /// </summary>
+        public string StartingInfo { get; set; }
+
+
+        /// <summary>
+        /// 项目类型
+        /// </summary>
+        public int CategoryId { get; set; }
+
+        /// <summary>
+        /// 类型(1-载体,2-楼宇)
+        /// </summary>
+        public int BuildingCarrierType { get; set; }
+
+        /// <summary>
+        /// 是否为成都载体(1-是)
+        /// </summary>
+        public int IsChengDu { get; set; }
+
+        /// <summary>
+        /// 资产权属
+        /// </summary>
+        public string Ascription { get; set;}
+
+        /// <summary>
+        /// 物业构成
+        /// </summary>
+        public string PropertyComposition { get; set; }
+
+ 
+        /// <summary>
+        /// 项目发展及定位
+        /// </summary>
+        public string Location { get; set; }
+
+        /// <summary>
+        /// 人流量参数
+        /// </summary>
+        public string VisitorsFlowrate { get; set;}
+
+        /// <summary>
+        /// 水电气及配套
+        /// </summary>
+        public string SupportingFacilities { get; set; }
+
+        /// <summary>
+        /// 管理公司及管理费
+        /// </summary>
+        public string ManagementCompany { get; set; }
+
+        /// <summary>
+        /// 目标招商业态及品牌需求
+        /// </summary>
+        public string BrandDemand { get; set; }
+    }
+}

Mall.Model/Extend/TradePavilion/RB_Building_Carrier_Extend.cs

+using Mall.Model.Entity.TradePavilion;
+
+namespace Mall.Model.Extend.TradePavilion
+{
+    /// <summary>
+    /// 楼宇扩展实体类
+    /// </summary>
+    public class RB_Building_Carrier_Extend : RB_Building_Carrier
+    {
+        /// <summary>
+        /// 分类名称
+        /// </summary>
+        public string CategoryName { get; set; }
+
+        /// <summary>
+        /// 开业开始时间
+        /// </summary>
+        public string QStartDate { get; set; }
+
+        /// <summary>
+        /// 开业结束时间
+        /// </summary>
+        public string QEndDate { get; set; }
+    }
+}

Mall.Repository/TradePavilion/RB_BrandClassRepository.cs

-using System;
+using Mall.Common.Enum;
+using Mall.Model.Entity.TradePavilion;
+using Mall.Model.Extend.TradePavilion;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
-using Mall.Common.Enum;
-using Mall.Model.Entity.TradePavilion;
-using Mall.Model.Extend.TradePavilion;
 using VT.FW.DB.Dapper;
 
 namespace Mall.Repository.TradePavilion
 {
-   public class RB_BrandClassRepository:BaseRepository<RB_BrandClass>
+    public class RB_BrandClassRepository:BaseRepository<RB_BrandClass>
     {
         /// <summary>
         /// 获取品牌信息分页列表
@@ -19,7 +18,7 @@ namespace Mall.Repository.TradePavilion
         /// <param name="rowsCount"></param>
         /// <param name="query"></param>
         /// <returns></returns>
-        public List<RB_BrandClass_Extend> GetBrandClassPageListRepository(int pageIndex, int pageSize, out long rowsCount, RB_BrandClass_Extend query)
+        public List<RB_BrandClass_Extend> GetBrandClassPageRepository(int pageIndex, int pageSize, out long rowsCount, RB_BrandClass_Extend query)
         {
             rowsCount = 0;
             DynamicParameters parameters = new DynamicParameters();
@@ -44,10 +43,14 @@ WHERE 1=1
                 {
                     builder.AppendFormat(" AND {0}={1} ", nameof(RB_BrandClass_Extend.MallBaseId), query.MallBaseId);
                 }
+                if (query.BrandCategory > 0)
+                {
+                    builder.AppendFormat(" AND {0}={1} ", nameof(RB_BrandClass_Extend.BrandCategory), (int)query.BrandCategory);
+                }
                 if (!string.IsNullOrEmpty(query.ClassName))
                 {
-                    builder.AppendFormat(" AND {0} LIKE @Name ", nameof(RB_BrandClass_Extend.ClassName));
-                    parameters.Add("Name", "%" + query.ClassName.Trim() + "%");
+                    builder.AppendFormat(" AND {0} LIKE @ClassName ", nameof(RB_BrandClass_Extend.ClassName));
+                    parameters.Add("@ClassName", "%" + query.ClassName.Trim() + "%");
                 }
             }
             return GetPage<RB_BrandClass_Extend>(pageIndex, pageSize, out rowsCount, builder.ToString(), parameters).ToList();
@@ -58,7 +61,7 @@ WHERE 1=1
         /// </summary>
         /// <param name="query"></param>
         /// <returns></returns>
-        public RB_BrandClass_Extend GetBrandClassRepository(RB_BrandClass_Extend query)
+        public List<RB_BrandClass_Extend> GetBrandClassListRepository(RB_BrandClass_Extend query)
         {
             DynamicParameters parameters = new DynamicParameters();
             StringBuilder builder = new StringBuilder();
@@ -70,7 +73,7 @@ WHERE 1=1
             builder.AppendFormat(" AND {0}={1} ", nameof(RB_BrandClass_Extend.Status), (int)DateStateEnum.Normal);
             if (query == null)
             {
-                return new RB_BrandClass_Extend();
+                return new List<RB_BrandClass_Extend>();
             }
             else
             {
@@ -87,54 +90,15 @@ WHERE 1=1
                     builder.AppendFormat(" AND {0} LIKE @Name ", nameof(RB_BrandClass_Extend.ClassName));
                     parameters.Add("Name", "%" + query.ClassName.Trim() + "%");
                 }
-                if (query.ID > 0)
+                if (query.BrandCategory > 0)
                 {
-                    builder.AppendFormat(" AND {0}={1} ", nameof(RB_BrandClass_Extend.ID), query.ID);
-                }
-               
-            }
-            return Get<RB_BrandClass_Extend>(builder.ToString(), parameters).FirstOrDefault();
-        }
-
-
-        /// <summary>
-        /// 根据查询条件获取品牌信息
-        /// </summary>
-        /// <param name="query"></param>
-        /// <returns></returns>
-        public List<RB_BrandClass_Extend> GetBrandClassList(RB_BrandClass_Extend query)
-        {
-            DynamicParameters parameters = new DynamicParameters();
-            StringBuilder builder = new StringBuilder();
-            builder.AppendFormat(@"
-SELECT * 
-FROM RB_BrandClass
-WHERE 1=1
-");
-            builder.AppendFormat(" AND {0}={1} ", nameof(RB_BrandClass_Extend.Status), (int)DateStateEnum.Normal);
-            if (query == null)
-            {
-                return new List<RB_BrandClass_Extend>();
-            }
-            else
-            {
-                if (query.TenantId > 0)
-                {
-                    builder.AppendFormat(" AND {0}={1} ", nameof(RB_BrandClass_Extend.TenantId), query.TenantId);
-                }
-                if (query.MallBaseId > 0)
-                {
-                    builder.AppendFormat(" AND {0}={1} ", nameof(RB_BrandClass_Extend.MallBaseId), query.MallBaseId);
-                }
-                if (!string.IsNullOrEmpty(query.ClassName))
-                {
-                    builder.AppendFormat(" AND {0} LIKE @Name ", nameof(RB_BrandClass_Extend.ClassName));
-                    parameters.Add("Name", "%" + query.ClassName.Trim() + "%");
+                    builder.AppendFormat(" AND {0}={1} ", nameof(RB_BrandClass_Extend.BrandCategory), (int)query.BrandCategory);
                 }
                 if (query.ID > 0)
                 {
                     builder.AppendFormat(" AND {0}={1} ", nameof(RB_BrandClass_Extend.ID), query.ID);
                 }
+               
             }
             return Get<RB_BrandClass_Extend>(builder.ToString(), parameters).ToList();
         }

Mall.Repository/TradePavilion/RB_Building_CarrierRepository.cs

+using Mall.Common.Enum;
+using Mall.Model.Entity.TradePavilion;
+using Mall.Model.Extend.TradePavilion;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using VT.FW.DB.Dapper;
+
+namespace Mall.Repository.TradePavilion
+{
+    /// <summary>
+    /// 楼宇仓储层
+    /// </summary>
+    public class RB_Building_CarrierRepository :BaseRepository<RB_Building_Carrier>
+    {
+        /// <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> GetBuildingPageRepository(int pageIndex, int pageSize, out long rowsCount, RB_Building_Carrier_Extend query)
+        {
+            DynamicParameters parameters = new DynamicParameters();
+            StringBuilder builder = new StringBuilder();
+            builder.AppendFormat(@"
+SELECT A.*,IFNULL(B.ClassName,'') AS CategoryName
+FROM RB_Building_Carrier AS A LEFT JOIN rb_brandclass AS B ON A.CategoryId=B.ID
+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.CategoryId > 0)
+                {
+                    builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_Building_Carrier_Extend.CategoryId), query.CategoryId);
+                }
+            }
+            builder.AppendFormat(" ORDER BY A.BuildingId DESC ");
+            return GetPage<RB_Building_Carrier_Extend>(pageIndex, pageSize, out rowsCount, builder.ToString(), parameters).ToList();
+        }
+
+
+        /// <summary>
+        /// 获取楼宇列表
+        /// </summary>
+        /// <param name="query"></param>
+        /// <returns></returns>
+        public List<RB_Building_Carrier_Extend> GetBuildingListRepository(RB_Building_Carrier_Extend query)
+        {
+            DynamicParameters parameters = new DynamicParameters();
+            StringBuilder builder = new StringBuilder();
+            builder.AppendFormat(@"
+SELECT A.*,IFNULL(B.ClassName,'') AS CategoryName
+FROM RB_Building_Carrier AS A LEFT JOIN rb_brandclass AS B ON A.CategoryId=B.ID
+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.CategoryId > 0)
+                {
+                    builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_Building_Carrier_Extend.CategoryId), query.CategoryId);
+                }
+            }
+            return Get<RB_Building_Carrier_Extend>(builder.ToString(), parameters).ToList();
+        }
+    }
+}

Mall.WebApi/Controllers/TradePavilion/AppletTradeController.cs

@@ -2134,12 +2134,14 @@ namespace Mall.WebApi.Controllers.TradePavilion
         [AllowAnonymous] [RateValve(Policy = Policy.Ip, Limit = 10, Duration = 60)]
         public ApiResult GetBrandClassList()
         {
+            JObject parms = JObject.Parse(RequestParm.msg.ToString());
             var query = new RB_BrandClass_Extend
             {
                 MallBaseId = RequestParm.MallBaseId,
-                TenantId = RequestParm.TenantId
+                TenantId = RequestParm.TenantId,
+                BrandCategory=(BrandCategoryEnum)parms.GetInt("BrandCategory"),
             };
-            var list = carrierModule.GetBrandClassList(query);
+            var list = carrierModule.GetBrandClassListModule(query);
             return ApiResult.Success(data: list);
         }
 

Mall.WebApi/Startup.cs

@@ -64,10 +64,7 @@ namespace Mall.WebApi
             {
                 corsArray.Add(item);
             }
- 
             services.AddCors(options => options.AddPolicy("AllowCors", policy => policy.AllowAnyHeader().AllowAnyMethod().AllowCredentials().WithOrigins(corsArray.ToArray())));
-
-
             string redisConnStr = $"{Common.Config.RedisServer},password={Common.Config.RedisPwd},connectTimeout=5000,allowAdmin=false,defaultDatabase=0";
             //Api限流
             services.AddApiThrottle(options =>