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

Mall.Model/Entity/MarketingCenter/RB_Miniprogram_Page_Templ.cs

@@ -109,8 +109,13 @@ namespace Mall.Model.Entity.MarketingCenter
         public int IsSchoolHomePage { get; set; }
 
         /// <summary>
-        /// 是否显示底部导航
+        /// 是否显示底部导航(是否显示底部导航栏(1-显示)
         /// </summary>
         public int IsShowBottomTabBar { get; set; }
+
+        /// <summary>
+        /// 不显示标题(1-不显示,0-显示)
+        /// </summary>
+        public int IsNoShowTitle { get; set; }
     }
 }

Mall.Model/Entity/TradePavilion/RB_Building.cs

+using Mall.Common.Enum;
+using System;
+using VT.FW.DB;
+
+namespace Mall.Model.Entity.TradePavilion
+{
+    /// <summary>
+    /// 活力楼宇实体类
+    /// </summary>
+    [Serializable]
+    [DB(ConnectionName = "DefaultConnection")]
+    public class RB_Building
+    {
+        /// <summary>
+		/// 楼宇主键Id
+		/// </summary>
+		public int BuildId { get; set; }
+
+        /// <summary>
+        /// 楼宇名称
+        /// </summary>
+        public string Name { get; set; }
+
+        /// <summary>
+        /// 楼宇图片
+        /// </summary>
+        public string Banner { get; set; }
+
+        /// <summary>
+        /// 楼宇位置
+        /// </summary>
+        public string Address { get; set; }
+
+        /// <summary>
+        /// 经纬度
+        /// </summary>
+        public string LatAndLon { get; set; }
+
+        /// <summary>
+        /// 投运时间
+        /// </summary>
+        public string OperationTime { get; set; }
+
+        /// <summary>
+        /// 楼宇等级
+        /// </summary>
+        public int CategoryId { get; set; }
+
+        /// <summary>
+        /// 面积
+        /// </summary>
+        public string Areas { get; set; }
+
+        /// <summary>
+        /// 楼栋数
+        /// </summary>
+        public string BuildingNum { get; set; }
+
+        /// <summary>
+        /// 楼层数
+        /// </summary>
+        public int FloorNum { get; set; }
+
+        /// <summary>
+        /// 电梯数
+        /// </summary>
+        public int ElevatorNum { get; set; }
+
+        /// <summary>
+        /// 层高
+        /// </summary>
+        public decimal FloorHeight { get; set; }
+
+        /// <summary>
+        /// 开发商
+        /// </summary>
+        public string Developers { get; set; }
+
+        /// <summary>
+        /// 物业公司
+        /// </summary>
+        public string PropertyComp { get; set; }
+
+        /// <summary>
+        /// 销售自持比例
+        /// </summary>
+        public string SaleOrSelf { get; set; }
+
+        /// <summary>
+        /// 是否统一运营(1-是，0-否)
+        /// </summary>
+        public int IsAllOperate { get; set; }
+
+        /// <summary>
+        /// 建设时间
+        /// </summary>
+        public string ConstructionTime { get; set; }
+
+        /// <summary>
+        /// 物业费(元/㎡)
+        /// </summary>
+        public decimal PropertyFee { get; set; }
+
+        /// <summary>
+        /// 月租金(元/㎡)
+        /// </summary>
+        public decimal RentFee { get; set; }
+
+        /// <summary>
+        /// 产业方向
+        /// </summary>
+        public string IndustryDirection { get; set; }
+
+        /// <summary>
+        /// 目标企业招引需求
+        /// </summary>
+        public string BrandDemand { get; set; }
+
+        /// <summary>
+        /// 其他需求
+        /// </summary>
+        public string Other { get; set; }
+
+        /// <summary>
+        /// 联系人
+        /// </summary>
+        public string ContactName { get; set; }
+
+        /// <summary>
+        /// 联系电话
+        /// </summary>
+        public string ContactPhone { 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; }
+    }
+}

Mall.Model/Entity/TradePavilion/RB_EnterpriseServices.cs

