Skip to content

M
mall.oytour.com
Commit 143e4fc3 authored by liudong1993's avatar liudong1993
Browse files
Options

Merge branch 'sdzq-ld' of http://gitlab.oytour.com/Kui2/mall.oytour.com

parents b7016183 6cbcd040
Hide whitespace changes
Inline Side-by-side
Showing with 38 additions and 38 deletions
Mall.Module.TradePavilion/CompanyModule.cs
View file @ 143e4fc3
......@@ -550,12 +550,12 @@ namespace Mall.Module.TradePavilion
{
//修改
#region 验证品牌是否已关联用户
var bmodel = brand2Repository.GetEntity(BrandModel.ExistBrandId);
if (bmodel.UserId > 0)
{
companyRepository.DBSession.Rollback();
return "该品牌已被其他用户认证，请核实后再试";
}
//var bmodel = brand2Repository.GetEntity(BrandModel.ExistBrandId);
//if (bmodel.UserId > 0)
//{
// companyRepository.DBSession.Rollback();
// return "该品牌已被其他用户认证，请核实后再试";
//}
#endregion
Dictionary<string, object> filedsBrand = new Dictionary<string, object>()
{
......@@ -596,16 +596,16 @@ namespace Mall.Module.TradePavilion
{
//新增
#region 再次验证品牌名称
if (ValidateBrandName(BrandModel.BrandName, cmodel.MallBaseId))
{
companyRepository.DBSession.Rollback();
return "该品牌名称已存在,请确认品牌名称后再次审核";
}
if (ValidateFullBrandName(BrandModel.FullBrandName, cmodel.MallBaseId))
{
companyRepository.DBSession.Rollback();
return "该品牌全名已存在,请确认品牌全名后再次审核";
}
//if (ValidateBrandName(BrandModel.BrandName, cmodel.MallBaseId))
//{
// companyRepository.DBSession.Rollback();
// return "该品牌名称已存在,请确认品牌名称后再次审核";
//}
//if (ValidateFullBrandName(BrandModel.FullBrandName, cmodel.MallBaseId))
//{
// companyRepository.DBSession.Rollback();
// return "该品牌全名已存在,请确认品牌全名后再次审核";
//}
#endregion
#region 新增品牌
......@@ -631,11 +631,11 @@ namespace Mall.Module.TradePavilion
//修改
#region 验证品牌是否已关联用户
var carrmodel = carrierRepository.GetEntity(CarrierModel.ExistCarrierId);
if (carrmodel.UserId > 0)
{
companyRepository.DBSession.Rollback();
return "该载体已被其他用户认证，请核实后再试";
}
//if (carrmodel.UserId > 0)
//{
// companyRepository.DBSession.Rollback();
// return "该载体已被其他用户认证，请核实后再试";
//}
#endregion
#region 修改载体
int FirstStoreTest = 0;
......@@ -704,10 +704,10 @@ namespace Mall.Module.TradePavilion
{
//新增
#region 再次验证载体名称
if (ValidateCarrierName(CarrierModel.CarrierName, CarrierModel.MallBaseId))
{
return "该载体名称已存在,请确认载体名称后再次审核";
}
//if (ValidateCarrierName(CarrierModel.CarrierName, CarrierModel.MallBaseId))
//{
// return "该载体名称已存在,请确认载体名称后再次审核";
//}
#endregion
#region 新增载体
var inserCModel = CarrierModel.RefMapperTo<RB_Carrier_Extend>();
......
Mall.WebApi/Controllers/TradePavilion/AppletTradeController.cs
View file @ 143e4fc3
......@@ -234,24 +234,24 @@ namespace Mall.WebApi.Controllers.TradePavilion
#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("该品牌全名已存在,请选择绑定已有品牌");
}
//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("该品牌已被其他用户认证，请核实后再试");
}
//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
......
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