Skip to content

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

提交代码

parent 4cafeb5e
Hide whitespace changes
Inline Side-by-side
Showing with 51 additions and 51 deletions
Mall.Model/Extend/TradePavilion/RB_Brand_Extend.cs → Mall.Model/Extend/TradePavilion/RB_CompanyBrand_Extend.cs
View file @ 85e05edb
...@@ -5,7 +5,7 @@ using Mall.Model.Entity.TradePavilion; ...@@ -5,7 +5,7 @@ using Mall.Model.Entity.TradePavilion;
namespace Mall.Model.Extend.TradePavilion namespace Mall.Model.Extend.TradePavilion
{ {
public class RB_Brand_Extend : RB_CompanyBrand public class RB_CompanyBrand_Extend : RB_CompanyBrand
{ {
/// <summary> /// <summary>
/// 客户群体 /// 客户群体
......
Mall.Model/Extend/TradePavilion/RB_Company_Extend.cs
View file @ 85e05edb
...@@ -13,6 +13,6 @@ namespace Mall.Model.Extend.TradePavilion ...@@ -13,6 +13,6 @@ namespace Mall.Model.Extend.TradePavilion
/// <summary> /// <summary>
/// 公司品牌 /// 公司品牌
/// </summary> /// </summary>
public RB_Brand_Extend BrandModel { get; set; } public RB_CompanyBrand_Extend BrandModel { get; set; }
} }
} }
Mall.Module.TradePavilion/CarrierModule.cs
View file @ 85e05edb
...@@ -218,7 +218,7 @@ namespace Mall.Module.TradePavilion ...@@ -218,7 +218,7 @@ namespace Mall.Module.TradePavilion
/// <param name="rowsCount"></param> /// <param name="rowsCount"></param>
/// <param name="query"></param> /// <param name="query"></param>
/// <returns></returns> /// <returns></returns>
public List<RB_Brand_Extend> GetBrandPageListRepository(int pageIndex, int pageSize, out long rowsCount, RB_Brand_Extend query) public List<RB_CompanyBrand_Extend> GetBrandPageListRepository(int pageIndex, int pageSize, out long rowsCount, RB_CompanyBrand_Extend query)
{ {
return brandRepository.GetBrandPageListRepository(pageIndex, pageSize, out rowsCount, query); return brandRepository.GetBrandPageListRepository(pageIndex, pageSize, out rowsCount, query);
} }
...@@ -228,7 +228,7 @@ namespace Mall.Module.TradePavilion ...@@ -228,7 +228,7 @@ namespace Mall.Module.TradePavilion
/// </summary> /// </summary>
/// <param name="query"></param> /// <param name="query"></param>
/// <returns></returns> /// <returns></returns>
public RB_Brand_Extend GetBrandRepository(RB_Brand_Extend query) public RB_CompanyBrand_Extend GetBrandRepository(RB_CompanyBrand_Extend query)
{ {
return brandRepository.GetBrandRepository(query); return brandRepository.GetBrandRepository(query);
} }
...@@ -238,7 +238,7 @@ namespace Mall.Module.TradePavilion ...@@ -238,7 +238,7 @@ namespace Mall.Module.TradePavilion
/// </summary> /// </summary>
/// <param name="model"></param> /// <param name="model"></param>
/// <returns></returns> /// <returns></returns>
public bool SetBrand(RB_Brand_Extend model) public bool SetBrand(RB_CompanyBrand_Extend model)
{ {
if (model.ID == 0) if (model.ID == 0)
{ {
...@@ -248,19 +248,19 @@ namespace Mall.Module.TradePavilion ...@@ -248,19 +248,19 @@ namespace Mall.Module.TradePavilion
{ {
Dictionary<string, object> fileds = new Dictionary<string, object>() Dictionary<string, object> fileds = new Dictionary<string, object>()
{ {
{nameof(RB_Brand_Extend.BrandName),model.BrandName }, {nameof(RB_CompanyBrand_Extend.BrandName),model.BrandName },
{nameof(RB_Brand_Extend.ShopNum),model.ShopNum }, {nameof(RB_CompanyBrand_Extend.ShopNum),model.ShopNum },
{nameof(RB_Brand_Extend.BuiltUpArea),model.BuiltUpArea }, {nameof(RB_CompanyBrand_Extend.BuiltUpArea),model.BuiltUpArea },
{nameof(RB_Brand_Extend.EndBuiltUpArea),model.EndBuiltUpArea }, {nameof(RB_CompanyBrand_Extend.EndBuiltUpArea),model.EndBuiltUpArea },
{nameof(RB_Brand_Extend.FullBrandName),model.FullBrandName }, {nameof(RB_CompanyBrand_Extend.FullBrandName),model.FullBrandName },
{nameof(RB_Brand_Extend.CustomerType),model.CustomerType }, {nameof(RB_CompanyBrand_Extend.CustomerType),model.CustomerType },
{nameof(RB_Brand_Extend.CustomerOtherType),model.CustomerOtherType }, {nameof(RB_CompanyBrand_Extend.CustomerOtherType),model.CustomerOtherType },
{nameof(RB_Brand_Extend.StoreExpansion),model.StoreExpansion }, {nameof(RB_CompanyBrand_Extend.StoreExpansion),model.StoreExpansion },
{nameof(RB_Brand_Extend.ProjectType),(int)model.ProjectType }, {nameof(RB_CompanyBrand_Extend.ProjectType),(int)model.ProjectType },
{nameof(RB_Brand_Extend.AreaRequirement),model.AreaRequirement }, {nameof(RB_CompanyBrand_Extend.AreaRequirement),model.AreaRequirement },
{nameof(RB_Brand_Extend.EndAreaRequirement),model.EndAreaRequirement } {nameof(RB_CompanyBrand_Extend.EndAreaRequirement),model.EndAreaRequirement }
}; };
return brandRepository.Update(fileds, new WhereHelper(nameof(RB_Brand_Extend.ID), model.ID)); return brandRepository.Update(fileds, new WhereHelper(nameof(RB_CompanyBrand_Extend.ID), model.ID));
} }
} }
......
Mall.Module.TradePavilion/CompanyModule.cs
View file @ 85e05edb
...@@ -30,12 +30,12 @@ namespace Mall.Module.TradePavilion ...@@ -30,12 +30,12 @@ namespace Mall.Module.TradePavilion
string carrierIds = string.Join(",", list.Select(x => x.CompanyId)); string carrierIds = string.Join(",", list.Select(x => x.CompanyId));
if (!string.IsNullOrWhiteSpace(carrierIds)) if (!string.IsNullOrWhiteSpace(carrierIds))
{ {
var metroList = brandRepository.GetBrandList(new RB_Brand_Extend { TenantId = query.TenantId, MallBaseId = query.MallBaseId, CompanyIds = carrierIds }); var metroList = brandRepository.GetBrandList(new RB_CompanyBrand_Extend { TenantId = query.TenantId, MallBaseId = query.MallBaseId, CompanyIds = carrierIds });
if (metroList != null && metroList.Any()) if (metroList != null && metroList.Any())
{ {
foreach (var item in list) foreach (var item in list)
{ {
item.BrandModel = new RB_Brand_Extend(); item.BrandModel = new RB_CompanyBrand_Extend();
item.BrandModel = metroList.Where(x => x.CompanyId == item.CompanyId).FirstOrDefault(); item.BrandModel = metroList.Where(x => x.CompanyId == item.CompanyId).FirstOrDefault();
if (item.BrandModel != null && !string.IsNullOrWhiteSpace(item.BrandModel.CustomerType)) if (item.BrandModel != null && !string.IsNullOrWhiteSpace(item.BrandModel.CustomerType))
{ {
...@@ -83,10 +83,10 @@ namespace Mall.Module.TradePavilion ...@@ -83,10 +83,10 @@ namespace Mall.Module.TradePavilion
var model = companyRepository.GetEntity<RB_Company_Extend>(CompanyId); var model = companyRepository.GetEntity<RB_Company_Extend>(CompanyId);
if (model != null && model.CompanyId > 0) if (model != null && model.CompanyId > 0)
{ {
var metroList = brandRepository.GetBrandList(new RB_Brand_Extend { TenantId = model.TenantId, MallBaseId = model.MallBaseId, CompanyId = model.CompanyId }); var metroList = brandRepository.GetBrandList(new RB_CompanyBrand_Extend { TenantId = model.TenantId, MallBaseId = model.MallBaseId, CompanyId = model.CompanyId });
if (metroList != null && metroList.Any()) if (metroList != null && metroList.Any())
{ {
model.BrandModel = new RB_Brand_Extend(); model.BrandModel = new RB_CompanyBrand_Extend();
model.BrandModel = metroList.FirstOrDefault(); model.BrandModel = metroList.FirstOrDefault();
if (model.BrandModel != null && !string.IsNullOrWhiteSpace(model.BrandModel.CustomerType)) if (model.BrandModel != null && !string.IsNullOrWhiteSpace(model.BrandModel.CustomerType))
{ {
......
Mall.Repository/TradePavilion/RB_BrandRepository.cs
View file @ 85e05edb
...@@ -22,38 +22,38 @@ namespace Mall.Repository.TradePavilion ...@@ -22,38 +22,38 @@ namespace Mall.Repository.TradePavilion
/// <param name="rowsCount"></param> /// <param name="rowsCount"></param>
/// <param name="query"></param> /// <param name="query"></param>
/// <returns></returns> /// <returns></returns>
public List<RB_Brand_Extend> GetBrandPageListRepository(int pageIndex, int pageSize, out long rowsCount, RB_Brand_Extend query) public List<RB_CompanyBrand_Extend> GetBrandPageListRepository(int pageIndex, int pageSize, out long rowsCount, RB_CompanyBrand_Extend query)
{ {
rowsCount = 0; rowsCount = 0;
DynamicParameters parameters = new DynamicParameters(); DynamicParameters parameters = new DynamicParameters();
StringBuilder builder = new StringBuilder(); StringBuilder builder = new StringBuilder();
builder.AppendFormat(@" builder.AppendFormat(@"
SELECT * SELECT *
FROM RB_Brand FROM RB_CompanyBrand
WHERE 1=1 WHERE 1=1
"); ");
builder.AppendFormat(" AND {0}={1} ", nameof(RB_Brand_Extend.Status), (int)DateStateEnum.Normal); builder.AppendFormat(" AND {0}={1} ", nameof(RB_CompanyBrand_Extend.Status), (int)DateStateEnum.Normal);
if (query == null) if (query == null)
{ {
return new List<RB_Brand_Extend>(); return new List<RB_CompanyBrand_Extend>();
} }
else else
{ {
if (query.TenantId > 0) if (query.TenantId > 0)
{ {
builder.AppendFormat(" AND {0}={1} ", nameof(RB_Brand_Extend.TenantId), query.TenantId); builder.AppendFormat(" AND {0}={1} ", nameof(RB_CompanyBrand_Extend.TenantId), query.TenantId);
} }
if (query.MallBaseId > 0) if (query.MallBaseId > 0)
{ {
builder.AppendFormat(" AND {0}={1} ", nameof(RB_Brand_Extend.MallBaseId), query.MallBaseId); builder.AppendFormat(" AND {0}={1} ", nameof(RB_CompanyBrand_Extend.MallBaseId), query.MallBaseId);
} }
if (!string.IsNullOrEmpty(query.BrandName)) if (!string.IsNullOrEmpty(query.BrandName))
{ {
builder.AppendFormat(" AND {0} LIKE @Name ", nameof(RB_Brand_Extend.BrandName)); builder.AppendFormat(" AND {0} LIKE @Name ", nameof(RB_CompanyBrand_Extend.BrandName));
parameters.Add("Name", "%" + query.BrandName.Trim() + "%"); parameters.Add("Name", "%" + query.BrandName.Trim() + "%");
} }
} }
return GetPage<RB_Brand_Extend>(pageIndex, pageSize, out rowsCount, builder.ToString(), parameters).ToList(); return GetPage<RB_CompanyBrand_Extend>(pageIndex, pageSize, out rowsCount, builder.ToString(), parameters).ToList();
} }
/// <summary> /// <summary>
...@@ -61,45 +61,45 @@ WHERE 1=1 ...@@ -61,45 +61,45 @@ WHERE 1=1
/// </summary> /// </summary>
/// <param name="query"></param> /// <param name="query"></param>
/// <returns></returns> /// <returns></returns>
public RB_Brand_Extend GetBrandRepository(RB_Brand_Extend query) public RB_CompanyBrand_Extend GetBrandRepository(RB_CompanyBrand_Extend query)
{ {
DynamicParameters parameters = new DynamicParameters(); DynamicParameters parameters = new DynamicParameters();
StringBuilder builder = new StringBuilder(); StringBuilder builder = new StringBuilder();
builder.AppendFormat(@" builder.AppendFormat(@"
SELECT * SELECT *
FROM RB_Brand FROM RB_CompanyBrand
WHERE 1=1 WHERE 1=1
"); ");
builder.AppendFormat(" AND {0}={1} ", nameof(RB_Brand_Extend.Status), (int)DateStateEnum.Normal); builder.AppendFormat(" AND {0}={1} ", nameof(RB_CompanyBrand_Extend.Status), (int)DateStateEnum.Normal);
if (query == null) if (query == null)
{ {
return new RB_Brand_Extend(); return new RB_CompanyBrand_Extend();
} }
else else
{ {
if (query.TenantId > 0) if (query.TenantId > 0)
{ {
builder.AppendFormat(" AND {0}={1} ", nameof(RB_Brand_Extend.TenantId), query.TenantId); builder.AppendFormat(" AND {0}={1} ", nameof(RB_CompanyBrand_Extend.TenantId), query.TenantId);
} }
if (query.MallBaseId > 0) if (query.MallBaseId > 0)
{ {
builder.AppendFormat(" AND {0}={1} ", nameof(RB_Brand_Extend.MallBaseId), query.MallBaseId); builder.AppendFormat(" AND {0}={1} ", nameof(RB_CompanyBrand_Extend.MallBaseId), query.MallBaseId);
} }
if (!string.IsNullOrEmpty(query.BrandName)) if (!string.IsNullOrEmpty(query.BrandName))
{ {
builder.AppendFormat(" AND {0} LIKE @Name ", nameof(RB_Brand_Extend.BrandName)); builder.AppendFormat(" AND {0} LIKE @Name ", nameof(RB_CompanyBrand_Extend.BrandName));
parameters.Add("Name", "%" + query.BrandName.Trim() + "%"); parameters.Add("Name", "%" + query.BrandName.Trim() + "%");
} }
if (query.CompanyId > 0) if (query.CompanyId > 0)
{ {
builder.AppendFormat(" AND {0}={1} ", nameof(RB_Brand_Extend.CompanyId), query.CompanyId); builder.AppendFormat(" AND {0}={1} ", nameof(RB_CompanyBrand_Extend.CompanyId), query.CompanyId);
} }
if (!string.IsNullOrWhiteSpace(query.CompanyIds)) if (!string.IsNullOrWhiteSpace(query.CompanyIds))
{ {
builder.AppendFormat(" AND {0} in({1})", nameof(RB_Brand_Extend.CompanyId), query.CompanyIds); builder.AppendFormat(" AND {0} in({1})", nameof(RB_CompanyBrand_Extend.CompanyId), query.CompanyIds);
} }
} }
return Get<RB_Brand_Extend>(builder.ToString(), parameters).FirstOrDefault(); return Get<RB_CompanyBrand_Extend>(builder.ToString(), parameters).FirstOrDefault();
} }
...@@ -108,45 +108,45 @@ WHERE 1=1 ...@@ -108,45 +108,45 @@ WHERE 1=1
/// </summary> /// </summary>
/// <param name="query"></param> /// <param name="query"></param>
/// <returns></returns> /// <returns></returns>
public List<RB_Brand_Extend> GetBrandList(RB_Brand_Extend query) public List<RB_CompanyBrand_Extend> GetBrandList(RB_CompanyBrand_Extend query)
{ {
DynamicParameters parameters = new DynamicParameters(); DynamicParameters parameters = new DynamicParameters();
StringBuilder builder = new StringBuilder(); StringBuilder builder = new StringBuilder();
builder.AppendFormat(@" builder.AppendFormat(@"
SELECT * SELECT *
FROM RB_Brand FROM RB_CompanyBrand
WHERE 1=1 WHERE 1=1
"); ");
builder.AppendFormat(" AND {0}={1} ", nameof(RB_Brand_Extend.Status), (int)DateStateEnum.Normal); builder.AppendFormat(" AND {0}={1} ", nameof(RB_CompanyBrand_Extend.Status), (int)DateStateEnum.Normal);
if (query == null) if (query == null)
{ {
return new List<RB_Brand_Extend>(); return new List<RB_CompanyBrand_Extend>();
} }
else else
{ {
if (query.TenantId > 0) if (query.TenantId > 0)
{ {
builder.AppendFormat(" AND {0}={1} ", nameof(RB_Brand_Extend.TenantId), query.TenantId); builder.AppendFormat(" AND {0}={1} ", nameof(RB_CompanyBrand_Extend.TenantId), query.TenantId);
} }
if (query.MallBaseId > 0) if (query.MallBaseId > 0)
{ {
builder.AppendFormat(" AND {0}={1} ", nameof(RB_Brand_Extend.MallBaseId), query.MallBaseId); builder.AppendFormat(" AND {0}={1} ", nameof(RB_CompanyBrand_Extend.MallBaseId), query.MallBaseId);
} }
if (!string.IsNullOrEmpty(query.BrandName)) if (!string.IsNullOrEmpty(query.BrandName))
{ {
builder.AppendFormat(" AND {0} LIKE @Name ", nameof(RB_Brand_Extend.BrandName)); builder.AppendFormat(" AND {0} LIKE @Name ", nameof(RB_CompanyBrand_Extend.BrandName));
parameters.Add("Name", "%" + query.BrandName.Trim() + "%"); parameters.Add("Name", "%" + query.BrandName.Trim() + "%");
} }
if (query.CompanyId > 0) if (query.CompanyId > 0)
{ {
builder.AppendFormat(" AND {0}={1} ", nameof(RB_Brand_Extend.CompanyId), query.CompanyId); builder.AppendFormat(" AND {0}={1} ", nameof(RB_CompanyBrand_Extend.CompanyId), query.CompanyId);
} }
if (!string.IsNullOrWhiteSpace(query.CompanyIds)) if (!string.IsNullOrWhiteSpace(query.CompanyIds))
{ {
builder.AppendFormat(" AND {0} in({1})", nameof(RB_Brand_Extend.CompanyId), query.CompanyIds); builder.AppendFormat(" AND {0} in({1})", nameof(RB_CompanyBrand_Extend.CompanyId), query.CompanyIds);
} }
} }
return Get<RB_Brand_Extend>(builder.ToString(), parameters).ToList(); return Get<RB_CompanyBrand_Extend>(builder.ToString(), parameters).ToList();
} }
} }
} }
Mall.WebApi/Controllers/TradePavilion/AppletTradeController.cs
View file @ 85e05edb
...@@ -560,7 +560,7 @@ namespace Mall.WebApi.Controllers.TradePavilion ...@@ -560,7 +560,7 @@ namespace Mall.WebApi.Controllers.TradePavilion
public ApiResult SetBrand() public ApiResult SetBrand()
{ {
JObject parms = JObject.Parse(RequestParm.msg.ToString()); JObject parms = JObject.Parse(RequestParm.msg.ToString());
RB_Brand_Extend extModel = JsonConvert.DeserializeObject<RB_Brand_Extend>(RequestParm.msg.ToString()); RB_CompanyBrand_Extend extModel = JsonConvert.DeserializeObject<RB_CompanyBrand_Extend>(RequestParm.msg.ToString());
if (string.IsNullOrWhiteSpace(extModel.BrandName)) if (string.IsNullOrWhiteSpace(extModel.BrandName))
{ {
...@@ -599,7 +599,7 @@ namespace Mall.WebApi.Controllers.TradePavilion ...@@ -599,7 +599,7 @@ namespace Mall.WebApi.Controllers.TradePavilion
extModel.Status = Common.Enum.DateStateEnum.Normal; extModel.Status = Common.Enum.DateStateEnum.Normal;
extModel.MallBaseId = userInfo.MallBaseId; extModel.MallBaseId = userInfo.MallBaseId;
extModel.TenantId = userInfo.TenantId; extModel.TenantId = userInfo.TenantId;
var oldBrandModel = carrierModule.GetBrandRepository(new RB_Brand_Extend { MallBaseId = userInfo.MallBaseId, TenantId = userInfo.TenantId, CompanyId = extModel.CompanyId }); var oldBrandModel = carrierModule.GetBrandRepository(new RB_CompanyBrand_Extend { MallBaseId = userInfo.MallBaseId, TenantId = userInfo.TenantId, CompanyId = extModel.CompanyId });
if (oldBrandModel != null && oldBrandModel.ID > 0) if (oldBrandModel != null && oldBrandModel.ID > 0)
{ {
extModel.ID = extModel.ID; extModel.ID = extModel.ID;
......
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