Skip to content

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

1

parent b332a3f6
Show whitespace changes
Inline Side-by-side
Showing with 92 additions and 2 deletions
Mall.Model/Entity/TradePavilion/RB_EnterpriseServicesApply.cs
View file @ 31811d5d
...@@ -145,5 +145,10 @@ namespace Mall.Model.Entity.TradePavilion ...@@ -145,5 +145,10 @@ namespace Mall.Model.Entity.TradePavilion
/// 现有企业服务id /// 现有企业服务id
/// </summary> /// </summary>
public int ExistServiceId { get; set; } public int ExistServiceId { get; set; }
/// <summary>
/// 企业类别
/// </summary>
public int EType { get; set; }
} }
} }
Mall.Module.TradePavilion/BuildingCarrierModule_V2.cs
View file @ 31811d5d
...@@ -305,6 +305,8 @@ namespace Mall.Module.TradePavilion ...@@ -305,6 +305,8 @@ namespace Mall.Module.TradePavilion
{ nameof(RB_EnterpriseServicesApply_Extend.ContactPhone),model.ContactPhone}, { nameof(RB_EnterpriseServicesApply_Extend.ContactPhone),model.ContactPhone},
{ nameof(RB_EnterpriseServicesApply_Extend.UpdateBy),model.UpdateBy}, { nameof(RB_EnterpriseServicesApply_Extend.UpdateBy),model.UpdateBy},
{ nameof(RB_EnterpriseServicesApply_Extend.UpdateDate),model.UpdateDate}, { nameof(RB_EnterpriseServicesApply_Extend.UpdateDate),model.UpdateDate},
{ nameof(RB_EnterpriseServicesApply_Extend.EType),model.EType},
}; };
flag = enterpriseServicesApplyRepository.Update(fileds, new WhereHelper(nameof(RB_EnterpriseServicesApply_Extend.ID), model.ID)); flag = enterpriseServicesApplyRepository.Update(fileds, new WhereHelper(nameof(RB_EnterpriseServicesApply_Extend.ID), model.ID));
} }
...@@ -349,6 +351,8 @@ namespace Mall.Module.TradePavilion ...@@ -349,6 +351,8 @@ namespace Mall.Module.TradePavilion
{ nameof(RB_EnterpriseServices.ContactPhone),BrandModel.ContactPhone}, { nameof(RB_EnterpriseServices.ContactPhone),BrandModel.ContactPhone},
{ nameof(RB_EnterpriseServices.UpdateBy),BrandModel.UpdateBy}, { nameof(RB_EnterpriseServices.UpdateBy),BrandModel.UpdateBy},
{ nameof(RB_EnterpriseServices.UpdateDate),BrandModel.UpdateDate}, { nameof(RB_EnterpriseServices.UpdateDate),BrandModel.UpdateDate},
{ nameof(RB_EnterpriseServices.EType),BrandModel.EType},
}; };
enterpriseServicesRepository.Update(filedsBrand, new WhereHelper(nameof(RB_EnterpriseServices.ServiceId), BrandModel.ExistServiceId)); enterpriseServicesRepository.Update(filedsBrand, new WhereHelper(nameof(RB_EnterpriseServices.ServiceId), BrandModel.ExistServiceId));
} }
...@@ -1554,6 +1558,79 @@ namespace Mall.Module.TradePavilion ...@@ -1554,6 +1558,79 @@ namespace Mall.Module.TradePavilion
} }
} }
} }
else if (cmodel.FirstShopType == 4)
{
//企业服务
var brandList = buildingApplyForRepository.GetBuildingRepository(new RB_BuildingApplyFor_Extend { MallBaseId = cmodel.MallBaseId, CompanyId = cmodel.CompanyId });
if (brandList != null && brandList.Any())
{
var BrandModel = brandList.FirstOrDefault();
if (BrandModel.ExistBuildId > 0)
{
//修改
#region 验证品牌是否已关联用户
//var bmodel = brand2Repository.GetEntity(BrandModel.ExistBrandId);
//if (bmodel.UserId > 0)
//{
// companyEnterpriseRepository.DBSession.Rollback();
// return "该品牌已被其他用户认证，请核实后再试";
//}
#endregion
Dictionary<string, object> filedsBrand = new Dictionary<string, object>()
{
{ nameof(RB_Building_Extend.Name),BrandModel.Name},
{ nameof(RB_Building_Extend.Banner),BrandModel.Banner},
{ nameof(RB_Building_Extend.Address),BrandModel.Address},
{ nameof(RB_Building_Extend.LatAndLon),BrandModel.LatAndLon},
{ nameof(RB_Building_Extend.OperationTime),BrandModel.OperationTime},
{ nameof(RB_Building_Extend.CategoryId),BrandModel.CategoryId},
{ nameof(RB_Building_Extend.Areas),BrandModel.Areas},
{ nameof(RB_Building_Extend.BuildingNum),BrandModel.BuildingNum},
{ nameof(RB_Building_Extend.FloorNum),BrandModel.FloorNum},
{ nameof(RB_Building_Extend.ElevatorNum),BrandModel.ElevatorNum},
{ nameof(RB_Building_Extend.FloorHeight),BrandModel.FloorHeight},
{ nameof(RB_Building_Extend.Developers),BrandModel.Developers},
{ nameof(RB_Building_Extend.PropertyComp),BrandModel.PropertyComp},
{ nameof(RB_Building_Extend.SaleOrSelf),BrandModel.SaleOrSelf},
{ nameof(RB_Building_Extend.IsAllOperate),BrandModel.IsAllOperate},
{ nameof(RB_Building_Extend.ConstructionTime),BrandModel.ConstructionTime},
{ nameof(RB_Building_Extend.PropertyFee),BrandModel.PropertyFee},
{ nameof(RB_Building_Extend.RentFee),BrandModel.RentFee},
{ nameof(RB_Building_Extend.IndustryDirection),BrandModel.IndustryDirection},
{ nameof(RB_Building_Extend.BrandDemand),BrandModel.BrandDemand},
{ nameof(RB_Building_Extend.Other),BrandModel.Other},
{ nameof(RB_Building_Extend.ContactName),BrandModel.ContactName},
{ nameof(RB_Building_Extend.ContactPhone),BrandModel.ContactPhone},
{ nameof(RB_Building_Extend.UpdateBy),BrandModel.UpdateBy},
{ nameof(RB_Building_Extend.UpdateDate),BrandModel.UpdateDate},
};
buildingRepository.Update(filedsBrand, new WhereHelper(nameof(RB_Building_Extend.BuildId), BrandModel.ExistBuildId), trans);
}
else
{
//新增
#region 再次验证品牌名称
//if (ValidateBrandName(BrandModel.BrandName, cmodel.MallBaseId))
//{
// companyEnterpriseRepository.DBSession.Rollback();
// return "该品牌名称已存在,请确认品牌名称后再次审核";
//}
//if (ValidateFullBrandName(BrandModel.FullBrandName, cmodel.MallBaseId))
//{
// companyEnterpriseRepository.DBSession.Rollback();
// return "该品牌全名已存在,请确认品牌全名后再次审核";
//}
#endregion
#region 新增品牌
var inserBModel = BrandModel.RefMapperTo<RB_Building_Extend>();
inserBModel.BuildId = 0;
inserBModel.UserId = cmodel.CreateBy;
buildingRepository.Insert(inserBModel, trans);
#endregion
}
}
}
} }
} }
companyEnterpriseRepository.DBSession.Commit(); companyEnterpriseRepository.DBSession.Commit();
......
Mall.WebApi/Controllers/TradePavilion/AppletTradeController.cs
View file @ 31811d5d
...@@ -2875,6 +2875,7 @@ namespace Mall.WebApi.Controllers.TradePavilion ...@@ -2875,6 +2875,7 @@ namespace Mall.WebApi.Controllers.TradePavilion
ProjectTypeName = x.ProjectType.GetEnumName(), ProjectTypeName = x.ProjectType.GetEnumName(),
x.CarrierSize, x.CarrierSize,
x.LayersNum, x.LayersNum,
x.CategoryName,
x.CarNum, x.CarNum,
x.CarrierPlan, x.CarrierPlan,
x.CarrierTarget, x.CarrierTarget,
...@@ -2884,7 +2885,7 @@ namespace Mall.WebApi.Controllers.TradePavilion ...@@ -2884,7 +2885,7 @@ namespace Mall.WebApi.Controllers.TradePavilion
x.OpeningStatus, x.OpeningStatus,
x.FirstStoreTest, x.FirstStoreTest,
x.BannerList, x.BannerList,
x.IsChengDu,
}); });
return ApiResult.Success(data: pageModel); return ApiResult.Success(data: pageModel);
} }
...@@ -3003,6 +3004,7 @@ namespace Mall.WebApi.Controllers.TradePavilion ...@@ -3003,6 +3004,7 @@ namespace Mall.WebApi.Controllers.TradePavilion
CarrierSize = x.Areas, CarrierSize = x.Areas,
LayersNum = x.FloorNum, LayersNum = x.FloorNum,
CarNum = x.ElevatorNum,//电梯数，载体的是车位数 CarNum = x.ElevatorNum,//电梯数，载体的是车位数
x.CategoryName,
x.BannerList, x.BannerList,
}); });
return ApiResult.Success(data: pageModel); return ApiResult.Success(data: pageModel);
...@@ -3092,7 +3094,7 @@ namespace Mall.WebApi.Controllers.TradePavilion ...@@ -3092,7 +3094,7 @@ namespace Mall.WebApi.Controllers.TradePavilion
{ {
BrandName = parms.GetStringValue("BrandName"), BrandName = parms.GetStringValue("BrandName"),
ProjectType = (Common.Enum.TradePavilion.ProjectTypeEnum)parms.GetInt("ProjectType", 0), ProjectType = (Common.Enum.TradePavilion.ProjectTypeEnum)parms.GetInt("ProjectType", 0),
BrandClassId = parms.GetInt("BrandClassId", 0), CategoryId = parms.GetInt("BrandClassId", 0),
BrandEnterpriseType = parms.GetInt("BrandEnterpriseType", 1), BrandEnterpriseType = parms.GetInt("BrandEnterpriseType", 1),
}; };
query.MallBaseId = RequestParm.MallBaseId; query.MallBaseId = RequestParm.MallBaseId;
...@@ -3191,6 +3193,8 @@ namespace Mall.WebApi.Controllers.TradePavilion ...@@ -3191,6 +3193,8 @@ namespace Mall.WebApi.Controllers.TradePavilion
x.BannerList, x.BannerList,
BrandName = x.Name, BrandName = x.Name,
ShopNum = x.IntentionalFloor,//店铺数对应企业服务的楼层数 ShopNum = x.IntentionalFloor,//店铺数对应企业服务的楼层数
x.CategoryName,
x.CategoryId,
}); });
pageModel.count = Convert.ToInt32(rowsCount); pageModel.count = Convert.ToInt32(rowsCount);
pageModel.pageData = result; pageModel.pageData = result;
...@@ -3488,6 +3492,7 @@ namespace Mall.WebApi.Controllers.TradePavilion ...@@ -3488,6 +3492,7 @@ namespace Mall.WebApi.Controllers.TradePavilion
ContactName = parms.GetStringValue("ContactName"), ContactName = parms.GetStringValue("ContactName"),
ContactPhone = parms.GetStringValue("ContactPhone"), ContactPhone = parms.GetStringValue("ContactPhone"),
CompanyId = parms.GetInt("CompanyId"), CompanyId = parms.GetInt("CompanyId"),
EType = parms.GetInt("EType"),
}; };
if (model.CompanyId <= 0) if (model.CompanyId <= 0)
{ {
...@@ -3578,6 +3583,8 @@ namespace Mall.WebApi.Controllers.TradePavilion ...@@ -3578,6 +3583,8 @@ namespace Mall.WebApi.Controllers.TradePavilion
BrandDemand = parms.GetStringValue("BrandDemand"), BrandDemand = parms.GetStringValue("BrandDemand"),
CategoryId = parms.GetInt("CategoryId", 0), CategoryId = parms.GetInt("CategoryId", 0),
BuildingCarrierType = parms.GetInt("BuildingCarrierType", 1), BuildingCarrierType = parms.GetInt("BuildingCarrierType", 1),
ContactPhone= parms.GetStringValue("ContactPhone"),
ContactName = parms.GetStringValue("ContactName"),
}; };
var bannerList = parms.GetStringValue("BannerList"); var bannerList = parms.GetStringValue("BannerList");
if (!string.IsNullOrEmpty(bannerList)) if (!string.IsNullOrEmpty(bannerList))
...@@ -3744,6 +3751,7 @@ namespace Mall.WebApi.Controllers.TradePavilion ...@@ -3744,6 +3751,7 @@ namespace Mall.WebApi.Controllers.TradePavilion
Other = parms.GetStringValue("Other"), Other = parms.GetStringValue("Other"),
ContactName = parms.GetStringValue("ContactName"), ContactName = parms.GetStringValue("ContactName"),
ContactPhone = parms.GetStringValue("ContactPhone"), ContactPhone = parms.GetStringValue("ContactPhone"),
CompanyId = parms.GetInt("CompanyId"), CompanyId = parms.GetInt("CompanyId"),
}; };
if (model.CompanyId <= 0) if (model.CompanyId <= 0)
......
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