Commit 9f219772 authored by liudong1993's avatar liudong1993

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

parents 253d6c1d 3fc74708
......@@ -8,7 +8,7 @@ using VT.FW.DB;
namespace Mall.Model.Entity.TradePavilion
{
/// <summary>
/// 载体实体表
/// 品牌实体表
/// </summary>
[Serializable]
[DB(ConnectionName = "DefaultConnection")]
......@@ -54,12 +54,6 @@ namespace Mall.Model.Entity.TradePavilion
public DateStateEnum Status { get; set; }
/// <summary>
/// 载体名称
/// </summary>
public string CarrierName { get; set; }
/// <summary>
/// logo
/// </summary>
......@@ -67,94 +61,133 @@ namespace Mall.Model.Entity.TradePavilion
/// <summary>
/// 载体介绍图
/// 品牌介绍图
/// </summary>
public string Banner { get; set; }
/// <summary>
/// 载体视频
/// 品牌视频
/// </summary>
public string VideoUrl { get; set; }
/// <summary>
///
/// 品牌全名
/// </summary>
public int Province { get; set; }
public string FullBrandName { get; set; }
/// <summary>
///
/// 品牌名称
/// </summary>
public int City { get; set; }
public string BrandName { get; set; }
/// <summary>
/// 店铺数量
/// </summary>
public int ShopNum { get; set; }
/// <summary>
///
/// 建筑面积
/// </summary>
public int Area { get; set; }
public decimal BuiltUpArea { get; set; }
/// <summary>
/// 载体地址
/// 建筑面积
/// </summary>
public string Address { get; set; }
public decimal EndBuiltUpArea { get; set; }
/// <summary>
/// 载体地址经纬度
/// 品牌定位
/// </summary>
public string LatAndLon { get; set; }
public string BrandType { get; set; }
/// <summary>
/// 开发商
/// 客户群体
/// </summary>
public string Developers { get; set; }
public string CustomerType { get; set; }
/// <summary>
/// 开业时间
/// 扩店区域
/// </summary>
public DateTime? OpenTime { get; set; }
public string StoreExpansion { get; set; }
/// <summary>
/// 项目类型
/// 性质
/// </summary>
public ProjectTypeEnum? ProjectType { get; set; }
/// <summary>
/// 商业体量(单位:万平方米)
/// 面积要求
/// </summary>
public decimal CarrierSize { get; set; }
public decimal AreaRequirement { get; set; }
/// <summary>
/// 商业层数
/// 面积要求
/// </summary>
public string LayersNum { get; set; }
public decimal EndAreaRequirement { get; set; }
/// <summary>
/// 车位数量
/// 广告
/// </summary>
public int CarNum { get; set; }
public string Advertising { get; set; }
/// <summary>
/// 其他
/// </summary>
public string Other { get; set; }
/// <summary>
/// 业态规划
/// 店铺开口尺寸
/// </summary>
public string CarrierPlan { get; set; }
public string ShopSize { get; set; }
/// <summary>
/// 招引目标
/// 上下水(0-否1-有)
/// </summary>
public string CarrierTarget { get; set; }
public int Plumbing { get; set; }
/// <summary>
/// 管径(0-否1-有)
/// </summary>
public int Caliber { get; set; }
/// <summary>
/// 排污(0-否1-有)
/// </summary>
public int Sewage { get; set; }
/// <summary>
/// 燃气(0-否1-有)
/// </summary>
public int RanQi { get; set; }
/// <summary>
/// 定位
/// 电量
/// </summary>
public string Location { get; set; }
public string DianLiang { get; set; }
/// <summary>
/// 排烟量(0-否1-有)
/// </summary>
public int PaiYan { get; set; }
/// <summary>
/// 目标人群
/// 空调(0-否1-有)
/// </summary>
public string Crowd { get; set; }
public int KongTiao { get; set; }
/// <summary>
/// 新风(0-否1-有)
/// </summary>
public int XinFeng { get; set; }
/// <summary>
/// 品牌分类Id
/// </summary>
public int BrandClassId { get; set; }
}
}
using System;
using System.Collections.Generic;
using System.Text;
using Mall.Common.Enum;
using Mall.Common.Enum.TradePavilion;
using VT.FW.DB;
namespace Mall.Model.Entity.TradePavilion
{
/// <summary>
/// 品牌分类实体表
/// </summary>
[Serializable]
[DB(ConnectionName = "DefaultConnection")]
public class RB_BrandClass
{
/// <summary>
/// 编号
/// </summary>
public int ID { get; set; }
/// <summary>
/// 商户号id
/// </summary>
public int TenantId { get; set; }
/// <summary>
/// 小程序id
/// </summary>
public int MallBaseId { get; set; }
/// <summary>
/// 创建时间
/// </summary>
public DateTime CreateDate { get; set; }
/// <summary>
/// 修改时间
/// </summary>
public DateTime UpdateDate { get; set; }
/// <summary>
/// 删除状态
/// </summary>
public DateStateEnum Status { get; set; }
/// <summary>
/// logo
/// </summary>
public string Logo { get; set; }
/// <summary>
/// 分类名称
/// </summary>
public string ClassName { get; set; }
}
}
......@@ -21,6 +21,10 @@ namespace Mall.Model.Entity.TradePavilion
/// </summary>
public int CompanyId { get; set; }
/// <summary>
/// 品牌全名
/// </summary>
public string FullBrandName { get; set; }
/// <summary>
/// 品牌名称
......@@ -43,10 +47,6 @@ namespace Mall.Model.Entity.TradePavilion
public decimal EndBuiltUpArea { get; set; }
/// <summary>
/// 品牌定位
/// </summary>
public string FullBrandName { get; set; }
/// <summary>
/// 客户群体
......
using System;
using System.Collections.Generic;
using System.Text;
using Mall.Model.Entity.TradePavilion;
namespace Mall.Model.Extend.TradePavilion
{
public class RB_BrandClass_Extend: RB_BrandClass
{
}
}
......@@ -5,16 +5,16 @@ using Mall.Model.Entity.TradePavilion;
namespace Mall.Model.Extend.TradePavilion
{
public class RB_Brand_Extend : RB_CompanyBrand
public class RB_Brand_Extend : RB_Brand
{
/// <summary>
/// 客户群体
/// 分类名称
/// </summary>
public List<string> CustomerTypeInfo { get; set; }
public string ClassName { get; set; }
/// <summary>
/// 公司ids
/// </summary>
public string CompanyIds { get; set; }
public List<string> BannerList { get; set; }
public string ProjectName { get; set; }
}
}
using System;
using System.Collections.Generic;
using System.Text;
using Mall.Model.Entity.TradePavilion;
namespace Mall.Model.Extend.TradePavilion
{
public class RB_CompanyBrand_Extend : RB_CompanyBrand
{
/// <summary>
/// 客户群体
/// </summary>
public List<string> CustomerTypeInfo { get; set; }
/// <summary>
/// 公司ids
/// </summary>
public string CompanyIds { get; set; }
}
}
......@@ -13,6 +13,6 @@ namespace Mall.Model.Extend.TradePavilion
/// <summary>
/// 公司品牌
/// </summary>
public RB_Brand_Extend BrandModel { get; set; }
public RB_CompanyBrand_Extend BrandModel { get; set; }
}
}
This diff is collapsed.
......@@ -12,7 +12,7 @@ namespace Mall.Module.TradePavilion
public class CompanyModule
{
private readonly RB_CompanyRepository companyRepository = new RB_CompanyRepository();
private readonly RB_BrandRepository brandRepository = new RB_BrandRepository();
private readonly RB_CompanyBrandRepository brandRepository = new RB_CompanyBrandRepository();
/// <summary>
/// 获取公司信息分页列表
......@@ -30,12 +30,12 @@ namespace Mall.Module.TradePavilion
string carrierIds = string.Join(",", list.Select(x => x.CompanyId));
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())
{
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();
if (item.BrandModel != null && !string.IsNullOrWhiteSpace(item.BrandModel.CustomerType))
{
......@@ -83,10 +83,10 @@ namespace Mall.Module.TradePavilion
var model = companyRepository.GetEntity<RB_Company_Extend>(CompanyId);
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())
{
model.BrandModel = new RB_Brand_Extend();
model.BrandModel = new RB_CompanyBrand_Extend();
model.BrandModel = metroList.FirstOrDefault();
if (model.BrandModel != null && !string.IsNullOrWhiteSpace(model.BrandModel.CustomerType))
{
......@@ -116,7 +116,32 @@ namespace Mall.Module.TradePavilion
/// <returns></returns>
public RB_Company_Extend GetCompanyByUserIdModule(int userId)
{
return companyRepository.GetCompanyRepository(new RB_Company_Extend() { CreateBy = userId });
var model =companyRepository.GetCompanyRepository(new RB_Company_Extend() { CreateBy = userId });
if (model != null && model.CompanyId > 0)
{
var metroList = brandRepository.GetBrandList(new RB_CompanyBrand_Extend { TenantId = model.TenantId, MallBaseId = model.MallBaseId, CompanyId = model.CompanyId });
if (metroList != null && metroList.Any())
{
model.BrandModel = new RB_CompanyBrand_Extend();
model.BrandModel = metroList.FirstOrDefault();
if (model.BrandModel != null && !string.IsNullOrWhiteSpace(model.BrandModel.CustomerType))
{
model.BrandModel.CustomerTypeInfo = new List<string>();
foreach (var itemCustomerType in model.BrandModel.CustomerType.Split(","))
{
if (itemCustomerType != "5")
{
model.BrandModel.CustomerTypeInfo.Add(Common.Plugin.EnumHelper.GetEnumName(itemCustomerType));
}
else
{
model.BrandModel.CustomerTypeInfo.Add(model.BrandModel.CustomerOtherType);
}
}
}
}
}
return model;
}
/// <summary>
......
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using Mall.Common.Enum;
using Mall.Model.Entity.TradePavilion;
using Mall.Model.Extend.TradePavilion;
using VT.FW.DB.Dapper;
namespace Mall.Repository.TradePavilion
{
public class RB_BrandClassRepository:BaseRepository<RB_BrandClass>
{
/// <summary>
/// 获取品牌信息分页列表
/// </summary>
/// <param name="pageIndex"></param>
/// <param name="pageSize"></param>
/// <param name="rowsCount"></param>
/// <param name="query"></param>
/// <returns></returns>
public List<RB_BrandClass_Extend> GetBrandClassPageListRepository(int pageIndex, int pageSize, out long rowsCount, RB_BrandClass_Extend query)
{
rowsCount = 0;
DynamicParameters parameters = new DynamicParameters();
StringBuilder builder = new StringBuilder();
builder.AppendFormat(@"
SELECT *
FROM RB_BrandClass
WHERE 1=1
");
builder.AppendFormat(" AND {0}={1} ", nameof(RB_BrandClass_Extend.Status), (int)DateStateEnum.Normal);
if (query == null)
{
return new List<RB_BrandClass_Extend>();
}
else
{
if (query.TenantId > 0)
{
builder.AppendFormat(" AND {0}={1} ", nameof(RB_BrandClass_Extend.TenantId), query.TenantId);
}
if (query.MallBaseId > 0)
{
builder.AppendFormat(" AND {0}={1} ", nameof(RB_BrandClass_Extend.MallBaseId), query.MallBaseId);
}
if (!string.IsNullOrEmpty(query.ClassName))
{
builder.AppendFormat(" AND {0} LIKE @Name ", nameof(RB_BrandClass_Extend.ClassName));
parameters.Add("Name", "%" + query.ClassName.Trim() + "%");
}
}
return GetPage<RB_BrandClass_Extend>(pageIndex, pageSize, out rowsCount, builder.ToString(), parameters).ToList();
}
/// <summary>
/// 根据查询条件获取品牌信息实体
/// </summary>
/// <param name="query"></param>
/// <returns></returns>
public RB_BrandClass_Extend GetBrandClassRepository(RB_BrandClass_Extend query)
{
DynamicParameters parameters = new DynamicParameters();
StringBuilder builder = new StringBuilder();
builder.AppendFormat(@"
SELECT *
FROM RB_BrandClass
WHERE 1=1
");
builder.AppendFormat(" AND {0}={1} ", nameof(RB_BrandClass_Extend.Status), (int)DateStateEnum.Normal);
if (query == null)
{
return new RB_BrandClass_Extend();
}
else
{
if (query.TenantId > 0)
{
builder.AppendFormat(" AND {0}={1} ", nameof(RB_BrandClass_Extend.TenantId), query.TenantId);
}
if (query.MallBaseId > 0)
{
builder.AppendFormat(" AND {0}={1} ", nameof(RB_BrandClass_Extend.MallBaseId), query.MallBaseId);
}
if (!string.IsNullOrEmpty(query.ClassName))
{
builder.AppendFormat(" AND {0} LIKE @Name ", nameof(RB_BrandClass_Extend.ClassName));
parameters.Add("Name", "%" + query.ClassName.Trim() + "%");
}
if (query.ID > 0)
{
builder.AppendFormat(" AND {0}={1} ", nameof(RB_BrandClass_Extend.ID), query.ID);
}
}
return Get<RB_BrandClass_Extend>(builder.ToString(), parameters).FirstOrDefault();
}
/// <summary>
/// 根据查询条件获取品牌信息
/// </summary>
/// <param name="query"></param>
/// <returns></returns>
public List<RB_BrandClass_Extend> GetBrandClassList(RB_BrandClass_Extend query)
{
DynamicParameters parameters = new DynamicParameters();
StringBuilder builder = new StringBuilder();
builder.AppendFormat(@"
SELECT *
FROM RB_BrandClass
WHERE 1=1
");
builder.AppendFormat(" AND {0}={1} ", nameof(RB_BrandClass_Extend.Status), (int)DateStateEnum.Normal);
if (query == null)
{
return new List<RB_BrandClass_Extend>();
}
else
{
if (query.TenantId > 0)
{
builder.AppendFormat(" AND {0}={1} ", nameof(RB_BrandClass_Extend.TenantId), query.TenantId);
}
if (query.MallBaseId > 0)
{
builder.AppendFormat(" AND {0}={1} ", nameof(RB_BrandClass_Extend.MallBaseId), query.MallBaseId);
}
if (!string.IsNullOrEmpty(query.ClassName))
{
builder.AppendFormat(" AND {0} LIKE @Name ", nameof(RB_BrandClass_Extend.ClassName));
parameters.Add("Name", "%" + query.ClassName.Trim() + "%");
}
if (query.ID > 0)
{
builder.AppendFormat(" AND {0}={1} ", nameof(RB_BrandClass_Extend.ID), query.ID);
}
}
return Get<RB_BrandClass_Extend>(builder.ToString(), parameters).ToList();
}
}
}
......@@ -9,10 +9,7 @@ using VT.FW.DB.Dapper;
namespace Mall.Repository.TradePavilion
{
/// <summary>
/// 品牌信息仓储层
/// </summary>
public class RB_BrandRepository:BaseRepository<RB_CompanyBrand>
public class RB_BrandRepository : BaseRepository<RB_Brand>
{
/// <summary>
/// 获取品牌信息分页列表
......@@ -22,17 +19,17 @@ namespace Mall.Repository.TradePavilion
/// <param name="rowsCount"></param>
/// <param name="query"></param>
/// <returns></returns>
public List<RB_Brand_Extend> GetBrandPageListRepository(int pageIndex, int pageSize, out long rowsCount, RB_Brand_Extend query)
public List<RB_Brand_Extend> GetBrandPageList(int pageIndex, int pageSize, out long rowsCount, RB_Brand_Extend query)
{
rowsCount = 0;
DynamicParameters parameters = new DynamicParameters();
StringBuilder builder = new StringBuilder();
builder.AppendFormat(@"
SELECT *
FROM RB_Brand
WHERE 1=1
SELECT a.*,b.ClassName from rb_brand as a LEFT JOIN rb_brandclass as b on a.BrandClassId=b.ID
WHERE 1=1
");
builder.AppendFormat(" AND {0}={1} ", nameof(RB_Brand_Extend.Status), (int)DateStateEnum.Normal);
builder.AppendFormat(" AND a.{0}={1} ", nameof(RB_Brand_Extend.Status), (int)DateStateEnum.Normal);
builder.AppendFormat(" AND b.{0}={1} ", nameof(RB_Brand_Extend.Status), (int)DateStateEnum.Normal);
if (query == null)
{
return new List<RB_Brand_Extend>();
......@@ -41,17 +38,50 @@ WHERE 1=1
{
if (query.TenantId > 0)
{
builder.AppendFormat(" AND {0}={1} ", nameof(RB_Brand_Extend.TenantId), query.TenantId);
builder.AppendFormat(" AND a.{0}={1} ", nameof(RB_Brand_Extend.TenantId), query.TenantId);
}
if (query.MallBaseId > 0)
{
builder.AppendFormat(" AND {0}={1} ", nameof(RB_Brand_Extend.MallBaseId), query.MallBaseId);
builder.AppendFormat(" AND a.{0}={1} ", nameof(RB_Brand_Extend.MallBaseId), query.MallBaseId);
}
if (!string.IsNullOrEmpty(query.BrandName))
{
builder.AppendFormat(" AND {0} LIKE @Name ", nameof(RB_Brand_Extend.BrandName));
builder.AppendFormat(" AND a.{0} LIKE @Name ", nameof(RB_Brand_Extend.BrandName));
parameters.Add("Name", "%" + query.BrandName.Trim() + "%");
}
if (query.BrandClassId > 0)
{
builder.AppendFormat(" AND a.{0}={1} ", nameof(RB_Brand_Extend.BrandClassId), query.BrandClassId);
}
if (query.ProjectType.HasValue && query.ProjectType > 0)
{
builder.AppendFormat(" AND a.{0}={1} ", nameof(RB_Brand_Extend.ProjectType), (int)query.ProjectType);
}
if (query.RanQi > -1)
{
builder.AppendFormat(" AND a.{0}={1} ", nameof(RB_Brand_Extend.RanQi), query.RanQi);
}
if (query.KongTiao > -1)
{
builder.AppendFormat(" AND a.{0}={1} ", nameof(RB_Brand_Extend.KongTiao), query.KongTiao);
}
if (query.XinFeng > -1)
{
builder.AppendFormat(" AND a.{0}={1} ", nameof(RB_Brand_Extend.XinFeng), query.XinFeng);
}
if (query.Plumbing > -1)
{
builder.AppendFormat(" AND a.{0}={1} ", nameof(RB_Brand_Extend.Plumbing), query.Plumbing);
}
if (query.Caliber > -1)
{
builder.AppendFormat(" AND a.{0}={1} ", nameof(RB_Brand_Extend.Caliber), query.Caliber);
}
if (query.Sewage > -1)
{
builder.AppendFormat(" AND a.{0}={1} ", nameof(RB_Brand_Extend.Sewage), query.Sewage);
}
}
return GetPage<RB_Brand_Extend>(pageIndex, pageSize, out rowsCount, builder.ToString(), parameters).ToList();
}
......@@ -61,42 +91,42 @@ WHERE 1=1
/// </summary>
/// <param name="query"></param>
/// <returns></returns>
public RB_Brand_Extend GetBrandRepository(RB_Brand_Extend query)
public RB_Brand_Extend GetBrand(RB_Brand_Extend query)
{
DynamicParameters parameters = new DynamicParameters();
StringBuilder builder = new StringBuilder();
builder.AppendFormat(@"
SELECT *
FROM RB_Brand
WHERE 1=1
SELECT a.*,b.ClassName from rb_brand as a LEFT JOIN rb_brandclass as b on a.BrandClassId=b.ID
WHERE 1=1
");
builder.AppendFormat(" AND {0}={1} ", nameof(RB_Brand_Extend.Status), (int)DateStateEnum.Normal);
builder.AppendFormat(" AND a.{0}={1} ", nameof(RB_Brand_Extend.Status), (int)DateStateEnum.Normal);
builder.AppendFormat(" AND b.{0}={1} ", nameof(RB_Brand_Extend.Status), (int)DateStateEnum.Normal);
if (query == null)
{
return new RB_Brand_Extend();
}
else
{
if (query.ID > 0)
{
builder.AppendFormat(" AND a.{0}={1} ", nameof(RB_Brand_Extend.ID), query.ID);
}
if (query.TenantId > 0)
{
builder.AppendFormat(" AND {0}={1} ", nameof(RB_Brand_Extend.TenantId), query.TenantId);
builder.AppendFormat(" AND a.{0}={1} ", nameof(RB_Brand_Extend.TenantId), query.TenantId);
}
if (query.MallBaseId > 0)
{
builder.AppendFormat(" AND {0}={1} ", nameof(RB_Brand_Extend.MallBaseId), query.MallBaseId);
builder.AppendFormat(" AND a.{0}={1} ", nameof(RB_Brand_Extend.MallBaseId), query.MallBaseId);
}
if (!string.IsNullOrEmpty(query.BrandName))
{
builder.AppendFormat(" AND {0} LIKE @Name ", nameof(RB_Brand_Extend.BrandName));
builder.AppendFormat(" AND a.{0} LIKE @Name ", nameof(RB_Brand_Extend.BrandName));
parameters.Add("Name", "%" + query.BrandName.Trim() + "%");
}
if (query.CompanyId > 0)
if (query.BrandClassId > 0)
{
builder.AppendFormat(" AND {0}={1} ", nameof(RB_Brand_Extend.CompanyId), query.CompanyId);
}
if (!string.IsNullOrWhiteSpace(query.CompanyIds))
{
builder.AppendFormat(" AND {0} in({1})", nameof(RB_Brand_Extend.CompanyId), query.CompanyIds);
builder.AppendFormat(" AND a.{0}={1} ", nameof(RB_Brand_Extend.BrandClassId), query.BrandClassId);
}
}
return Get<RB_Brand_Extend>(builder.ToString(), parameters).FirstOrDefault();
......@@ -108,16 +138,16 @@ WHERE 1=1
/// </summary>
/// <param name="query"></param>
/// <returns></returns>
public List<RB_Brand_Extend> GetBrandList(RB_Brand_Extend query)
public List<RB_Brand_Extend> GetBrandListByWhere(RB_Brand_Extend query)
{
DynamicParameters parameters = new DynamicParameters();
StringBuilder builder = new StringBuilder();
builder.AppendFormat(@"
SELECT *
FROM RB_Brand
WHERE 1=1
SELECT a.*,b.ClassName from rb_brand as a LEFT JOIN rb_brandclass as b on a.BrandClassId=b.ID
WHERE 1=1
");
builder.AppendFormat(" AND {0}={1} ", nameof(RB_Brand_Extend.Status), (int)DateStateEnum.Normal);
builder.AppendFormat(" AND a.{0}={1} ", nameof(RB_Brand_Extend.Status), (int)DateStateEnum.Normal);
builder.AppendFormat(" AND b.{0}={1} ", nameof(RB_Brand_Extend.Status), (int)DateStateEnum.Normal);
if (query == null)
{
return new List<RB_Brand_Extend>();
......@@ -126,24 +156,24 @@ WHERE 1=1
{
if (query.TenantId > 0)
{
builder.AppendFormat(" AND {0}={1} ", nameof(RB_Brand_Extend.TenantId), query.TenantId);
builder.AppendFormat(" AND a.{0}={1} ", nameof(RB_Brand_Extend.TenantId), query.TenantId);
}
if (query.ID > 0)
{
builder.AppendFormat(" AND a.{0}={1} ", nameof(RB_Brand_Extend.ID), query.ID);
}
if (query.MallBaseId > 0)
{
builder.AppendFormat(" AND {0}={1} ", nameof(RB_Brand_Extend.MallBaseId), query.MallBaseId);
builder.AppendFormat(" AND a.{0}={1} ", nameof(RB_Brand_Extend.MallBaseId), query.MallBaseId);
}
if (!string.IsNullOrEmpty(query.BrandName))
{
builder.AppendFormat(" AND {0} LIKE @Name ", nameof(RB_Brand_Extend.BrandName));
builder.AppendFormat(" AND a.{0} LIKE @Name ", nameof(RB_Brand_Extend.BrandName));
parameters.Add("Name", "%" + query.BrandName.Trim() + "%");
}
if (query.CompanyId > 0)
{
builder.AppendFormat(" AND {0}={1} ", nameof(RB_Brand_Extend.CompanyId), query.CompanyId);
}
if (!string.IsNullOrWhiteSpace(query.CompanyIds))
if (query.BrandClassId > 0)
{
builder.AppendFormat(" AND {0} in({1})", nameof(RB_Brand_Extend.CompanyId), query.CompanyIds);
builder.AppendFormat(" AND a.{0}={1} ", nameof(RB_Brand_Extend.BrandClassId), query.BrandClassId);
}
}
return Get<RB_Brand_Extend>(builder.ToString(), parameters).ToList();
......
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using Mall.Common.Enum;
using Mall.Model.Entity.TradePavilion;
using Mall.Model.Extend.TradePavilion;
using VT.FW.DB.Dapper;
namespace Mall.Repository.TradePavilion
{
/// <summary>
/// 品牌信息仓储层
/// </summary>
public class RB_CompanyBrandRepository:BaseRepository<RB_CompanyBrand>
{
/// <summary>
/// 获取品牌信息分页列表
/// </summary>
/// <param name="pageIndex"></param>
/// <param name="pageSize"></param>
/// <param name="rowsCount"></param>
/// <param name="query"></param>
/// <returns></returns>
public List<RB_CompanyBrand_Extend> GetBrandPageListRepository(int pageIndex, int pageSize, out long rowsCount, RB_CompanyBrand_Extend query)
{
rowsCount = 0;
DynamicParameters parameters = new DynamicParameters();
StringBuilder builder = new StringBuilder();
builder.AppendFormat(@"
SELECT *
FROM RB_CompanyBrand
WHERE 1=1
");
builder.AppendFormat(" AND {0}={1} ", nameof(RB_CompanyBrand_Extend.Status), (int)DateStateEnum.Normal);
if (query == null)
{
return new List<RB_CompanyBrand_Extend>();
}
else
{
if (query.TenantId > 0)
{
builder.AppendFormat(" AND {0}={1} ", nameof(RB_CompanyBrand_Extend.TenantId), query.TenantId);
}
if (query.MallBaseId > 0)
{
builder.AppendFormat(" AND {0}={1} ", nameof(RB_CompanyBrand_Extend.MallBaseId), query.MallBaseId);
}
if (!string.IsNullOrEmpty(query.BrandName))
{
builder.AppendFormat(" AND {0} LIKE @Name ", nameof(RB_CompanyBrand_Extend.BrandName));
parameters.Add("Name", "%" + query.BrandName.Trim() + "%");
}
}
return GetPage<RB_CompanyBrand_Extend>(pageIndex, pageSize, out rowsCount, builder.ToString(), parameters).ToList();
}
/// <summary>
/// 根据查询条件获取品牌信息实体
/// </summary>
/// <param name="query"></param>
/// <returns></returns>
public RB_CompanyBrand_Extend GetBrandRepository(RB_CompanyBrand_Extend query)
{
DynamicParameters parameters = new DynamicParameters();
StringBuilder builder = new StringBuilder();
builder.AppendFormat(@"
SELECT *
FROM RB_CompanyBrand
WHERE 1=1
");
builder.AppendFormat(" AND {0}={1} ", nameof(RB_CompanyBrand_Extend.Status), (int)DateStateEnum.Normal);
if (query == null)
{
return new RB_CompanyBrand_Extend();
}
else
{
if (query.TenantId > 0)
{
builder.AppendFormat(" AND {0}={1} ", nameof(RB_CompanyBrand_Extend.TenantId), query.TenantId);
}
if (query.MallBaseId > 0)
{
builder.AppendFormat(" AND {0}={1} ", nameof(RB_CompanyBrand_Extend.MallBaseId), query.MallBaseId);
}
if (!string.IsNullOrEmpty(query.BrandName))
{
builder.AppendFormat(" AND {0} LIKE @Name ", nameof(RB_CompanyBrand_Extend.BrandName));
parameters.Add("Name", "%" + query.BrandName.Trim() + "%");
}
if (query.CompanyId > 0)
{
builder.AppendFormat(" AND {0}={1} ", nameof(RB_CompanyBrand_Extend.CompanyId), query.CompanyId);
}
if (!string.IsNullOrWhiteSpace(query.CompanyIds))
{
builder.AppendFormat(" AND {0} in({1})", nameof(RB_CompanyBrand_Extend.CompanyId), query.CompanyIds);
}
}
return Get<RB_CompanyBrand_Extend>(builder.ToString(), parameters).FirstOrDefault();
}
/// <summary>
/// 根据查询条件获取品牌信息
/// </summary>
/// <param name="query"></param>
/// <returns></returns>
public List<RB_CompanyBrand_Extend> GetBrandList(RB_CompanyBrand_Extend query)
{
DynamicParameters parameters = new DynamicParameters();
StringBuilder builder = new StringBuilder();
builder.AppendFormat(@"
SELECT *
FROM RB_CompanyBrand
WHERE 1=1
");
builder.AppendFormat(" AND {0}={1} ", nameof(RB_CompanyBrand_Extend.Status), (int)DateStateEnum.Normal);
if (query == null)
{
return new List<RB_CompanyBrand_Extend>();
}
else
{
if (query.TenantId > 0)
{
builder.AppendFormat(" AND {0}={1} ", nameof(RB_CompanyBrand_Extend.TenantId), query.TenantId);
}
if (query.MallBaseId > 0)
{
builder.AppendFormat(" AND {0}={1} ", nameof(RB_CompanyBrand_Extend.MallBaseId), query.MallBaseId);
}
if (!string.IsNullOrEmpty(query.BrandName))
{
builder.AppendFormat(" AND {0} LIKE @Name ", nameof(RB_CompanyBrand_Extend.BrandName));
parameters.Add("Name", "%" + query.BrandName.Trim() + "%");
}
if (query.CompanyId > 0)
{
builder.AppendFormat(" AND {0}={1} ", nameof(RB_CompanyBrand_Extend.CompanyId), query.CompanyId);
}
if (!string.IsNullOrWhiteSpace(query.CompanyIds))
{
builder.AppendFormat(" AND {0} in({1})", nameof(RB_CompanyBrand_Extend.CompanyId), query.CompanyIds);
}
}
return Get<RB_CompanyBrand_Extend>(builder.ToString(), parameters).ToList();
}
}
}
......@@ -82,6 +82,7 @@ namespace Mall.WebApi.Controllers.TradePavilion
/// 新增修改公司信息
/// </summary>
/// <returns></returns>
[HttpPost]
public ApiResult SetCompany()
{
JObject parms = JObject.Parse(RequestParm.msg.ToString());
......@@ -136,6 +137,7 @@ namespace Mall.WebApi.Controllers.TradePavilion
/// 获取当前用户的公司信息实体
/// </summary>
/// <returns></returns>
[HttpPost]
public ApiResult GetUserCompany()
{
var userInfo = AppletUserInfo;
......@@ -879,15 +881,16 @@ namespace Mall.WebApi.Controllers.TradePavilion
#endregion
#region 品牌
#region 公司品牌
/// <summary>
/// 新增修改品牌信息
/// </summary>
/// <returns></returns>
[HttpPost]
public ApiResult SetBrand()
{
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))
{
......@@ -926,16 +929,30 @@ namespace Mall.WebApi.Controllers.TradePavilion
extModel.Status = Common.Enum.DateStateEnum.Normal;
extModel.MallBaseId = userInfo.MallBaseId;
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)
{
extModel.ID = extModel.ID;
}
var flag = carrierModule.SetBrand(extModel);
var flag = carrierModule.SetCompanyBrand(extModel);
return flag ? ApiResult.Success() : ApiResult.Failed();
}
/// <summary>
/// 获取当前用户的公司品牌信息实体
/// </summary>
/// <returns></returns>
[HttpPost]
public ApiResult GetUserCompanyBrand()
{
var userInfo = AppletUserInfo;
JObject parms = JObject.Parse(RequestParm.msg.ToString());
var CompanyId = parms.GetInt("CompanyId", 0);
var model = carrierModule.GetBrandRepository(new RB_CompanyBrand_Extend { TenantId= userInfo .TenantId,MallBaseId= userInfo .MallBaseId,CompanyId= CompanyId });
return ApiResult.Success(data: model);
}
/// <summary>
/// 获取客户群体枚举
......@@ -970,5 +987,102 @@ namespace Mall.WebApi.Controllers.TradePavilion
}
#endregion
#region 品牌
/// <summary>
/// 获取品牌分页列表
/// </summary>
/// <returns></returns>
[HttpGet]
[HttpPost]
[AllowAnonymous]
public ApiResult GetBrandPageList()
{
ResultPageModel pageModel = JsonConvert.DeserializeObject<ResultPageModel>(RequestParm.msg.ToString());
JObject parms = JObject.Parse(RequestParm.msg.ToString());
var query = new RB_Brand_Extend()
{
BrandName = parms.GetStringValue("BrandName"),
ProjectType = (Common.Enum.TradePavilion.ProjectTypeEnum)parms.GetInt("ProjectType", 0),
BrandClassId = parms.GetInt("BrandClassId", 0),
RanQi = parms.GetInt("RanQi", -1),
KongTiao = parms.GetInt("KongTiao", -1),
XinFeng = parms.GetInt("XinFeng", -1),
Plumbing = parms.GetInt("Plumbing", -1),
Caliber = parms.GetInt("Caliber", -1),
Sewage = parms.GetInt("Sewage", -1),
};
query.MallBaseId = RequestParm.MallBaseId;
query.TenantId = RequestParm.TenantId;
var list = carrierModule.GetBrandPageList(pageModel.pageIndex, pageModel.pageSize, out long rowsCount, query);
foreach (var item in list)
{
if (!string.IsNullOrWhiteSpace(item.Banner))
{
item.BannerList = JsonConvert.DeserializeObject<List<string>>(item.Banner);
}
else
{
item.BannerList = new List<string>();
}
}
pageModel.count = Convert.ToInt32(rowsCount);
pageModel.pageData = list;
return ApiResult.Success(data: pageModel);
}
/// <summary>
/// 获取品牌实体
/// </summary>
/// <returns></returns>
[HttpGet]
[HttpPost]
[AllowAnonymous]
public ApiResult GetBrandDetails()
{
JObject parms = JObject.Parse(RequestParm.msg.ToString());
var query = new RB_Brand_Extend()
{
ID = parms.GetInt("ID", 0),
};
query.MallBaseId = RequestParm.MallBaseId;
query.TenantId = RequestParm.TenantId;
var extModel = carrierModule.GetBrand(query);
if (!string.IsNullOrWhiteSpace(extModel.Banner))
{
extModel.BannerList = JsonConvert.DeserializeObject<List<string>>(extModel.Banner);
}
else
{
extModel.BannerList = new List<string>();
}
extModel.ProjectName = (extModel.ProjectType.HasValue && extModel.ProjectType.Value > 0) ? EnumHelper.GetEnumName(extModel.ProjectType):"";
return ApiResult.Success(data: extModel);
}
/// <summary>
/// 获取品牌分类分页列表
/// </summary>
/// <returns></returns>
[HttpGet]
[HttpPost]
[AllowAnonymous]
public ApiResult GetBrandClassList()
{
JObject parms = JObject.Parse(RequestParm.msg.ToString());
var query = new RB_BrandClass_Extend();
query.MallBaseId = RequestParm.MallBaseId;
query.TenantId = RequestParm.TenantId;
var list = carrierModule.GetBrandClassList(query);
return ApiResult.Success(data: list);
}
#endregion
}
}
......@@ -1030,7 +1030,7 @@ namespace Mall.WebApi.Controllers.TradePavilion
{
query.Banner = "";
}
if (query.ID==0)
if (query.ID == 0)
{
query.CreateDate = System.DateTime.Now;
query.MallBaseId = RequestParm.MallBaseId;
......@@ -1055,6 +1055,266 @@ namespace Mall.WebApi.Controllers.TradePavilion
var flag = carrierModule.RemoveCarrierModule(CarrierId, RequestParm.TenantId, RequestParm.MallBaseId, Status);
return flag ? ApiResult.Success() : ApiResult.Failed();
}
#endregion
#region 品牌管理
/// <summary>
/// 获取商品性质枚举
/// </summary>
/// <returns></returns>
[HttpPost]
[AllowAnonymous]
public ApiResult GetProjectTypeEnumList()
{
var list = EnumHelper.GetEnumList(typeof(Common.Enum.TradePavilion.ProjectTypeEnum));
return ApiResult.Success("", list.OrderBy(x => Convert.ToInt32(x.Value)).Select(x => new
{
Name = x.Key,
Id = Convert.ToInt32(x.Value)
}));
}
/// <summary>
/// 获取品牌分类分页列表
/// </summary>
/// <returns></returns>
[HttpGet]
[HttpPost]
public ApiResult GetBrandClassPageList()
{
ResultPageModel pageModel = JsonConvert.DeserializeObject<ResultPageModel>(RequestParm.msg.ToString());
JObject parms = JObject.Parse(RequestParm.msg.ToString());
var query = new RB_BrandClass_Extend()
{
ClassName = parms.GetStringValue("ClassName")
};
query.MallBaseId = RequestParm.MallBaseId;
query.TenantId = RequestParm.TenantId;
var list = carrierModule.GetBrandClassPageListRepository(pageModel.pageIndex, pageModel.pageSize, out long rowsCount, query);
pageModel.count = Convert.ToInt32(rowsCount);
pageModel.pageData = list;
return ApiResult.Success(data: pageModel);
}
/// <summary>
/// 获取品牌分类分页列表
/// </summary>
/// <returns></returns>
[HttpGet]
[HttpPost]
public ApiResult GetBrandClassList()
{
JObject parms = JObject.Parse(RequestParm.msg.ToString());
var query = new RB_BrandClass_Extend() ;
query.MallBaseId = RequestParm.MallBaseId;
query.TenantId = RequestParm.TenantId;
var list = carrierModule.GetBrandClassList( query);
return ApiResult.Success(data: list);
}
/// <summary>
/// 获取品牌分类实体
/// </summary>
/// <returns></returns>
[HttpGet]
[HttpPost]
public ApiResult GetBrandClassDetails()
{
JObject parms = JObject.Parse(RequestParm.msg.ToString());
var query = new RB_BrandClass_Extend()
{
ID = parms.GetInt("ID", 0),
};
query.MallBaseId = RequestParm.MallBaseId;
query.TenantId = RequestParm.TenantId;
var extModel = carrierModule.GetBrandClassRepository(query);
return ApiResult.Success(data: extModel);
}
/// <summary>
/// 新增/修改品牌信息
/// </summary>
/// <returns></returns>
[HttpPost]
public ApiResult GetSetBrandClass()
{
JObject parms = JObject.Parse(RequestParm.msg.ToString());
RB_BrandClass_Extend query = JsonConvert.DeserializeObject<RB_BrandClass_Extend>(RequestParm.msg.ToString());
if (string.IsNullOrWhiteSpace(query.ClassName))
{
return ApiResult.Failed("请输入分类名称");
}
if (string.IsNullOrWhiteSpace(query.Logo))
{
return ApiResult.Failed("请上传Logo");
}
if (query.ID == 0)
{
query.CreateDate = System.DateTime.Now;
query.MallBaseId = RequestParm.MallBaseId;
query.TenantId = RequestParm.TenantId;
}
query.Status = 0;
query.UpdateDate = System.DateTime.Now;
bool flag = carrierModule.SetBrandClass(query);
return flag ? ApiResult.Success() : ApiResult.Failed();
}
/// <summary>
/// 删除品牌信息
/// </summary>
/// <returns></returns>
public ApiResult RemoveBrandClass()
{
JObject parms = JObject.Parse(RequestParm.msg.ToString());
var CarrierId = parms.GetInt("Id", 0);
var flag = carrierModule.RemoveBrandClassModule(CarrierId);
return flag ? ApiResult.Success() : ApiResult.Failed();
}
/// <summary>
/// 获取品牌分页列表
/// </summary>
/// <returns></returns>
[HttpGet]
[HttpPost]
public ApiResult GetBrandPageList()
{
ResultPageModel pageModel = JsonConvert.DeserializeObject<ResultPageModel>(RequestParm.msg.ToString());
JObject parms = JObject.Parse(RequestParm.msg.ToString());
var query = new RB_Brand_Extend()
{
BrandName = parms.GetStringValue("BrandName"),
ProjectType = (Common.Enum.TradePavilion.ProjectTypeEnum)parms.GetInt("ProjectType", 0),
BrandClassId= parms.GetInt("BrandClassId",0),
RanQi = parms.GetInt("RanQi", -1),
KongTiao = parms.GetInt("KongTiao", -1),
XinFeng = parms.GetInt("XinFeng", -1),
Plumbing = parms.GetInt("Plumbing", -1),
Caliber = parms.GetInt("Caliber", -1),
Sewage = parms.GetInt("Sewage", -1),
};
query.MallBaseId = RequestParm.MallBaseId;
query.TenantId = RequestParm.TenantId;
var list = carrierModule.GetBrandPageList(pageModel.pageIndex, pageModel.pageSize, out long rowsCount, query);
foreach (var item in list)
{
if (!string.IsNullOrWhiteSpace(item.Banner))
{
item.BannerList = JsonConvert.DeserializeObject<List<string>>(item.Banner);
}
else
{
item.BannerList = new List<string>();
}
}
pageModel.count = Convert.ToInt32(rowsCount);
pageModel.pageData = list;
return ApiResult.Success(data: pageModel);
}
/// <summary>
/// 获取品牌分类实体
/// </summary>
/// <returns></returns>
[HttpGet]
[HttpPost]
public ApiResult GetBrandDetails()
{
JObject parms = JObject.Parse(RequestParm.msg.ToString());
var query = new RB_Brand_Extend()
{
ID = parms.GetInt("ID", 0),
};
query.MallBaseId = RequestParm.MallBaseId;
query.TenantId = RequestParm.TenantId;
var extModel = carrierModule.GetBrand(query);
if (!string.IsNullOrWhiteSpace(extModel.Banner))
{
extModel.BannerList = JsonConvert.DeserializeObject<List<string>>(extModel.Banner);
}
else
{
extModel.BannerList = new List<string>();
}
return ApiResult.Success(data: extModel);
}
/// <summary>
/// 新增/修改品牌信息
/// </summary>
/// <returns></returns>
[HttpPost]
public ApiResult GetSetBrand()
{
JObject parms = JObject.Parse(RequestParm.msg.ToString());
RB_Brand_Extend query = JsonConvert.DeserializeObject<RB_Brand_Extend>(RequestParm.msg.ToString());
if (string.IsNullOrWhiteSpace(query.BrandName))
{
return ApiResult.Failed("请输入品牌名称");
}
if (string.IsNullOrWhiteSpace(query.Logo))
{
return ApiResult.Failed("请上传Logo");
}
if (query.BrandClassId == 0)
{
return ApiResult.Failed("请选择品牌分类");
}
if (query.BannerList != null && query.BannerList.Any())
{
query.Banner = JsonConvert.SerializeObject(query.BannerList);
}
else
{
query.Banner = "";
}
if (query.ID == 0)
{
query.CreateDate = System.DateTime.Now;
query.MallBaseId = RequestParm.MallBaseId;
query.TenantId = RequestParm.TenantId;
}
query.Status = 0;
query.UpdateDate = System.DateTime.Now;
bool flag = carrierModule.SetBrand(query);
return flag ? ApiResult.Success() : ApiResult.Failed();
}
/// <summary>
/// 删除品牌信息
/// </summary>
/// <returns></returns>
public ApiResult RemoveBrand()
{
JObject parms = JObject.Parse(RequestParm.msg.ToString());
var CarrierId = parms.GetInt("Id", 0);
var flag = carrierModule.RemoveBrandModule(CarrierId);
return flag ? ApiResult.Success() : ApiResult.Failed();
}
#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