+using Mall.Common.Enum;
+using System;
+using VT.FW.DB;
+
+namespace Mall.Model.Entity.TradePavilion
+{
+    /// <summary>
+    /// 企业服务实体类
+    /// </summary>
+    [Serializable]
+    [DB(ConnectionName = "DefaultConnection")]
+    public class RB_EnterpriseServices
+    {
+        /// <summary>
+		/// 企业服务主键Id
+		/// </summary>
+		public int ServiceId { get; set; }
+
+        /// <summary>
+        /// 企业名称
+        /// </summary>
+        public string Name { get; set; }
+
+        /// <summary>
+        /// 企业图片
+        /// </summary>
+        public string Banner { get; set; }
+
+        /// <summary>
+        /// 企业简介
+        /// </summary>
+        public string Introduction { get; set; }
+
+        /// <summary>
+        /// 企业发展意向
+        /// </summary>
+        public string DevIntention { get; set; }
+
+        /// <summary>
+        /// 楼宇位置
+        /// </summary>
+        public string Address { get; set; }
+
+        /// <summary>
+        /// 经纬度
+        /// </summary>
+        public string LatAndLon { get; set; }
+
+        /// <summary>
+        /// 投运时间
+        /// </summary>
+        public string OperationTime { get; set; }
+
+        /// <summary>
+        /// 楼宇等级
+        /// </summary>
+        public int CategoryId { get; set; }
+
+        /// <summary>
+        /// 楼宇装修
+        /// </summary>
+        public string Renovation { get; set; }
+
+        /// <summary>
+        /// 支付方式
+        /// </summary>
+        public string Payment { get; set; }
+
+        /// <summary>
+        /// 交房日期
+        /// </summary>
+        public string HandoverDate { get; set; }
+
+        /// <summary>
+        /// 意向楼层
+        /// </summary>
+        public int IntentionalFloor { get; set; }
+
+        /// <summary>
+        /// 电梯数
+        /// </summary>
+        public int ElevatorNum { get; set; }
+
+        /// <summary>
+        /// 物业费(元/㎡)
+        /// </summary>
+        public decimal PropertyFee { get; set; }
+
+        /// <summary>
+        /// 月租金(元/㎡)
+        /// </summary>
+        public decimal RentFee { get; set; }
+
+        /// <summary>
+        /// 联系人
+        /// </summary>
+        public string ContactName { get; set; }
+
+        /// <summary>
+        /// 联系电话
+        /// </summary>
+        public string ContactPhone { 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; }
+    }
+}

Mall.Model/Extend/TradePavilion/RB_Building_Extend.cs

+using Mall.Model.Entity.TradePavilion;
+
+namespace Mall.Model.Extend.TradePavilion
+{
+    /// <summary>
+    /// 活力楼宇扩展实体类
+    /// </summary>
+    public class RB_Building_Extend: RB_Building
+    {
+        /// <summary>
+        /// 分类名称
+        /// </summary>
+        public string CategoryName { get; set; }
+    }
+}

Mall.Model/Extend/TradePavilion/RB_EnterpriseServices_Extend.cs

+using Mall.Model.Entity.TradePavilion;
+
+namespace Mall.Model.Extend.TradePavilion
+{
+    /// <summary>
+    /// 企业服务扩展实体类
+    /// </summary>
+    public class RB_EnterpriseServices_Extend: RB_EnterpriseServices
+    {
+        /// <summary>
+        /// 分类名称
+        /// </summary>
+        public string CategoryName { get; set; }
+    }
+}

Mall.Module.MarketingCenter/MiniprogramPageTemplModule.cs

@@ -115,6 +115,7 @@ namespace Mall.Module.MarketingCenter
                 fileds.Add(nameof(RB_Miniprogram_Page_Templ_Extend.IsShowNav), extModel.IsShowNav);
                 fileds.Add(nameof(RB_Miniprogram_Page_Templ_Extend.IsHome), extModel.IsHome);
                 fileds.Add(nameof(RB_Miniprogram_Page_Templ_Extend.IsShowBottomTabBar), extModel.IsShowBottomTabBar);
