Skip to content

M
mall.oytour.com
Commit bdc6c52b authored by 黄奎's avatar 黄奎
Browse files
Options

1

parent 8182c486
Hide whitespace changes
Inline Side-by-side
Showing with 62 additions and 90 deletions
Mall.Module.TradePavilion/BuildingCarrierModule_V2.cs
View file @ bdc6c52b
...@@ -119,6 +119,7 @@ namespace Mall.Module.TradePavilion ...@@ -119,6 +119,7 @@ namespace Mall.Module.TradePavilion
bool flag = brandEnterpriseApplyForRepository.Update(fileds, new WhereHelper(nameof(RB_BrandEnterpriseApplyFor_Extend.ID), ID)); bool flag = brandEnterpriseApplyForRepository.Update(fileds, new WhereHelper(nameof(RB_BrandEnterpriseApplyFor_Extend.ID), ID));
return flag; return flag;
} }
/// <summary> /// <summary>
/// 新增/修改品牌/企业申请信息 /// 新增/修改品牌/企业申请信息
/// </summary> /// </summary>
...@@ -212,28 +213,24 @@ namespace Mall.Module.TradePavilion ...@@ -212,28 +213,24 @@ namespace Mall.Module.TradePavilion
if ((BrandModel?.ExistBrandId ?? 0) > 0) if ((BrandModel?.ExistBrandId ?? 0) > 0)
{ {
Dictionary<string, object> filedsBrand = new Dictionary<string, object>() Dictionary<string, object> filedsBrand = new Dictionary<string, object>()
{ {
{ nameof(RB_Brand_Enterprise_Extend.BrandName),BrandModel.BrandName}, { nameof(RB_Brand_Enterprise_Extend.FullBrandName),BrandModel.FullBrandName},
{ nameof(RB_Brand_Enterprise_Extend.FullBrandName),BrandModel.FullBrandName}, { nameof(RB_Brand_Enterprise_Extend.BrandName),BrandModel.BrandName},
{ nameof(RB_Brand_Enterprise_Extend.VideoUrl),BrandModel.VideoUrl}, { nameof(RB_Brand_Enterprise_Extend.VideoUrl),BrandModel.VideoUrl},
{ nameof(RB_Brand_Enterprise_Extend.Logo),BrandModel.Logo}, { nameof(RB_Brand_Enterprise_Extend.Logo),BrandModel.Logo},
{ nameof(RB_Brand_Enterprise_Extend.Banner),BrandModel.Banner}, { nameof(RB_Brand_Enterprise_Extend.Banner),BrandModel.Banner},
{ nameof(RB_Brand_Enterprise_Extend.ShopNum),BrandModel.ShopNum}, { nameof(RB_Brand_Enterprise_Extend.CategoryId),BrandModel.BrandClassId},
{ nameof(RB_Brand_Enterprise_Extend.BuiltUpArea),BrandModel.BuiltUpArea}, { nameof(RB_Brand_Enterprise_Extend.Introduce),BrandModel.Introduce},
{ nameof(RB_Brand_Enterprise_Extend.EndBuiltUpArea),BrandModel.EndBuiltUpArea}, { nameof(RB_Brand_Enterprise_Extend.ShopNum),BrandModel.ShopNum},
{ nameof(RB_Brand_Enterprise_Extend.BrandType),BrandModel.BrandType}, { nameof(RB_Brand_Enterprise_Extend.AreaRequirement),BrandModel.ShopNum},
{ nameof(RB_Brand_Enterprise_Extend.CustomerType),BrandModel.CustomerType}, { nameof(RB_Brand_Enterprise_Extend.CustomerType),BrandModel.CustomerType},
{ nameof(RB_Brand_Enterprise_Extend.AreaRequirement),BrandModel.AreaRequirement}, { nameof(RB_Brand_Enterprise_Extend.BrandType),BrandModel.BrandType},
{ nameof(RB_Brand_Enterprise_Extend.EndAreaRequirement),BrandModel.EndAreaRequirement}, { nameof(RB_Brand_Enterprise_Extend.Cooperation),BrandModel.Cooperation},
{ nameof(RB_Brand_Enterprise_Extend.CategoryId),BrandModel.BrandClassId}, { nameof(RB_Brand_Enterprise_Extend.PropertyDemand),BrandModel.PropertyDemand},
{ nameof(RB_Brand_Enterprise_Extend.BrandEnterpriseType),BrandModel.BrandEnterpriseType}, { nameof(RB_Brand_Enterprise_Extend.Complementary),BrandModel.Complementary},
{ nameof(RB_Brand_Enterprise_Extend.Introduce),BrandModel.Introduce}, { nameof(RB_Brand_Enterprise_Extend.ContactName),BrandModel.ContactName},
{ nameof(RB_Brand_Enterprise_Extend.DevIntention),BrandModel.DevIntention}, { nameof(RB_Brand_Enterprise_Extend.ContactPhone),BrandModel.ContactPhone},
{ nameof(RB_Brand_Enterprise_Extend.PropertyDemand),BrandModel.PropertyDemand}, { nameof(RB_Brand_Enterprise_Extend.BrandEnterpriseType),BrandModel.BrandEnterpriseType},
{ nameof(RB_Brand_Enterprise_Extend.Cooperation),BrandModel.Cooperation},
{ 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));
} }
...@@ -594,17 +591,19 @@ namespace Mall.Module.TradePavilion ...@@ -594,17 +591,19 @@ namespace Mall.Module.TradePavilion
if (flag) if (flag)
{ {
//更新认证表 资料状态为完成 //更新认证表 资料状态为完成
//更新认证表 资料状态为完成 Dictionary<string, object> keyValues = new Dictionary<string, object>()
Dictionary<string, object> keyValues = new Dictionary<string, object>() { {
{ nameof(RB_CompanyEnterprise_Extend.IsComplete),1} { nameof(RB_CompanyEnterprise_Extend.IsComplete),1}
}; };
List<WhereHelper> wheres = new List<WhereHelper>() { List<WhereHelper> wheres = new List<WhereHelper>()
new WhereHelper(){ {
FiledName=nameof(RB_CompanyEnterprise_Extend.CompanyId), new WhereHelper()
FiledValue= model.CompanyId, {
OperatorEnum=OperatorEnum.Equal FiledName=nameof(RB_CompanyEnterprise_Extend.CompanyId),
} FiledValue= model.CompanyId,
}; OperatorEnum=OperatorEnum.Equal
}
};
if (Config.IsFirtsShopAutoExamine == "1")//自动审核 if (Config.IsFirtsShopAutoExamine == "1")//自动审核
{ {
keyValues.Add(nameof(RB_CompanyEnterprise_Extend.CompanyStatus), 1); keyValues.Add(nameof(RB_CompanyEnterprise_Extend.CompanyStatus), 1);
...@@ -635,32 +634,33 @@ namespace Mall.Module.TradePavilion ...@@ -635,32 +634,33 @@ 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),CarrierModel.CarrierName }, {nameof(RB_Building_Carrier_Extend.CarrierName),CarrierModel.CarrierName },
{nameof(RB_Building_Carrier_Extend.Logo),CarrierModel.Logo }, {nameof(RB_Building_Carrier_Extend.Logo),CarrierModel.Logo },
{nameof(RB_Building_Carrier_Extend.Banner),CarrierModel.Banner }, {nameof(RB_Building_Carrier_Extend.Banner),CarrierModel.Banner },
{nameof(RB_Building_Carrier_Extend.Honor),CarrierModel.Honor }, {nameof(RB_Building_Carrier_Extend.Address),CarrierModel.Address },
{nameof(RB_Building_Carrier_Extend.Developers),CarrierModel.Developers }, {nameof(RB_Building_Carrier_Extend.LatAndLon),CarrierModel.LatAndLon },
{nameof(RB_Building_Carrier_Extend.OpeningStatus),OpeningStatus }, {nameof(RB_Building_Carrier_Extend.VideoUrl),CarrierModel.VideoUrl },
{nameof(RB_Building_Carrier_Extend.VideoUrl),CarrierModel.VideoUrl }, {nameof(RB_Building_Carrier_Extend.OpeningStatus),CarrierModel },
{nameof(RB_Building_Carrier_Extend.Address),CarrierModel.Address }, {nameof(RB_Building_Carrier_Extend.CarrierSize),CarrierModel.CarrierSize },
{nameof(RB_Building_Carrier_Extend.LatAndLon),CarrierModel.LatAndLon }, {nameof(RB_Building_Carrier_Extend.LayersNum),CarrierModel.LayersNum },
{nameof(RB_Building_Carrier_Extend.OpenTime),CarrierModel.OpenTime }, {nameof(RB_Building_Carrier_Extend.CarNum),CarrierModel.CarNum },
{nameof(RB_Building_Carrier_Extend.BuildingCarrierType),CarrierModel.BuildingCarrierType }, {nameof(RB_Building_Carrier_Extend.BuiltUpArea),CarrierModel.BuiltUpArea},
{nameof(RB_Building_Carrier_Extend.CategoryId),CarrierModel.CategoryId }, {nameof(RB_Building_Carrier_Extend.AreaRequirement),CarrierModel.AreaRequirement},
{nameof(RB_Building_Carrier_Extend.Ascription),CarrierModel.Ascription }, {nameof(RB_Building_Carrier_Extend.OpenTime),CarrierModel.OpenTime },
{nameof(RB_Building_Carrier_Extend.CarrierSize),CarrierModel.CarrierSize }, {nameof(RB_Building_Carrier_Extend.VisitorsFlowrate),CarrierModel.VisitorsFlowrate },
{nameof(RB_Building_Carrier_Extend.PropertyComposition),CarrierModel.PropertyComposition }, {nameof(RB_Building_Carrier_Extend.SupportingFacilities),CarrierModel.SupportingFacilities },
{nameof(RB_Building_Carrier_Extend.Location),CarrierModel.Location }, {nameof(RB_Building_Carrier_Extend.ManagementCompany),CarrierModel.ManagementCompany },
{nameof(RB_Building_Carrier_Extend.Crowd),CarrierModel.Crowd }, {nameof(RB_Building_Carrier_Extend.Developers),CarrierModel.Developers },
{nameof(RB_Building_Carrier_Extend.VisitorsFlowrate),CarrierModel.VisitorsFlowrate }, {nameof(RB_Building_Carrier_Extend.CategoryId),CarrierModel.CategoryId },
{nameof(RB_Building_Carrier_Extend.LayersNum),CarrierModel.LayersNum }, {nameof(RB_Building_Carrier_Extend.Ascription),CarrierModel.Ascription },
{nameof(RB_Building_Carrier_Extend.SupportingFacilities),CarrierModel.SupportingFacilities }, {nameof(RB_Building_Carrier_Extend.CarrierPlan),CarrierModel.CarrierPlan },
{nameof(RB_Building_Carrier_Extend.ManagementCompany),CarrierModel.ManagementCompany }, {nameof(RB_Building_Carrier_Extend.BrandDemand),CarrierModel.BrandDemand },
{nameof(RB_Building_Carrier_Extend.BrandDemand),CarrierModel.BrandDemand }, {nameof(RB_Building_Carrier_Extend.Location),CarrierModel.Location },
{nameof(RB_Building_Carrier_Extend.UpdateBy),CarrierModel.UpdateBy }, {nameof(RB_Building_Carrier_Extend.ContactName),CarrierModel.ContactName },
{nameof(RB_Building_Carrier_Extend.UpdateDate),CarrierModel.UpdateDate }, {nameof(RB_Building_Carrier_Extend.ContactPhone),CarrierModel.ContactPhone },
{nameof(RB_Building_Carrier_Extend.ContactName),CarrierModel.ContactName }, {nameof(RB_Building_Carrier_Extend.BuildingCarrierType),CarrierModel.BuildingCarrierType },
{nameof(RB_Building_Carrier_Extend.ContactPhone),CarrierModel.ContactPhone }, {nameof(RB_Building_Carrier_Extend.UpdateBy),CarrierModel.UpdateBy },
{nameof(RB_Building_Carrier_Extend.UpdateDate),CarrierModel.UpdateDate },
}; };
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)
...@@ -682,15 +682,12 @@ namespace Mall.Module.TradePavilion ...@@ -682,15 +682,12 @@ namespace Mall.Module.TradePavilion
} }
else else
{ {
#region 新增载体 #region 新增载体
var inserCModel = model.RefMapperTo<RB_Building_Carrier_Extend>(); var inserCModel = model.RefMapperTo<RB_Building_Carrier_Extend>();
inserCModel.ID = 0; inserCModel.ID = 0;
inserCModel.UserId = cmodel.CreateBy; inserCModel.UserId = cmodel.CreateBy;
inserCModel.BuiltUpArea = model.BuiltUpArea ?? 0; inserCModel.BuiltUpArea = model.BuiltUpArea ?? 0;
inserCModel.AreaRequirement = model.AreaRequirement ?? 0; inserCModel.AreaRequirement = model.AreaRequirement ?? 0;
if (model.OpenTime.HasValue) if (model.OpenTime.HasValue)
{ {
if (model.OpenTime.Value <= System.DateTime.Now) if (model.OpenTime.Value <= System.DateTime.Now)
...@@ -1406,9 +1403,9 @@ namespace Mall.Module.TradePavilion ...@@ -1406,9 +1403,9 @@ namespace Mall.Module.TradePavilion
} }
} }
} }
//载体
else if (cmodel.FirstShopType == 2) else if (cmodel.FirstShopType == 2)
{ {
//载体
var carrierList = carrierEnterpriseApplyForRepository.GetCarrierEnterpriseList(new RB_CarrierEnterpriseApplyFor_Extend() { MallBaseId = cmodel.MallBaseId, CompanyId = cmodel.CompanyId }); var carrierList = carrierEnterpriseApplyForRepository.GetCarrierEnterpriseList(new RB_CarrierEnterpriseApplyFor_Extend() { MallBaseId = cmodel.MallBaseId, CompanyId = cmodel.CompanyId });
if (carrierList != null && carrierList.Any()) if (carrierList != null && carrierList.Any())
{ {
...@@ -1555,10 +1552,11 @@ namespace Mall.Module.TradePavilion ...@@ -1555,10 +1552,11 @@ namespace Mall.Module.TradePavilion
{ nameof(RB_EnterpriseServices_Extend.Banner),enterpriseModel.Banner}, { nameof(RB_EnterpriseServices_Extend.Banner),enterpriseModel.Banner},
{ nameof(RB_EnterpriseServices_Extend.Introduction),enterpriseModel.Introduction}, { nameof(RB_EnterpriseServices_Extend.Introduction),enterpriseModel.Introduction},
{ nameof(RB_EnterpriseServices_Extend.DevIntention),enterpriseModel.DevIntention}, { nameof(RB_EnterpriseServices_Extend.DevIntention),enterpriseModel.DevIntention},
{ nameof(RB_EnterpriseServices_Extend.CategoryId),enterpriseModel.CategoryId},
{ nameof(RB_EnterpriseServices_Extend.Address),enterpriseModel.Address}, { nameof(RB_EnterpriseServices_Extend.Address),enterpriseModel.Address},
{ nameof(RB_EnterpriseServices_Extend.LatAndLon),enterpriseModel.LatAndLon}, { nameof(RB_EnterpriseServices_Extend.LatAndLon),enterpriseModel.LatAndLon},
{ nameof(RB_EnterpriseServices_Extend.OperationTime),enterpriseModel.OperationTime}, { nameof(RB_EnterpriseServices_Extend.OperationTime),enterpriseModel.OperationTime},
{ nameof(RB_EnterpriseServices_Extend.CategoryId),enterpriseModel.CategoryId}, { nameof(RB_EnterpriseServices_Extend.EType),enterpriseModel.EType},
{ nameof(RB_EnterpriseServices_Extend.Renovation),enterpriseModel.Renovation}, { nameof(RB_EnterpriseServices_Extend.Renovation),enterpriseModel.Renovation},
{ nameof(RB_EnterpriseServices_Extend.Payment),enterpriseModel.Payment}, { nameof(RB_EnterpriseServices_Extend.Payment),enterpriseModel.Payment},
{ nameof(RB_EnterpriseServices_Extend.HandoverDate),enterpriseModel.HandoverDate}, { nameof(RB_EnterpriseServices_Extend.HandoverDate),enterpriseModel.HandoverDate},
......
Mall.WebApi/Controllers/TradePavilion/AppletTradeController.cs
View file @ bdc6c52b
...@@ -3580,34 +3580,8 @@ namespace Mall.WebApi.Controllers.TradePavilion ...@@ -3580,34 +3580,8 @@ namespace Mall.WebApi.Controllers.TradePavilion
query.TenantId = userInfo.TenantId; query.TenantId = userInfo.TenantId;
query.Status = 0; query.Status = 0;
query.UpdateDate = System.DateTime.Now; query.UpdateDate = System.DateTime.Now;
query.UpdateBy = userInfo.UserId; 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); bool flag = buildingCarrierModule.SetCarrierEnterpriseApplyFor(query);
return flag ? ApiResult.Success() : ApiResult.Failed(); return flag ? ApiResult.Success() : ApiResult.Failed();
} }
......
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