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

Mall.Model/Entity/TradePavilion/RB_EnterpriseServices.cs

@@ -140,5 +140,10 @@ namespace Mall.Model.Entity.TradePavilion
         /// 删除状态
         /// </summary>
         public DateStateEnum Status { get; set; }
+
+        /// <summary>
+        /// 企业类别
+        /// </summary>
+        public int EType { get; set; }
     }
 }

Mall.Model/Extend/TradePavilion/RB_EnterpriseServices_Extend.cs

@@ -13,6 +13,11 @@ namespace Mall.Model.Extend.TradePavilion
         /// </summary>
         public string CategoryName { get; set; }
 
+        /// <summary>
+        /// 企业类别名称
+        /// </summary>
+        public string ETypeName { get; set; }
+
         /// <summary>
         /// 轮播图
         /// </summary>

Mall.Module.TradePavilion/BuildingCarrierModule.cs

@@ -563,6 +563,7 @@ namespace Mall.Module.TradePavilion
                     { nameof(RB_EnterpriseServices_Extend.ContactPhone),model.ContactPhone},
                     { nameof(RB_EnterpriseServices_Extend.UpdateBy),model.UpdateBy},
                     { nameof(RB_EnterpriseServices_Extend.UpdateDate),model.UpdateDate},
+                    { nameof(RB_EnterpriseServices_Extend.EType),model.EType},
                 };
                 flag = enterpriseServicesRepository.Update(fileds, new WhereHelper(nameof(RB_EnterpriseServices_Extend.ServiceId), model.ServiceId));
             }
@@ -583,9 +584,16 @@ namespace Mall.Module.TradePavilion
         public RB_EnterpriseServices_Extend GetEnterpriseServicesInfoModule(int ServiceId, bool isVisit = false)
         {
             var extModel = enterpriseServicesRepository.GetEntity<RB_EnterpriseServices_Extend>(ServiceId);
-            if (extModel != null && extModel.CategoryId > 0)
+            if (extModel != null)
             {
-                extModel.CategoryName = brandClassRepository.GetEntity(extModel.CategoryId)?.ClassName ?? "";
+                if (extModel.CategoryId > 0)
+                {
+                    extModel.CategoryName = brandClassRepository.GetEntity(extModel.CategoryId)?.ClassName ?? "";
+                }
+                if (extModel.EType > 0)
+                {
+                    extModel.ETypeName = brandClassRepository.GetEntity(extModel.EType)?.ClassName ?? "";
+                }
             }
             extModel.BannerList = new List<string>();
             if (!string.IsNullOrWhiteSpace(extModel.Banner))

Mall.Repository/TradePavilion/RB_EnterpriseServicesRepository.cs

@@ -27,8 +27,9 @@ namespace Mall.Repository.TradePavilion
             DynamicParameters parameters = new DynamicParameters();
             StringBuilder builder = new StringBuilder();
             builder.AppendFormat(@"
-SELECT A.*,IFNULL(B.ClassName,'') AS CategoryName
+SELECT A.*,IFNULL(B.ClassName,'') AS CategoryName,IFNULL(C.ClassName,'') AS ETypeName
 FROM rb_enterpriseservices AS A LEFT JOIN rb_brandclass AS B ON A.CategoryId=B.ID
+     LEFT JOIN rb_brandclass AS C ON A.EType=C.ID
 WHERE 1=1
 ");
             builder.AppendFormat(@" AND A.{0}={1} ", nameof(RB_EnterpriseServices_Extend.Status), (int)DateStateEnum.Normal);

Mall.WebApi/Controllers/TradePavilion/YBTradeController.cs

@@ -511,6 +511,8 @@ namespace Mall.WebApi.Controllers.TradePavilion
                     item.RentFee,
                     item.ContactName,
                     item.ContactPhone,
+                    item.ETypeName,
+                    item.EType,
                     CreateDate = Common.ConvertHelper.FormatDate(item.CreateDate),
                 });
             }
@@ -545,6 +547,7 @@ namespace Mall.WebApi.Controllers.TradePavilion
                 RentFee = parms.GetDecimal("RentFee"),
                 ContactName = parms.GetStringValue("ContactName"),
                 ContactPhone = parms.GetStringValue("ContactPhone"),
+                EType = parms.GetInt("EType"),
             };
             List<string> BannerList = new List<string>();
             string bannerListStr = parms.GetStringValue("BannerList");
@@ -622,6 +625,8 @@ namespace Mall.WebApi.Controllers.TradePavilion
                 RentFee = extModel?.RentFee ?? 0,
                 ContactName = extModel?.ContactName ?? "",
                 ContactPhone = extModel?.ContactPhone ?? "",
+                EType = extModel?.EType ?? 0,
+                ETypeName = extModel?.ETypeName ?? "",
                 BannerList,
             };
             return ApiResult.Success(data: dataObj);