+                fileds.Add(nameof(RB_Miniprogram_Page_Templ_Extend.IsNoShowTitle), extModel.IsNoShowTitle);
                 flag = pageRepository.Update(fileds, new WhereHelper(nameof(RB_Miniprogram_Page_Templ_Extend.Id), extModel.Id));
             }
             else

Mall.Repository/TradePavilion/RB_BuildingRepository.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_BuildingRepository:BaseRepository<RB_Building>
+    {
+        /// <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> GetBuildingPageRepository(int pageIndex, int pageSize, out long rowsCount, RB_Building_Extend query)
+        {
+            DynamicParameters parameters = new DynamicParameters();
+            StringBuilder builder = new StringBuilder();
+            builder.AppendFormat(@"
+SELECT A.*,IFNULL(B.ClassName,'') AS CategoryName
+FROM RB_Building 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_Extend.Status), (int)DateStateEnum.Normal);
+            if (query != null)
+            {
+                if (query.TenantId > 0)
+                {
+                    builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_Building_Extend.TenantId), query.TenantId);
+                }
+                if (query.MallBaseId > 0)
+                {
+                    builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_Building_Extend.MallBaseId), query.MallBaseId);
+                }
+                if (query.CategoryId > 0)
+                {
+                    builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_Building_Extend.CategoryId), query.CategoryId);
+                }
+                if (!string.IsNullOrEmpty(query.Name))
+                {
+                    builder.AppendFormat(" AND A.{0} LIKE @Name ", nameof(RB_Building_Extend.Name));
+                    parameters.Add("@Name", "%" + query.Name.Trim() + "%");
+                }
+                if (!string.IsNullOrEmpty(query.Address))
+                {
+                    builder.AppendFormat(" AND A.{0} LIKE @Address ", nameof(RB_Building_Extend.Address));
+                    parameters.Add("@Address", "%" + query.Address.Trim() + "%");
+                }
+            }
+            builder.AppendFormat(" ORDER BY A.{0} DESC ", nameof(RB_Building_Extend.BuildId));
+            return GetPage<RB_Building_Extend>(pageIndex, pageSize, out rowsCount, builder.ToString(), parameters).ToList();
+        }
+    }
+}

Mall.Repository/TradePavilion/RB_EnterpriseServicesRepository.cs

+using Mall.Common.Enum;
+using Mall.Model.Entity.TradePavilion;
+using Mall.Model.Extend.TradePavilion;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using VT.FW.DB.Dapper;
+
+namespace Mall.Repository.TradePavilion
+{
+    /// <summary>
+    /// 企业服务仓储层
+    /// </summary>
+    public class RB_EnterpriseServicesRepository : BaseRepository<RB_EnterpriseServices>
+    {
+        /// <summary>
+        /// 获取企业服务分页列表
+        /// </summary>
+        /// <param name="pageIndex"></param>
+        /// <param name="pageSize"></param>
+        /// <param name="rowsCount"></param>
+        /// <param name="query"></param>
+        /// <returns></returns>
+        public List<RB_EnterpriseServices_Extend> GetEnterpriseServicesPageRepository(int pageIndex, int pageSize, out long rowsCount, RB_EnterpriseServices_Extend query)
+        {
+            DynamicParameters parameters = new DynamicParameters();
+            StringBuilder builder = new StringBuilder();
+            builder.AppendFormat(@"
+SELECT A.*,IFNULL(B.ClassName,'') AS CategoryName
+FROM rb_enterpriseservices AS A LEFT JOIN rb_brandclass AS B ON A.CategoryId=B.ID
+WHERE 1=1
+");
+            builder.AppendFormat(@" AND A.{0}={1} ", nameof(RB_EnterpriseServices_Extend.Status), (int)DateStateEnum.Normal);
+            if (query != null)
+            {
+                if (query.TenantId > 0)
+                {
+                    builder.AppendFormat(@" AND A.{0}={1} ", nameof(RB_EnterpriseServices_Extend.TenantId),query.TenantId);
+                }
+                if (query.MallBaseId > 0)
+                {
+                    builder.AppendFormat(@" AND A.{0}={1} ", nameof(RB_EnterpriseServices_Extend.MallBaseId), query.MallBaseId);
+                }
+                if (query.CategoryId > 0)
+                {
+                    builder.AppendFormat(@" AND A.{0}={1} ", nameof(RB_EnterpriseServices_Extend.CategoryId), query.CategoryId);
+                }
+                if (!string.IsNullOrEmpty(query.Name))
+                {
+                    builder.AppendFormat(@" AND A.{0} LIKE @Name ", nameof(RB_EnterpriseServices_Extend.Name));
+                    parameters.Add("@Name", "%" + query.Name + "%");
+                }
+            }
+            builder.AppendFormat(" ORDER BY A.{0} DESC ", nameof(RB_EnterpriseServices_Extend.ServiceId));
+            return GetPage<RB_EnterpriseServices_Extend>(pageIndex, pageSize, out rowsCount, builder.ToString(), parameters).ToList();
+        }
+    }
+}

Mall.WebApi/Controllers/Mall/MallController.cs

@@ -200,6 +200,7 @@ namespace Mall.WebApi.Controllers.MallBase
                         show_navs = targetPage.IsShowNav,
                         is_home_page = targetPage.IsHome,
                         is_show_bottom_nav=targetPage.IsShowBottomTabBar,
+                        is_noshow_title = targetPage.IsNoShowTitle == 1,
                         navs = list
                     };
                 }
