Skip to content

M
mall.oytour.com
Commit 2686ee7a authored by 吴春's avatar 吴春
Browse files
Options

1

parent e00e687f
Hide whitespace changes
Inline Side-by-side
Showing with 94 additions and 66 deletions
Mall.Model/Entity/TradePavilion/RB_BrandEnterpriseApplyFor.cs
View file @ 2686ee7a
...@@ -260,6 +260,14 @@ namespace Mall.Model.Entity.TradePavilion ...@@ -260,6 +260,14 @@ namespace Mall.Model.Entity.TradePavilion
/// </summary> /// </summary>
public string Complementary { get; set; } public string Complementary { get; set; }
/// <summary>
/// 联系人
/// </summary>
public string ContactName { get; set; }
/// <summary>
/// 联系电话
/// </summary>
public string ContactPhone { get; set; }
} }
} }
Mall.Model/Entity/TradePavilion/RB_CarrierEnterpriseApplyFor.cs
View file @ 2686ee7a
...@@ -268,7 +268,15 @@ namespace Mall.Model.Entity.TradePavilion ...@@ -268,7 +268,15 @@ namespace Mall.Model.Entity.TradePavilion
public int CategoryId { get; set; } public int CategoryId { get; set; }
/// <summary>
/// 联系人
/// </summary>
public string ContactName { get; set; }
/// <summary>
/// 联系电话
/// </summary>
public string ContactPhone { get; set; }
} }
......
Mall.Module.TradePavilion/BuildingCarrierModule.cs
View file @ 2686ee7a
...@@ -233,6 +233,10 @@ namespace Mall.Module.TradePavilion ...@@ -233,6 +233,10 @@ namespace Mall.Module.TradePavilion
public RB_Building_Carrier_Extend GetBuildingCarrierModule(int ID, bool isVisit = false) public RB_Building_Carrier_Extend GetBuildingCarrierModule(int ID, bool isVisit = false)
{ {
var extModel = building_CarrierRepository.GetEntity<RB_Building_Carrier_Extend>(ID); var extModel = building_CarrierRepository.GetEntity<RB_Building_Carrier_Extend>(ID);
if (extModel != null && extModel.CategoryId > 0)
{
extModel.CategoryName = brandClassRepository.GetEntity(extModel.CategoryId)?.ClassName ?? "";
}
if (extModel != null && extModel.ID > 0) if (extModel != null && extModel.ID > 0)
{ {
var bcMetroList = building_CarriermetroRepository.GetBuildingCarrierMetroListRepository(new RB_Building_Carriermetro_Extend() { CarrierId = extModel.ID }); var bcMetroList = building_CarriermetroRepository.GetBuildingCarrierMetroListRepository(new RB_Building_Carriermetro_Extend() { CarrierId = extModel.ID });
......
Mall.Module.TradePavilion/BuildingCarrierModule_V2.cs
View file @ 2686ee7a
...@@ -184,6 +184,8 @@ namespace Mall.Module.TradePavilion ...@@ -184,6 +184,8 @@ namespace Mall.Module.TradePavilion
{nameof(RB_BrandEnterpriseApplyFor_Extend.PropertyDemand),model.PropertyDemand }, {nameof(RB_BrandEnterpriseApplyFor_Extend.PropertyDemand),model.PropertyDemand },
{nameof(RB_BrandEnterpriseApplyFor_Extend.Cooperation),model.Cooperation }, {nameof(RB_BrandEnterpriseApplyFor_Extend.Cooperation),model.Cooperation },
{nameof(RB_BrandEnterpriseApplyFor_Extend.Complementary),model.Complementary }, {nameof(RB_BrandEnterpriseApplyFor_Extend.Complementary),model.Complementary },
{nameof(RB_BrandEnterpriseApplyFor_Extend.ContactName),model.ContactName },
{nameof(RB_BrandEnterpriseApplyFor_Extend.ContactPhone),model.ContactPhone },
}; };
flag = brandEnterpriseApplyForRepository.Update(fileds, new WhereHelper(nameof(RB_BrandEnterpriseApplyFor_Extend.ID), model.ID)); flag = brandEnterpriseApplyForRepository.Update(fileds, new WhereHelper(nameof(RB_BrandEnterpriseApplyFor_Extend.ID), model.ID));
} }
...@@ -209,25 +211,27 @@ namespace Mall.Module.TradePavilion ...@@ -209,25 +211,27 @@ namespace Mall.Module.TradePavilion
{ {
Dictionary<string, object> filedsBrand = new Dictionary<string, object>() Dictionary<string, object> filedsBrand = new Dictionary<string, object>()
{ {
{ nameof(RB_Brand_Enterprise_Extend.BrandName),model.BrandName}, { nameof(RB_Brand_Enterprise_Extend.BrandName),BrandModel.BrandName},
{ nameof(RB_Brand_Enterprise_Extend.FullBrandName),model.FullBrandName}, { nameof(RB_Brand_Enterprise_Extend.FullBrandName),BrandModel.FullBrandName},
{ nameof(RB_Brand_Enterprise_Extend.VideoUrl),model.VideoUrl}, { nameof(RB_Brand_Enterprise_Extend.VideoUrl),BrandModel.VideoUrl},
{ nameof(RB_Brand_Enterprise_Extend.Logo),model.Logo}, { nameof(RB_Brand_Enterprise_Extend.Logo),BrandModel.Logo},
{ nameof(RB_Brand_Enterprise_Extend.Banner),model.Banner}, { nameof(RB_Brand_Enterprise_Extend.Banner),BrandModel.Banner},
{ nameof(RB_Brand_Enterprise_Extend.ShopNum),model.ShopNum}, { nameof(RB_Brand_Enterprise_Extend.ShopNum),BrandModel.ShopNum},
{ nameof(RB_Brand_Enterprise_Extend.BuiltUpArea),model.BuiltUpArea}, { nameof(RB_Brand_Enterprise_Extend.BuiltUpArea),BrandModel.BuiltUpArea},
{ nameof(RB_Brand_Enterprise_Extend.EndBuiltUpArea),model.EndBuiltUpArea}, { nameof(RB_Brand_Enterprise_Extend.EndBuiltUpArea),BrandModel.EndBuiltUpArea},
{ nameof(RB_Brand_Enterprise_Extend.BrandType),model.BrandType}, { nameof(RB_Brand_Enterprise_Extend.BrandType),BrandModel.BrandType},
{ nameof(RB_Brand_Enterprise_Extend.CustomerType),model.CustomerType}, { nameof(RB_Brand_Enterprise_Extend.CustomerType),BrandModel.CustomerType},
{ nameof(RB_Brand_Enterprise_Extend.AreaRequirement),model.AreaRequirement}, { nameof(RB_Brand_Enterprise_Extend.AreaRequirement),BrandModel.AreaRequirement},
{ nameof(RB_Brand_Enterprise_Extend.EndAreaRequirement),model.EndAreaRequirement}, { nameof(RB_Brand_Enterprise_Extend.EndAreaRequirement),BrandModel.EndAreaRequirement},
{ nameof(RB_Brand_Enterprise_Extend.CategoryId),model.BrandClassId}, { nameof(RB_Brand_Enterprise_Extend.CategoryId),BrandModel.BrandClassId},
{ nameof(RB_Brand_Enterprise_Extend.BrandEnterpriseType),model.BrandEnterpriseType}, { nameof(RB_Brand_Enterprise_Extend.BrandEnterpriseType),BrandModel.BrandEnterpriseType},
{ nameof(RB_Brand_Enterprise_Extend.Introduce),model.Introduce}, { nameof(RB_Brand_Enterprise_Extend.Introduce),BrandModel.Introduce},
{ nameof(RB_Brand_Enterprise_Extend.DevIntention),model.DevIntention}, { nameof(RB_Brand_Enterprise_Extend.DevIntention),BrandModel.DevIntention},
{ nameof(RB_Brand_Enterprise_Extend.PropertyDemand),model.PropertyDemand}, { nameof(RB_Brand_Enterprise_Extend.PropertyDemand),BrandModel.PropertyDemand},
{ nameof(RB_Brand_Enterprise_Extend.Cooperation),model.Cooperation}, { nameof(RB_Brand_Enterprise_Extend.Cooperation),BrandModel.Cooperation},
{ nameof(RB_Brand_Enterprise_Extend.Complementary),model.Complementary}, { nameof(RB_Brand_Enterprise_Extend.Complementary),BrandModel.Complementary},
{nameof(RB_Brand_Enterprise_Extend.ContactName),BrandModel.ContactName },
{nameof(RB_Brand_Enterprise_Extend.ContactPhone),BrandModel.ContactPhone },
}; };
brand_EnterpriseRepository.Update(filedsBrand, new WhereHelper(nameof(RB_Brand_Enterprise_Extend.ID), BrandModel.ExistBrandId)); brand_EnterpriseRepository.Update(filedsBrand, new WhereHelper(nameof(RB_Brand_Enterprise_Extend.ID), BrandModel.ExistBrandId));
} }
...@@ -326,25 +330,25 @@ namespace Mall.Module.TradePavilion ...@@ -326,25 +330,25 @@ namespace Mall.Module.TradePavilion
{ {
Dictionary<string, object> filedsBrand = new Dictionary<string, object>() Dictionary<string, object> filedsBrand = new Dictionary<string, object>()
{ {
{ nameof(RB_EnterpriseServices.Name),model.Name}, { nameof(RB_EnterpriseServices.Name),BrandModel.Name},
{ nameof(RB_EnterpriseServices.Banner),model.Banner}, { nameof(RB_EnterpriseServices.Banner),BrandModel.Banner},
{ nameof(RB_EnterpriseServices.Introduction),model.Introduction}, { nameof(RB_EnterpriseServices.Introduction),BrandModel.Introduction},
{ nameof(RB_EnterpriseServices.DevIntention),model.DevIntention}, { nameof(RB_EnterpriseServices.DevIntention),BrandModel.DevIntention},
{ nameof(RB_EnterpriseServices.Address),model.Address}, { nameof(RB_EnterpriseServices.Address),BrandModel.Address},
{ nameof(RB_EnterpriseServices.LatAndLon),model.LatAndLon}, { nameof(RB_EnterpriseServices.LatAndLon),BrandModel.LatAndLon},
{ nameof(RB_EnterpriseServices.OperationTime),model.OperationTime}, { nameof(RB_EnterpriseServices.OperationTime),BrandModel.OperationTime},
{ nameof(RB_EnterpriseServices.CategoryId),model.CategoryId}, { nameof(RB_EnterpriseServices.CategoryId),BrandModel.CategoryId},
{ nameof(RB_EnterpriseServices.Renovation),model.Renovation}, { nameof(RB_EnterpriseServices.Renovation),BrandModel.Renovation},
{ nameof(RB_EnterpriseServices.Payment),model.Payment}, { nameof(RB_EnterpriseServices.Payment),BrandModel.Payment},
{ nameof(RB_EnterpriseServices.HandoverDate),model.HandoverDate}, { nameof(RB_EnterpriseServices.HandoverDate),BrandModel.HandoverDate},
{ nameof(RB_EnterpriseServices.IntentionalFloor),model.IntentionalFloor}, { nameof(RB_EnterpriseServices.IntentionalFloor),BrandModel.IntentionalFloor},
{ nameof(RB_EnterpriseServices.ElevatorNum),model.ElevatorNum}, { nameof(RB_EnterpriseServices.ElevatorNum),BrandModel.ElevatorNum},
{ nameof(RB_EnterpriseServices.PropertyFee),model.PropertyFee}, { nameof(RB_EnterpriseServices.PropertyFee),BrandModel.PropertyFee},
{ nameof(RB_EnterpriseServices.RentFee),model.RentFee}, { nameof(RB_EnterpriseServices.RentFee),BrandModel.RentFee},
{ nameof(RB_EnterpriseServices.ContactName),model.ContactName}, { nameof(RB_EnterpriseServices.ContactName),BrandModel.ContactName},
{ nameof(RB_EnterpriseServices.ContactPhone),model.ContactPhone}, { nameof(RB_EnterpriseServices.ContactPhone),BrandModel.ContactPhone},
{ nameof(RB_EnterpriseServices.UpdateBy),model.UpdateBy}, { nameof(RB_EnterpriseServices.UpdateBy),BrandModel.UpdateBy},
{ nameof(RB_EnterpriseServices.UpdateDate),model.UpdateDate}, { nameof(RB_EnterpriseServices.UpdateDate),BrandModel.UpdateDate},
}; };
enterpriseServicesRepository.Update(filedsBrand, new WhereHelper(nameof(RB_EnterpriseServices.ServiceId), BrandModel.ExistServiceId)); enterpriseServicesRepository.Update(filedsBrand, new WhereHelper(nameof(RB_EnterpriseServices.ServiceId), BrandModel.ExistServiceId));
} }
...@@ -557,6 +561,8 @@ namespace Mall.Module.TradePavilion ...@@ -557,6 +561,8 @@ namespace Mall.Module.TradePavilion
{nameof(RB_CarrierEnterpriseApplyFor_Extend.ManagementCompany),model.ManagementCompany }, {nameof(RB_CarrierEnterpriseApplyFor_Extend.ManagementCompany),model.ManagementCompany },
{nameof(RB_CarrierEnterpriseApplyFor_Extend.BrandDemand),model.BrandDemand }, {nameof(RB_CarrierEnterpriseApplyFor_Extend.BrandDemand),model.BrandDemand },
{nameof(RB_CarrierEnterpriseApplyFor_Extend.CategoryId),model.CategoryId }, {nameof(RB_CarrierEnterpriseApplyFor_Extend.CategoryId),model.CategoryId },
{nameof(RB_CarrierEnterpriseApplyFor_Extend.ContactName),model.ContactName },
{nameof(RB_CarrierEnterpriseApplyFor_Extend.ContactPhone),model.ContactPhone },
}; };
flag = carrierEnterpriseApplyForRepository.Update(fileds, new WhereHelper(nameof(RB_CarrierEnterpriseApplyFor_Extend.ID), model.ID)); flag = carrierEnterpriseApplyForRepository.Update(fileds, new WhereHelper(nameof(RB_CarrierEnterpriseApplyFor_Extend.ID), model.ID));
if (flag) if (flag)
...@@ -622,30 +628,32 @@ namespace Mall.Module.TradePavilion ...@@ -622,30 +628,32 @@ namespace Mall.Module.TradePavilion
} }
Dictionary<string, object> filedsCarrier = new Dictionary<string, object>() Dictionary<string, object> filedsCarrier = new Dictionary<string, object>()
{ {
{nameof(RB_Building_Carrier_Extend.CarrierName),model.CarrierName }, {nameof(RB_Building_Carrier_Extend.CarrierName),CarrierModel.CarrierName },
{nameof(RB_Building_Carrier_Extend.Logo),model.Logo }, {nameof(RB_Building_Carrier_Extend.Logo),CarrierModel.Logo },
{nameof(RB_Building_Carrier_Extend.Banner),model.Banner }, {nameof(RB_Building_Carrier_Extend.Banner),CarrierModel.Banner },
{nameof(RB_Building_Carrier_Extend.Honor),model.Honor }, {nameof(RB_Building_Carrier_Extend.Honor),CarrierModel.Honor },
{nameof(RB_Building_Carrier_Extend.Developers),model.Developers }, {nameof(RB_Building_Carrier_Extend.Developers),CarrierModel.Developers },
{nameof(RB_Building_Carrier_Extend.OpeningStatus),OpeningStatus }, {nameof(RB_Building_Carrier_Extend.OpeningStatus),OpeningStatus },
{nameof(RB_Building_Carrier_Extend.VideoUrl),model.VideoUrl }, {nameof(RB_Building_Carrier_Extend.VideoUrl),CarrierModel.VideoUrl },
{nameof(RB_Building_Carrier_Extend.Address),model.Address }, {nameof(RB_Building_Carrier_Extend.Address),CarrierModel.Address },
{nameof(RB_Building_Carrier_Extend.LatAndLon),model.LatAndLon }, {nameof(RB_Building_Carrier_Extend.LatAndLon),CarrierModel.LatAndLon },
{nameof(RB_Building_Carrier_Extend.OpenTime),model.OpenTime }, {nameof(RB_Building_Carrier_Extend.OpenTime),CarrierModel.OpenTime },
{nameof(RB_Building_Carrier_Extend.BuildingCarrierType),model.BuildingCarrierType }, {nameof(RB_Building_Carrier_Extend.BuildingCarrierType),CarrierModel.BuildingCarrierType },
{nameof(RB_Building_Carrier_Extend.CategoryId),model.CategoryId }, {nameof(RB_Building_Carrier_Extend.CategoryId),CarrierModel.CategoryId },
{nameof(RB_Building_Carrier_Extend.Ascription),model.Ascription }, {nameof(RB_Building_Carrier_Extend.Ascription),CarrierModel.Ascription },
{nameof(RB_Building_Carrier_Extend.CarrierSize),model.CarrierSize }, {nameof(RB_Building_Carrier_Extend.CarrierSize),CarrierModel.CarrierSize },
{nameof(RB_Building_Carrier_Extend.PropertyComposition),model.PropertyComposition }, {nameof(RB_Building_Carrier_Extend.PropertyComposition),CarrierModel.PropertyComposition },
{nameof(RB_Building_Carrier_Extend.Location),model.Location }, {nameof(RB_Building_Carrier_Extend.Location),CarrierModel.Location },
{nameof(RB_Building_Carrier_Extend.Crowd),model.Crowd }, {nameof(RB_Building_Carrier_Extend.Crowd),CarrierModel.Crowd },
{nameof(RB_Building_Carrier_Extend.VisitorsFlowrate),model.VisitorsFlowrate }, {nameof(RB_Building_Carrier_Extend.VisitorsFlowrate),CarrierModel.VisitorsFlowrate },
{nameof(RB_Building_Carrier_Extend.LayersNum),model.LayersNum }, {nameof(RB_Building_Carrier_Extend.LayersNum),CarrierModel.LayersNum },
{nameof(RB_Building_Carrier_Extend.SupportingFacilities),model.SupportingFacilities }, {nameof(RB_Building_Carrier_Extend.SupportingFacilities),CarrierModel.SupportingFacilities },
{nameof(RB_Building_Carrier_Extend.ManagementCompany),model.ManagementCompany }, {nameof(RB_Building_Carrier_Extend.ManagementCompany),CarrierModel.ManagementCompany },
{nameof(RB_Building_Carrier_Extend.BrandDemand),model.BrandDemand }, {nameof(RB_Building_Carrier_Extend.BrandDemand),CarrierModel.BrandDemand },
{nameof(RB_Building_Carrier_Extend.UpdateBy),model.UpdateBy }, {nameof(RB_Building_Carrier_Extend.UpdateBy),CarrierModel.UpdateBy },
{nameof(RB_Building_Carrier_Extend.UpdateDate),model.UpdateDate }, {nameof(RB_Building_Carrier_Extend.UpdateDate),CarrierModel.UpdateDate },
{nameof(RB_Building_Carrier_Extend.ContactName),CarrierModel.ContactName },
{nameof(RB_Building_Carrier_Extend.ContactPhone),CarrierModel.ContactPhone },
}; };
flag = building_CarrierRepository.Update(filedsCarrier, new WhereHelper(nameof(RB_Building_Carrier_Extend.ID), carrmodel.ID)); flag = building_CarrierRepository.Update(filedsCarrier, new WhereHelper(nameof(RB_Building_Carrier_Extend.ID), carrmodel.ID));
if (flag) if (flag)
......
Mall.WebApi/Controllers/TradePavilion/AppletTradeController.cs
View file @ 2686ee7a
...@@ -2931,8 +2931,8 @@ namespace Mall.WebApi.Controllers.TradePavilion ...@@ -2931,8 +2931,8 @@ namespace Mall.WebApi.Controllers.TradePavilion
extModel.Address, extModel.Address,
extModel.LatAndLon, extModel.LatAndLon,
extModel.Developers, extModel.Developers,
extModel.ProjectType, extModel.CategoryId,
ProjectTypeName = extModel.ProjectType.GetEnumName(), extModel.CategoryName,
extModel.CarrierSize, extModel.CarrierSize,
extModel.LayersNum, extModel.LayersNum,
extModel.CarNum, extModel.CarNum,
...@@ -3225,7 +3225,7 @@ namespace Mall.WebApi.Controllers.TradePavilion ...@@ -3225,7 +3225,7 @@ namespace Mall.WebApi.Controllers.TradePavilion
} }
var result = new var result = new
{ {
CollectId , CollectId,
ServiceId = extModel?.ServiceId ?? 0, ServiceId = extModel?.ServiceId ?? 0,
Name = extModel?.Name ?? "", Name = extModel?.Name ?? "",
Introduction = extModel?.Introduction ?? "", Introduction = extModel?.Introduction ?? "",
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment