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

Mall.Model/Entity/TradePavilion/RB_EnterpriseServices.cs

@@ -52,7 +52,7 @@ namespace Mall.Model.Entity.TradePavilion
         public string OperationTime { get; set; }
 
         /// <summary>
-        /// 楼宇等级
+        /// 企业分类
         /// </summary>
         public int CategoryId { get; set; }
 
@@ -142,7 +142,7 @@ namespace Mall.Model.Entity.TradePavilion
         public DateStateEnum Status { get; set; }
 
         /// <summary>
-        /// 企业类别
+        /// 楼宇等级
         /// </summary>
         public int EType { get; set; }
     }

Mall.Model/Extend/TradePavilion/RB_EnterpriseServices_Extend.cs

@@ -9,12 +9,12 @@ namespace Mall.Model.Extend.TradePavilion
     public class RB_EnterpriseServices_Extend : RB_EnterpriseServices
     {
         /// <summary>
-        /// 分类名称
+        /// 企业分类
         /// </summary>
         public string CategoryName { get; set; }
 
         /// <summary>
-        /// 企业类别名称
+        /// 楼宇等级
         /// </summary>
         public string ETypeName { get; set; }
 

Mall.WebApi/Controllers/TradePavilion/AppletTradeController.cs

@@ -3582,34 +3582,8 @@ namespace Mall.WebApi.Controllers.TradePavilion
             query.TenantId = userInfo.TenantId;
             query.Status = 0;
             query.UpdateDate = System.DateTime.Now;
-
             query.UpdateBy = userInfo.UserId;
 
-            #region 验证品牌名称是否已经存在了
-            if (query.ExistBrandId == 0)
-            {
-                //if (carrierModule.ValidateBrandName(query.BrandName, userInfo.MallBaseId))
-                //{
-                //    //return ApiResult.Failed("该品牌名称已存在,请选择绑定已有品牌");
-                //}
-                //if (carrierModule.ValidateFullBrandName(query.FullBrandName, userInfo.MallBaseId))
-                //{
-                //    //return ApiResult.Failed("该品牌全名已存在,请选择绑定已有品牌");
-                //}
-            }
-            //修改
-            #region 验证品牌是否已关联用户
-            if (query.ExistBrandId > 0)
-            {
-                //var bmodel = carrierModule.GetBrand(new RB_Brand_Extend { ID = query.ExistBrandId, MallBaseId = query.MallBaseId, TenantId = query.TenantId });
-                //if (bmodel.UserId > 0)
-                //{
-                //    //return ApiResult.Failed("该品牌已被其他用户认证，请核实后再试");
-                //}
-            }
-            #endregion
-            #endregion
-
             bool flag = buildingCarrierModule.SetCarrierEnterpriseApplyFor(query);
             return flag ? ApiResult.Success() : ApiResult.Failed();
         }