@@ -275,6 +276,7 @@ namespace Mall.WebApi.Controllers.MallBase
                             show_navs = selfHomePage.IsShowNav,
                             is_home_page = selfHomePage.IsHome,
                             is_show_bottom_nav = selfHomePage.IsShowBottomTabBar,
+                            is_noshow_title = selfHomePage.IsNoShowTitle==1,
                             navs = list
                         };
                     }
@@ -292,6 +294,7 @@ namespace Mall.WebApi.Controllers.MallBase
                                 title = miniProgram.MallName,
                                 show_navs = 0,
                                 is_home_page = 0,
+                                is_noshow_title = false,
                                 navs = list
                             };
                         }
@@ -305,6 +308,7 @@ namespace Mall.WebApi.Controllers.MallBase
                                 show_navs = 1,
                                 is_home_page = 1,
                                 is_show_bottom_nav = 1,
+                                is_noshow_title = false,
                                 navs = list
                             };
                         }

Mall.WebApi/Controllers/MarketingCenter/TemplateController.cs

@@ -181,6 +181,7 @@ namespace Mall.WebApi.Controllers.MarketingCenter
                 IsUse = parms.GetInt("IsUse"),
                 IsShowNav = parms.GetInt("IsShowNav"),
                 IsShowBottomTabBar = parms.GetInt("IsShowBottomTabBar"),
+                IsNoShowTitle = parms.GetInt("IsNoShowTitle"),
                 DetailsList = new List<RB_Miniprogram_Page_Templ_Details_Extend>(),
             };
             string detailsListStr = parms.GetStringValue("DetailsList");

Mall.WebApi/appsettings.json

@@ -8,7 +8,7 @@
     "UserConnectionPName": "MySql.Data.MySqlClient",
     "PropertyConnection": "server=192.168.5.214;user id=reborn;password=Reborn@2018;database=property;CharSet=utf8mb4; Convert Zero Datetime=true; ",
     "PropertyConnectionPName": "MySql.Data.MySqlClient",
-    "EduConnection": "server=192.168.5.214;user id=reborn;password=Reborn@2018;database=test_edu2;CharSet=utf8mb4; Convert Zero Datetime=true; ",
+    "EduConnection": "server=192.168.5.214;user id=reborn;password=Reborn@2018;database=reborn_edu;CharSet=utf8mb4; Convert Zero Datetime=true; ",
     "EduConnectionPName": "MySql.Data.MySqlClient",
     "ThinkConnection": "server=192.168.5.214;user id=reborn;password=Reborn@2018;database=reborn_think;CharSet=utf8mb4; Convert Zero Datetime=true; ",
     "ThinkConnectionPName": "MySql.Data.MySqlClient"