1

Mall.WebApi/Controllers/TradePavilion/AppletTradeController.cs

@@ -2803,7 +2803,7 @@ namespace Mall.WebApi.Controllers.TradePavilion
             var userInfo = AppletUserInfo;
             JObject parms = JObject.Parse(RequestParm.msg.ToString());
             var CompanyId = parms.GetInt("CompanyId", 0);
-        
+
             var Status = parms.GetInt("CompanyStatus", 0);
             var Remark = parms.GetStringValue("Remark");//不通过备注
             var model = companyModule.GetCompanyEntity(CompanyId);
@@ -3377,7 +3377,7 @@ namespace Mall.WebApi.Controllers.TradePavilion
             }
             if (string.IsNullOrWhiteSpace(query.Address))
             {
-               // return ApiResult.Failed("请输入项目地址");
+                // return ApiResult.Failed("请输入项目地址");
             }
             if (string.IsNullOrWhiteSpace(query.Logo))
             {
@@ -3762,7 +3762,7 @@ namespace Mall.WebApi.Controllers.TradePavilion
             }
             if (string.IsNullOrWhiteSpace(query.Address))
             {
-               // return ApiResult.Failed("请输入项目地址");
+                // return ApiResult.Failed("请输入项目地址");
             }
             if (!query.ShopNum.HasValue)
             {
@@ -4153,7 +4153,7 @@ namespace Mall.WebApi.Controllers.TradePavilion
             {
                 return ApiResult.Failed("公司信息" + (model.CompanyStatus == 1 ? "已审核通过" : "审核中") + "，请勿删除");
             }
-            var flag = buildingCarrierModule.RemoveCompanyModule(model.CompanyId, 1,model);
+            var flag = buildingCarrierModule.RemoveCompanyModule(model.CompanyId, 1, model);
             return flag ? ApiResult.Success() : ApiResult.Failed();
         }
 
@@ -4270,6 +4270,10 @@ namespace Mall.WebApi.Controllers.TradePavilion
                 IsInChengdu = parms.GetInt("IsInChengdu", -1),
                 MallBaseId = parms.GetInt("MallBaseId", 0),
                 TenantId = parms.GetInt("TenantId", 0),
+                MaxShopNum = parms.GetInt("MaxShopNum", 0),
+                MixShopNum = parms.GetInt("MixShopNum", 0),
+                MaxAreaRequirement = parms.GetInt("MaxAreaRequirement", 0),
+                MixAreaRequirement = parms.GetInt("MixAreaRequirement", 0),
             };
             var list = buildingCarrierModule.GetAllBrandEnterprisePageModule(pageModel.pageIndex, pageModel.pageSize, out long count, query);
             foreach (var item in list)
@@ -4293,6 +4297,9 @@ namespace Mall.WebApi.Controllers.TradePavilion
                 ProjectType = x.CategoryId,
                 ProjectTypeName = x.CategoryName,
                 x.IsInChengdu,
+                x.ShopNum,
+                x.AreaRequirement,
+                x.EndAreaRequirement,
             }); ;
             return ApiResult.Success(data: pageModel);
         }