1

Mall.WebApi/Controllers/TradePavilion/AppletTradeController.cs

@@ -1899,7 +1899,10 @@ namespace Mall.WebApi.Controllers.TradePavilion
                 StartingInfo = extModel.StartingInfo ?? "",
                 listEnroll,
                 extModel.OpeningStatus,
-                extModel.FirstStoreTest
+                extModel.FirstStoreTest,
+                ContactName = extModel.ContactName ?? "",
+                ContactPhone = extModel.ContactPhone ?? "",
+                TongYiMobile = Config.TongYiPhone ?? "",
             });
         }
 
@@ -2157,6 +2160,8 @@ namespace Mall.WebApi.Controllers.TradePavilion
             {
                 extModel.Other = HtmlHelper.StripHT(extModel.Other);
             }
+
+            extModel.TongYiMobile = Config.TongYiPhone ?? "";
             return ApiResult.Success(data: extModel);
         }
 
@@ -3016,11 +3021,13 @@ namespace Mall.WebApi.Controllers.TradePavilion
             query.TenantId = RequestParm.TenantId;
             var list = buildingCarrierModule.GetBuildingPageModule(pageModel.pageIndex, pageModel.pageSize, out long count, query);
             pageModel.count = Convert.ToInt32(count);
+            List<string> defaultImageList = new List<string>();
+            defaultImageList.Add(Config.DefaultImage);
             pageModel.pageData = list.Select(x => new
             {
                 ID = x.BuildId,
                 CarrierName = x.Name,
-                Logo = x.BannerList?.FirstOrDefault() ?? "",
+                Logo = x.BannerList?.FirstOrDefault() ?? Config.DefaultImage,
                 CreateDate = x.CreateDate.ToString("yyyy-MM-dd HH:mm"),
                 x.Address,
                 x.LatAndLon,
@@ -3031,7 +3038,7 @@ namespace Mall.WebApi.Controllers.TradePavilion
                 LayersNum = x.FloorNum,
                 CarNum = x.ElevatorNum,//电梯数，载体的是车位数
                 x.CategoryName,
-                x.BannerList,
+                BannerList = (x.BannerList?.Count ?? 0) == 0 ? defaultImageList : x.BannerList,
             });
             return ApiResult.Success(data: pageModel);
         }
@@ -3069,6 +3076,12 @@ namespace Mall.WebApi.Controllers.TradePavilion
                 var collectModel = carrierModule.GetList(new RB_Collect_Extend { Status = 0, Type = 4, UserId = RequestParm.UserId, SourceId = extModel.BuildId, MallBaseId = query.MallBaseId, TenantId = query.TenantId }).FirstOrDefault();
                 CollectId = collectModel?.Id ?? 0;
             }
+            if ((extModel?.BannerList?.Count ?? 0) == 0)
+            {
+                extModel.BannerList = new List<string>();
+                extModel.BannerList.Add(Config.DefaultImage);
+                extModel.Banner = JsonConvert.SerializeObject(extModel.BannerList);
+            }
             return ApiResult.Success(data: new
             {
                 CollectId,
@@ -3095,8 +3108,8 @@ namespace Mall.WebApi.Controllers.TradePavilion
                 IndustryDirection = extModel?.IndustryDirection ?? "",
                 BrandDemand = extModel?.BrandDemand ?? "",
                 Other = extModel?.Other ?? "",
-                //ContactName = extModel?.ContactName ?? "",
-                // ContactPhone = extModel?.ContactPhone ?? "",
+                ContactName = extModel?.ContactName ?? "",
+                ContactPhone = extModel?.ContactPhone ?? "",
 
             });
         }
@@ -3275,6 +3288,8 @@ namespace Mall.WebApi.Controllers.TradePavilion
                 RentFee = extModel?.RentFee ?? 0,
                 BannerList = extModel?.BannerList ?? new List<string>(),
                 ETypeName = extModel.ETypeName ?? "",
+                ContactName = extModel?.ContactName ?? "",
+                ContactPhone = extModel?.ContactPhone ?? "",
             };
             return ApiResult.Success(data: result);
         }
@@ -4220,7 +4235,7 @@ namespace Mall.WebApi.Controllers.TradePavilion
             var query = new RB_Building_Carrier_Extend()
             {
                 CarrierName = parms.GetStringValue("CarrierName"),
-                CategoryId = parms.GetInt("ProjectType", 0),
+                CategoryId = parms.GetInt("CategoryId", 0),
                 FirstStoreTest = parms.GetInt("FirstStoreTest", -1),
                 MallBaseId = parms.GetInt("MallBaseId", 0),
                 TenantId = parms.GetInt("TenantId", 0),
@@ -4270,7 +4285,7 @@ namespace Mall.WebApi.Controllers.TradePavilion
             var query = new RB_Brand_Enterprise_Extend()
             {
                 BrandName = parms.GetStringValue("BrandName"),
-                CategoryId = parms.GetInt("ProjectType", 0),
+                CategoryId = parms.GetInt("BrandClassId", 0),
                 IsInChengdu = parms.GetInt("IsInChengdu", -1),
                 MallBaseId = parms.GetInt("MallBaseId", 0),
                 TenantId = parms.GetInt("TenantId", 0),