Skip to content

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

提交代码

parent b5639adb
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 1851 additions and 223 deletions
Mall.Common/Enum/TradePavilion/CustomerTypeEnum.cs 0 → 100644
View file @ 4cafeb5e
using System;
using System.Collections.Generic;
using System.Text;
using Mall.Common.Plugin;
namespace Mall.Common.Enum.TradePavilion
{
public enum CustomerTypeEnum
{
/// <summary>
/// 婴儿
/// </summary>
[EnumField("婴儿")]
Baby = 1,
/// <summary>
/// 儿童
/// </summary>
[EnumField("儿童")]
Children = 2,
/// <summary>
/// 妇女
/// </summary>
[EnumField("妇女")]
Woman = 3,
/// <summary>
///老人
/// </summary>
[EnumField("老人")]
OldMan = 4,
/// <summary>
///其他
/// </summary>
[EnumField("其他")]
Other = 5
}
}
Mall.Common/Enum/TradePavilion/ProjectTypeEnum.cs 0 → 100644
View file @ 4cafeb5e
using System;
using System.Collections.Generic;
using System.Text;
using Mall.Common.Plugin;
namespace Mall.Common.Enum.TradePavilion
{
public enum ProjectTypeEnum
{
/// <summary>
/// 百货
/// </summary>
[EnumField("百货")]
DepartmentStore = 1,
/// <summary>
/// shopping mall
/// </summary>
[EnumField("shopping mall")]
ShoppingMall = 2,
/// <summary>
/// 集中式街区
/// </summary>
[EnumField("集中式街区")]
Block = 3,
/// <summary>
///其他
/// </summary>
[EnumField("其他")]
Other = 4
}
}
Mall.Model/Entity/TradePavilion/RB_Brand.cs 0 → 100644
View file @ 4cafeb5e
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_Brand
{
/// <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 int CreateBy { get; set; }
/// <summary>
/// 创建时间
/// </summary>
public DateTime CreateDate { get; set; }
/// <summary>
/// 修改人
/// </summary>
public int UpdateBy { get; set; }
/// <summary>
/// 修改时间
/// </summary>
public DateTime UpdateDate { get; set; }
/// <summary>
/// 删除状态
/// </summary>
public DateStateEnum Status { get; set; }
/// <summary>
/// 载体名称
/// </summary>
public string CarrierName { get; set; }
/// <summary>
/// logo
/// </summary>
public string Logo { get; set; }
/// <summary>
/// 载体介绍图
/// </summary>
public string Banner { get; set; }
/// <summary>
/// 载体视频
/// </summary>
public string VideoUrl { get; set; }
/// <summary>
/// 省
/// </summary>
public int Province { get; set; }
/// <summary>
/// 市
/// </summary>
public int City { get; set; }
/// <summary>
/// 区
/// </summary>
public int Area { get; set; }
/// <summary>
/// 载体地址
/// </summary>
public string Address { get; set; }
/// <summary>
/// 载体地址经纬度
/// </summary>
public string LatAndLon { get; set; }
/// <summary>
/// 开发商
/// </summary>
public string Developers { get; set; }
/// <summary>
/// 开业时间
/// </summary>
public DateTime? OpenTime { get; set; }
/// <summary>
/// 项目类型
/// </summary>
public ProjectTypeEnum? ProjectType { get; set; }
/// <summary>
/// 商业体量（单位：万平方米）
/// </summary>
public decimal CarrierSize { get; set; }
/// <summary>
/// 商业层数
/// </summary>
public string LayersNum { get; set; }
/// <summary>
/// 车位数量
/// </summary>
public int CarNum { get; set; }
/// <summary>
/// 业态规划
/// </summary>
public string CarrierPlan { get; set; }
/// <summary>
/// 招引目标
/// </summary>
public string CarrierTarget { get; set; }
/// <summary>
/// 定位
/// </summary>
public string Location { get; set; }
/// <summary>
/// 目标人群
/// </summary>
public string Crowd { get; set; }
}
}
Mall.Model/Entity/TradePavilion/RB_Carrier.cs 0 → 100644
View file @ 4cafeb5e
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_Carrier
{
/// <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 int CreateBy { get; set; }
/// <summary>
/// 创建时间
/// </summary>
public DateTime CreateDate { get; set; }
/// <summary>
/// 修改人
/// </summary>
public int UpdateBy { get; set; }
/// <summary>
/// 修改时间
/// </summary>
public DateTime UpdateDate { get; set; }
/// <summary>
/// 删除状态
/// </summary>
public DateStateEnum Status { get; set; }
/// <summary>
/// 载体名称
/// </summary>
public string CarrierName { get; set; }
/// <summary>
/// logo
/// </summary>
public string Logo { get; set; }
/// <summary>
/// 载体介绍图
/// </summary>
public string Banner { get; set; }
/// <summary>
/// 载体视频
/// </summary>
public string VideoUrl { get; set; }
/// <summary>
/// 省
/// </summary>
public int Province { get; set; }
/// <summary>
/// 市
/// </summary>
public int City { get; set; }
/// <summary>
/// 区
/// </summary>
public int Area { get; set; }
/// <summary>
/// 载体地址
/// </summary>
public string Address { get; set; }
/// <summary>
/// 载体地址经纬度
/// </summary>
public string LatAndLon { get; set; }
/// <summary>
/// 开发商
/// </summary>
public string Developers { get; set; }
/// <summary>
/// 开业时间
/// </summary>
public DateTime? OpenTime { get; set; }
/// <summary>
/// 项目类型
/// </summary>
public ProjectTypeEnum? ProjectType { get; set; }
/// <summary>
/// 商业体量（单位：万平方米）
/// </summary>
public decimal CarrierSize { get; set; }
/// <summary>
/// 商业层数
/// </summary>
public string LayersNum { get; set; }
/// <summary>
/// 车位数量
/// </summary>
public int CarNum { get; set; }
/// <summary>
/// 业态规划
/// </summary>
public string CarrierPlan { get; set; }
/// <summary>
/// 招引目标
/// </summary>
public string CarrierTarget { get; set; }
/// <summary>
/// 定位
/// </summary>
public string Location { get; set; }
/// <summary>
/// 目标人群
/// </summary>
public string Crowd { get; set; }
}
}
Mall.Model/Entity/TradePavilion/RB_CarrierMetro.cs 0 → 100644
View file @ 4cafeb5e
using System;
using System.Collections.Generic;
using System.Text;
using Mall.Common.Enum;
using VT.FW.DB;
namespace Mall.Model.Entity.TradePavilion
{
/// <summary>
/// 载体地铁实体表
/// </summary>
[Serializable]
[DB(ConnectionName = "DefaultConnection")]
public class RB_CarrierMetro
{
/// <summary>
/// 编号
/// </summary>
public int ID { get; set; }
/// <summary>
/// 地铁线路
/// </summary>
public int MetroNum { get; set; }
/// <summary>
/// 站点名称
/// </summary>
public string MetroName { get; set; }
/// <summary>
/// 距离
/// </summary>
public string Distance { get; set; }
/// <summary>
/// 载体id
/// </summary>
public int CarrierId { get; set; }
/// <summary>
/// 商户号id
/// </summary>
public int TenantId { get; set; }
/// <summary>
/// 小程序id
/// </summary>
public int MallBaseId { get; set; }
/// <summary>
/// 删除状态
/// </summary>
public DateStateEnum Status { get; set; }
}
}
Mall.Model/Entity/TradePavilion/RB_Commerce_News.cs
View file @ 4cafeb5e
......@@ -31,6 +31,12 @@ namespace Mall.Model.Entity.TradePavilion
/// </summary>
public string Title { get; set; }
/// <summary>
/// 副标题
/// </summary>
public string Subtitle { get; set; }
/// <summary>
/// 行业
/// </summary>
......
Mall.Model/Entity/TradePavilion/RB_Company.cs
View file @ 4cafeb5e
......@@ -4,151 +4,168 @@ using VT.FW.DB;
namespace Mall.Model.Entity.TradePavilion
{
/// <summary>
/// 公司信息实体类
/// </summary>
[Serializable]
[DB(ConnectionName = "DefaultConnection")]
public class RB_Company
/// <summary>
/// 公司信息实体类
/// </summary>
[Serializable]
[DB(ConnectionName = "DefaultConnection")]
public class RB_Company
{
/// <summary>
/// 主键(公司编号)
/// </summary>
public int CompanyId { get; set; }
/// <summary>
/// 公司名称
/// </summary>
public string CompanyName { get; set; }
/// <summary>
/// 公司英文名称
/// </summary>
public string CompanyEnName { get; set; }
/// <summary>
/// 联系人(责任人)
/// </summary>
public string Principal { get; set; }
/// <summary>
/// 联系电话
/// </summary>
public string Mobile { get; set; }
/// <summary>
/// 邮箱
/// </summary>
public string EMail { get; set; }
/// <summary>
/// 法人
/// </summary>
public string LegalPerson { get; set; }
/// <summary>
/// 公司微信
/// </summary>
public string WechatNo { get; set; }
/// <summary>
/// 公司介绍
/// </summary>
public string CompanyIntro { get; set; }
/// <summary>
/// 官网
/// </summary>
public string DomainUrl { get; set; }
/// <summary>
/// 成立时间
/// </summary>
public DateTime? FoundingTime { get; set; }
/// <summary>
/// 员工人数
/// </summary>
public int EmployeeNum { get; set; }
/// <summary>
/// 年销售(万元)
/// </summary>
public decimal AnnualSales { get; set; }
/// <summary>
/// 年进口额
/// </summary>
public decimal AnnualImport { get; set; }
/// <summary>
/// 详细地址
/// </summary>
public string Address { get; set; }
/// <summary>
/// 详细地址(英文)
/// </summary>
public string EnAddress { get; set; }
/// <summary>
/// 行业
/// </summary>
public string Industry { get; set; }
/// <summary>
/// 主要出口国
/// </summary>
public string ExportCountry { get; set; }
/// <summary>
/// 主要进口国家
/// </summary>
public string ImportCountry { get; set; }
/// <summary>
/// 进口品目
/// </summary>
public string ImportCategory { get; set; }
/// <summary>
/// 其他内容
/// </summary>
public string OtherInfo { get; set; }
/// <summary>
/// 商户号id
/// </summary>
public int TenantId { get; set; }
/// <summary>
/// 小程序id
/// </summary>
public int MallBaseId { get; set; }
/// <summary>
/// 创建人
/// </summary>
public int CreateBy { get; set; }
/// <summary>
/// 创建时间
/// </summary>
public DateTime CreateDate { get; set; }
/// <summary>
/// 修改人
/// </summary>
public int UpdateBy { get; set; }
/// <summary>
/// 修改时间
/// </summary>
public DateTime UpdateDate { get; set; }
/// <summary>
/// 删除状态
/// </summary>
public DateStateEnum Status { get; set; }
}
/// <summary>
/// 主键(公司编号)
/// </summary>
public int CompanyId { get; set; }
/// <summary>
/// 公司名称
/// </summary>
public string CompanyName { get; set; }
/// <summary>
/// 公司营业执照
/// </summary>
public string BusinessLicense { get; set; }
/// <summary>
/// 统一社会信用代码
/// </summary>
public string UnifiedCode { get; set; }
/// <summary>
/// 公司状态0-待审核，1- 审核通过，2-审核失败
/// </summary>
public int CompanyStatus { get; set; }
/// <summary>
/// 公司英文名称
/// </summary>
// public string CompanyEnName { get; set; }
/// <summary>
/// 联系人(责任人)
/// </summary>
public string Principal { get; set; }
/// <summary>
/// 联系电话
/// </summary>
public string Mobile { get; set; }
/// <summary>
/// 邮箱
/// </summary>
//public string EMail { get; set; }
/// <summary>
/// 法人
/// </summary>
public string LegalPerson { get; set; }
/// <summary>
/// 公司微信
/// </summary>
////public string WechatNo { get; set; }
/// <summary>
/// 公司介绍
/// </summary>
public string CompanyIntro { get; set; }
/// <summary>
/// 官网
/// </summary>
// public string DomainUrl { get; set; }
/// <summary>
/// 成立时间
/// </summary>
//public DateTime? FoundingTime { get; set; }
/// <summary>
/// 员工人数
/// </summary>
//public int EmployeeNum { get; set; }
/// <summary>
/// 年销售(万元)
/// </summary>
///public decimal AnnualSales { get; set; }
/// <summary>
/// 年进口额
/// </summary>
// public decimal AnnualImport { get; set; }
/// <summary>
/// 详细地址
/// </summary>
//public string Address { get; set; }
/// <summary>
/// 详细地址(英文)
/// </summary>
//public string EnAddress { get; set; }
/// <summary>
/// 行业
/// </summary>
//public string Industry { get; set; }
/// <summary>
/// 主要出口国
/// </summary>
//public string ExportCountry { get; set; }
/// <summary>
/// 主要进口国家
/// </summary>
//public string ImportCountry { get; set; }
/// <summary>
/// 进口品目
/// </summary>
// public string ImportCategory { get; set; }
/// <summary>
/// 其他内容
/// </summary>
//public string OtherInfo { get; set; }
/// <summary>
/// 商户号id
/// </summary>
public int TenantId { get; set; }
/// <summary>
/// 小程序id
/// </summary>
public int MallBaseId { get; set; }
/// <summary>
/// 创建人
/// </summary>
public int CreateBy { get; set; }
/// <summary>
/// 创建时间
/// </summary>
public DateTime CreateDate { get; set; }
/// <summary>
/// 修改人
/// </summary>
public int UpdateBy { get; set; }
/// <summary>
/// 修改时间
/// </summary>
public DateTime UpdateDate { get; set; }
/// <summary>
/// 删除状态
/// </summary>
public DateStateEnum Status { get; set; }
}
}
Mall.Model/Entity/TradePavilion/RB_CompanyBrand.cs 0 → 100644
View file @ 4cafeb5e
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_CompanyBrand
{
public int ID { get; set; }
/// <summary>
/// 公司id
/// </summary>
public int CompanyId { get; set; }
/// <summary>
/// 品牌名称
/// </summary>
public string BrandName { get; set; }
/// <summary>
/// 店铺数量
/// </summary>
public int ShopNum { get; set; }
/// <summary>
/// 建筑面积
/// </summary>
public decimal BuiltUpArea { get; set; }
/// <summary>
/// 建筑面积
/// </summary>
public decimal EndBuiltUpArea { get; set; }
/// <summary>
/// 品牌定位
/// </summary>
public string FullBrandName { get; set; }
/// <summary>
/// 客户群体
/// </summary>
public string CustomerType { get; set; }
/// <summary>
/// 客户群体其他输入项
/// </summary>
public string CustomerOtherType { get; set; }
/// <summary>
/// 扩店区域
/// </summary>
public string StoreExpansion { get; set; }
/// <summary>
/// 性质
/// </summary>
public ProjectTypeEnum? ProjectType { get; set; }
/// <summary>
/// 面积要求
/// </summary>
public decimal AreaRequirement { get; set; }
/// <summary>
/// 面积要求
/// </summary>
public decimal EndAreaRequirement { get; set; }
/// <summary>
/// 商户号id
/// </summary>
public int TenantId { get; set; }
/// <summary>
/// 小程序id
/// </summary>
public int MallBaseId { get; set; }
/// <summary>
/// 删除状态
/// </summary>
public DateStateEnum Status { get; set; }
}
}
Mall.Model/Extend/TradePavilion/RB_Brand_Extend.cs 0 → 100644
View file @ 4cafeb5e
using System;
using System.Collections.Generic;
using System.Text;
using Mall.Model.Entity.TradePavilion;
namespace Mall.Model.Extend.TradePavilion
{
public class RB_Brand_Extend : RB_CompanyBrand
{
/// <summary>
/// 客户群体
/// </summary>
public List<string> CustomerTypeInfo { get; set; }
/// <summary>
/// 公司ids
/// </summary>
public string CompanyIds { get; set; }
}
}
Mall.Model/Extend/TradePavilion/RB_CarrierMetro_Extend.cs 0 → 100644
View file @ 4cafeb5e
using System;
using System.Collections.Generic;
using System.Text;
using Mall.Model.Entity.TradePavilion;
namespace Mall.Model.Extend.TradePavilion
{
public class RB_CarrierMetro_Extend : RB_CarrierMetro
{
/// <summary>
/// 载体ids
/// </summary>
public string CarrierIds { get; set; }
}
}
Mall.Model/Extend/TradePavilion/RB_Carrier_Extend.cs 0 → 100644
View file @ 4cafeb5e
using System;
using System.Collections.Generic;
using System.Text;
using Mall.Model.Entity.TradePavilion;
namespace Mall.Model.Extend.TradePavilion
{
public class RB_Carrier_Extend : RB_Carrier
{
/// <summary>
/// 地铁信息
/// </summary>
public List<RB_CarrierMetro_Extend> CarrierMetroList { get; set; }
/// <summary>
/// 介绍图
/// </summary>
public List<string> BannerList { get; set; }
/// <summary>
/// 开业时间
/// </summary>
public string StartOpenTime { get; set; }
/// <summary>
/// 开业时间
/// </summary>
public string EndOpenTime { get; set; }
/// <summary>
/// 地铁线路
/// </summary>
public int MetroNum { get; set; }
/// <summary>
/// 站点名称
/// </summary>
public string MetroName { get; set; }
}
}
Mall.Model/Extend/TradePavilion/RB_Company_Extend.cs
View file @ 4cafeb5e
......@@ -11,14 +11,8 @@ namespace Mall.Model.Extend.TradePavilion
public class RB_Company_Extend : RB_Company
{
/// <summary>
/// 成立时间字符串
/// 公司品牌
/// </summary>
public string FoundingTimeStr
{
get
{
return Common.ConvertHelper.FormatDate(this.FoundingTime);
}
}
public RB_Brand_Extend BrandModel { get; set; }
}
}
Mall.Module.TradePavilion/CarrierModule.cs 0 → 100644
View file @ 4cafeb5e
This diff is collapsed.
Mall.Module.TradePavilion/CommerceNewsModule.cs
View file @ 4cafeb5e
......@@ -45,6 +45,7 @@ namespace Mall.Module.TradePavilion
{ nameof(RB_Commerce_News_Extend.CoverImg),model.CoverImg},
{ nameof(RB_Commerce_News_Extend.Type),model.Type},
{ nameof(RB_Commerce_News_Extend.Title),model.Title},
{ nameof(RB_Commerce_News_Extend.Subtitle),model.Subtitle},
{ nameof(RB_Commerce_News_Extend.Industry),model.Industry},
{ nameof(RB_Commerce_News_Extend.PublishTime),model.PublishTime},
{ nameof(RB_Commerce_News_Extend.NewsInfo),model.NewsInfo},
......
Mall.Module.TradePavilion/CompanyModule.cs
View file @ 4cafeb5e
using Mall.Model.Extend.TradePavilion;
using Mall.Repository.TradePavilion;
using System.Collections.Generic;
using System.Linq;
using VT.FW.DB;
namespace Mall.Module.TradePavilion
......@@ -11,6 +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();
/// <summary>
/// 获取公司信息分页列表
......@@ -22,7 +24,53 @@ namespace Mall.Module.TradePavilion
/// <returns></returns>
public List<RB_Company_Extend> GetCompanyPageListModule(int pageIndex, int pageSize, out long rowsCount, RB_Company_Extend query)
{
return companyRepository.GetCompanyPageListRepository(pageIndex, pageSize, out rowsCount, query);
var list = companyRepository.GetCompanyPageListRepository(pageIndex, pageSize, out rowsCount, query);
if (list != null && list.Any())
{
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 });
if (metroList != null && metroList.Any())
{
foreach (var item in list)
{
item.BrandModel = new RB_Brand_Extend();
item.BrandModel = metroList.Where(x => x.CompanyId == item.CompanyId).FirstOrDefault();
if (item.BrandModel != null && !string.IsNullOrWhiteSpace(item.BrandModel.CustomerType))
{
item.BrandModel.CustomerTypeInfo = new List<string>();
foreach (var itemCustomerType in item.BrandModel.CustomerType.Split(","))
{
if (!string.IsNullOrWhiteSpace(itemCustomerType)&& itemCustomerType != "5")
{
item.BrandModel.CustomerTypeInfo.Add(Common.Plugin.EnumHelper.GetEnumName((Common.Enum.TradePavilion.CustomerTypeEnum)System.Convert.ToInt32(itemCustomerType)));
}
else if(!string.IsNullOrWhiteSpace(itemCustomerType))
{
item.BrandModel.CustomerTypeInfo.Add(item.BrandModel.CustomerOtherType);
}
}
}
}
}
}
}
return list;
}
/// <summary>
/// 获取公司信息实体
/// </summary>
/// <param name="CompanyId"></param>
/// <returns></returns>
public RB_Company_Extend GetCompanyEntity(object CompanyId)
{
var model = companyRepository.GetEntity<RB_Company_Extend>(CompanyId);
return model;
}
/// <summary>
......@@ -32,7 +80,33 @@ namespace Mall.Module.TradePavilion
/// <returns></returns>
public RB_Company_Extend GetCompanyModule(object CompanyId)
{
return companyRepository.GetEntity<RB_Company_Extend>(CompanyId);
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 });
if (metroList != null && metroList.Any())
{
model.BrandModel = new RB_Brand_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>
......@@ -50,45 +124,34 @@ namespace Mall.Module.TradePavilion
/// </summary>
/// <param name="model"></param>
/// <returns></returns>
public bool SetCompanyModule(RB_Company_Extend model)
public int SetCompanyModule(RB_Company_Extend model)
{
bool flag;
int ID = 0;
if (model.CompanyId > 0)
{
ID = model.CompanyId;
Dictionary<string, object> fileds = new Dictionary<string, object>()
{
{nameof(RB_Company_Extend.CompanyName),model.CompanyName },
{nameof(RB_Company_Extend.CompanyEnName),model.CompanyEnName },
{nameof(RB_Company_Extend.Principal),model.Principal },
{nameof(RB_Company_Extend.Mobile),model.Mobile },
{nameof(RB_Company_Extend.EMail),model.EMail },
{nameof(RB_Company_Extend.BusinessLicense),model.BusinessLicense },
{nameof(RB_Company_Extend.LegalPerson),model.LegalPerson },
{nameof(RB_Company_Extend.WechatNo),model.WechatNo },
{nameof(RB_Company_Extend.UnifiedCode),model.UnifiedCode },
{nameof(RB_Company_Extend.CompanyIntro),model.CompanyIntro },
{nameof(RB_Company_Extend.DomainUrl),model.DomainUrl },
{nameof(RB_Company_Extend.FoundingTime),model.FoundingTime },
{nameof(RB_Company_Extend.EmployeeNum),model.EmployeeNum },
{nameof(RB_Company_Extend.AnnualSales),model.AnnualSales },
{nameof(RB_Company_Extend.AnnualImport),model.AnnualImport },
{nameof(RB_Company_Extend.Address),model.Address },
{nameof(RB_Company_Extend.EnAddress),model.EnAddress },
{nameof(RB_Company_Extend.Industry),model.Industry },
{nameof(RB_Company_Extend.ExportCountry),model.ExportCountry },
{nameof(RB_Company_Extend.ImportCountry),model.ImportCountry },
{nameof(RB_Company_Extend.ImportCategory),model.ImportCategory },
{nameof(RB_Company_Extend.OtherInfo),model.OtherInfo },
{nameof(RB_Company_Extend.CompanyStatus),model.CompanyStatus },
{nameof(RB_Company_Extend.UpdateBy),model.UpdateBy },
{nameof(RB_Company_Extend.UpdateDate),model.UpdateDate },
};
flag = companyRepository.Update(fileds, new WhereHelper(nameof(RB_Company_Extend.CompanyId), model.CompanyId));
companyRepository.Update(fileds, new WhereHelper(nameof(RB_Company_Extend.CompanyId), model.CompanyId));
}
else
{
var newId = companyRepository.Insert(model);
model.CompanyId = newId;
flag = newId > 0;
ID = newId;
}
return flag;
return ID;
}
/// <summary>
......@@ -106,5 +169,21 @@ namespace Mall.Module.TradePavilion
bool flag = companyRepository.Update(fileds, new WhereHelper(nameof(RB_Company_Extend.CompanyId), CompanyId));
return flag;
}
/// <summary>
/// 更新公司审核状态
/// </summary>
/// <param name="CompanyId"></param>
/// <param name="Status"></param>
/// <returns></returns>
public bool UpdateCompanyStatus(int CompanyId, int Status)
{
Dictionary<string, object> fileds = new Dictionary<string, object>()
{
{nameof(RB_Company_Extend.CompanyStatus),Status },
};
bool flag = companyRepository.Update(fileds, new WhereHelper(nameof(RB_Company_Extend.CompanyId), CompanyId));
return flag;
}
}
}
Mall.Repository/MarketingCenter/RB_CouponRepository.cs
View file @ 4cafeb5e
......@@ -34,7 +34,7 @@ namespace Mall.Repository.MarketingCenter
{
builder.Append($" AND {nameof(RB_Coupon_Extend.TenantId)}={query.TenantId}");
}
if (query.TenantId > 0)
if (query.MallBaseId > 0)
{
builder.Append($" AND {nameof(RB_Coupon_Extend.MallBaseId)}={query.MallBaseId}");
}
......@@ -66,7 +66,7 @@ namespace Mall.Repository.MarketingCenter
{
builder.Append($" AND {nameof(RB_Coupon_Extend.TenantId)}={query.TenantId}");
}
if (query.TenantId > 0)
if (query.MallBaseId > 0)
{
builder.Append($" AND {nameof(RB_Coupon_Extend.MallBaseId)}={query.MallBaseId}");
}
......
Mall.Repository/TradePavilion/RB_BrandRepository.cs 0 → 100644
View file @ 4cafeb5e
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_BrandRepository: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_Brand_Extend> GetBrandPageListRepository(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
");
builder.AppendFormat(" AND {0}={1} ", nameof(RB_Brand_Extend.Status), (int)DateStateEnum.Normal);
if (query == null)
{
return new List<RB_Brand_Extend>();
}
else
{
if (query.TenantId > 0)
{
builder.AppendFormat(" AND {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);
}
if (!string.IsNullOrEmpty(query.BrandName))
{
builder.AppendFormat(" AND {0} LIKE @Name ", nameof(RB_Brand_Extend.BrandName));
parameters.Add("Name", "%" + query.BrandName.Trim() + "%");
}
}
return GetPage<RB_Brand_Extend>(pageIndex, pageSize, out rowsCount, builder.ToString(), parameters).ToList();
}
/// <summary>
/// 根据查询条件获取品牌信息实体
/// </summary>
/// <param name="query"></param>
/// <returns></returns>
public RB_Brand_Extend GetBrandRepository(RB_Brand_Extend query)
{
DynamicParameters parameters = new DynamicParameters();
StringBuilder builder = new StringBuilder();
builder.AppendFormat(@"
SELECT *
FROM RB_Brand
WHERE 1=1
");
builder.AppendFormat(" AND {0}={1} ", nameof(RB_Brand_Extend.Status), (int)DateStateEnum.Normal);
if (query == null)
{
return new RB_Brand_Extend();
}
else
{
if (query.TenantId > 0)
{
builder.AppendFormat(" AND {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);
}
if (!string.IsNullOrEmpty(query.BrandName))
{
builder.AppendFormat(" AND {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))
{
builder.AppendFormat(" AND {0} in({1})", nameof(RB_Brand_Extend.CompanyId), query.CompanyIds);
}
}
return Get<RB_Brand_Extend>(builder.ToString(), parameters).FirstOrDefault();
}
/// <summary>
/// 根据查询条件获取品牌信息
/// </summary>
/// <param name="query"></param>
/// <returns></returns>
public List<RB_Brand_Extend> GetBrandList(RB_Brand_Extend query)
{
DynamicParameters parameters = new DynamicParameters();
StringBuilder builder = new StringBuilder();
builder.AppendFormat(@"
SELECT *
FROM RB_Brand
WHERE 1=1
");
builder.AppendFormat(" AND {0}={1} ", nameof(RB_Brand_Extend.Status), (int)DateStateEnum.Normal);
if (query == null)
{
return new List<RB_Brand_Extend>();
}
else
{
if (query.TenantId > 0)
{
builder.AppendFormat(" AND {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);
}
if (!string.IsNullOrEmpty(query.BrandName))
{
builder.AppendFormat(" AND {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))
{
builder.AppendFormat(" AND {0} in({1})", nameof(RB_Brand_Extend.CompanyId), query.CompanyIds);
}
}
return Get<RB_Brand_Extend>(builder.ToString(), parameters).ToList();
}
}
}
Mall.Repository/TradePavilion/RB_CarrierMetroRepository.cs 0 → 100644
View file @ 4cafeb5e
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using Mall.Model.Entity.TradePavilion;
using Mall.Model.Extend.TradePavilion;
namespace Mall.Repository.TradePavilion
{
/// <summary>
/// 载体地铁信息仓储层
/// </summary>
public class RB_CarrierMetroRepository : BaseRepository<RB_CarrierMetro>
{
/// <summary>
/// 表名称
/// </summary>
public string TableName { get { return nameof(RB_CarrierMetro); } }
/// <summary>
/// 载体信息列表
/// </summary>
/// <param name="pageIndex">页码</param>
/// <param name="pageSize">每页显示条数</param>
/// <param name="rowCount">总条数</param>
/// <param name="query">查询条件</param>
/// <returns></returns>
public List<RB_CarrierMetro_Extend> GetCarrierMetroPageList(int pageIndex, int pageSize, out long rowCount, RB_CarrierMetro_Extend query)
{
StringBuilder builder = new StringBuilder();
builder.Append($" SELECT * FROM {TableName} WHERE {nameof(RB_CarrierMetro_Extend.Status)}=0");
if (query != null)
{
if (query.TenantId > 0)
{
builder.Append($" AND {nameof(RB_CarrierMetro_Extend.TenantId)}={query.TenantId}");
}
if (query.MallBaseId > 0)
{
builder.Append($" AND {nameof(RB_CarrierMetro_Extend.MallBaseId)}={query.MallBaseId}");
}
if (query.CarrierId > 0)
{
builder.Append($" AND {nameof(RB_CarrierMetro_Extend.CarrierId)}={query.CarrierId}");
}
if (query.MetroNum > 0)
{
builder.Append($" AND {nameof(RB_CarrierMetro_Extend.MetroNum)}={query.MetroNum}");
}
if (!string.IsNullOrWhiteSpace(query.MetroName))
{
builder.Append($" AND {nameof(RB_CarrierMetro_Extend.MetroName)} like '%{query.MetroName}%'");
}
if (!string.IsNullOrWhiteSpace(query.CarrierIds))
{
builder.Append($" AND {nameof(RB_CarrierMetro_Extend.CarrierId)} in({query.CarrierIds}) ");
}
}
return GetPage<RB_CarrierMetro_Extend>(pageIndex, pageSize, out rowCount, builder.ToString()).ToList();
}
/// <summary>
/// 载体信息列表
/// </summary>
/// <param name="query">查询条件</param>
/// <returns></returns>
public List<RB_CarrierMetro_Extend> GetCarrierMetroList(RB_CarrierMetro_Extend query)
{
StringBuilder builder = new StringBuilder();
builder.Append($" SELECT * FROM {TableName} WHERE {nameof(RB_CarrierMetro_Extend.Status)}=0 ");
if (query != null)
{
if (query.TenantId > 0)
{
builder.Append($" AND {nameof(RB_CarrierMetro_Extend.TenantId)}={query.TenantId}");
}
if (query.MallBaseId > 0)
{
builder.Append($" AND {nameof(RB_CarrierMetro_Extend.MallBaseId)}={query.MallBaseId}");
}
if (query.CarrierId > 0)
{
builder.Append($" AND {nameof(RB_CarrierMetro_Extend.CarrierId)}={query.CarrierId}");
}
if (query.MetroNum > 0)
{
builder.Append($" AND {nameof(RB_CarrierMetro_Extend.MetroNum)}={query.MetroNum}");
}
if (!string.IsNullOrWhiteSpace(query.MetroName))
{
builder.Append($" AND {nameof(RB_CarrierMetro_Extend.MetroName)} like '%{query.MetroName}%'");
}
if (!string.IsNullOrWhiteSpace(query.CarrierIds))
{
builder.Append($" AND {nameof(RB_CarrierMetro_Extend.CarrierId)} in({query.CarrierIds}) ");
}
}
return Get<RB_CarrierMetro_Extend>(builder.ToString()).ToList();
}
}
}
Mall.Repository/TradePavilion/RB_CarrierRepository.cs 0 → 100644
View file @ 4cafeb5e
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using Mall.Model.Entity.TradePavilion;
using Mall.Model.Extend.TradePavilion;
namespace Mall.Repository.TradePavilion
{
/// <summary>
/// 载体信息仓储层
/// </summary>
public class RB_CarrierRepository : BaseRepository<RB_Carrier>
{
/// <summary>
/// 表名称
/// </summary>
public string TableName { get { return nameof(RB_Carrier); } }
/// <summary>
/// 载体信息列表
/// </summary>
/// <param name="pageIndex">页码</param>
/// <param name="pageSize">每页显示条数</param>
/// <param name="rowCount">总条数</param>
/// <param name="query">查询条件</param>
/// <returns></returns>
public List<RB_Carrier_Extend> GetCarrierPageList(int pageIndex, int pageSize, out long rowCount, RB_Carrier_Extend query)
{
StringBuilder builder = new StringBuilder();
builder.Append($" SELECT * FROM {TableName} WHERE {nameof(RB_Carrier_Extend.Status)}=0");
if (query != null)
{
if (query.TenantId > 0)
{
builder.Append($" AND {nameof(RB_Carrier_Extend.TenantId)}={query.TenantId}");
}
if (query.MallBaseId > 0)
{
builder.Append($" AND {nameof(RB_Carrier_Extend.MallBaseId)}={query.MallBaseId}");
}
if (query.ProjectType.HasValue && query.ProjectType > 0)
{
builder.Append($" AND {nameof(RB_Carrier_Extend.ProjectType)}={(int)query.ProjectType}");
}
if (!string.IsNullOrWhiteSpace(query.CarrierName))
{
builder.Append($" AND {nameof(RB_Carrier_Extend.CarrierName)} like '%{query.CarrierName}%'");
}
if (!string.IsNullOrWhiteSpace(query.Developers))
{
builder.Append($" AND {nameof(RB_Carrier_Extend.Developers)} like '%{query.Developers}%'");
}
if (!string.IsNullOrWhiteSpace(query.StartOpenTime))
{
builder.Append($" and DATE_FORMAT({nameof(RB_Carrier_Extend.OpenTime)},'%Y-%m-%d' )>=DATE_FORMAT('{query.StartOpenTime}','%Y-%m-%d' ) ");
}
if (!string.IsNullOrWhiteSpace(query.EndOpenTime))
{
builder.Append($" and DATE_FORMAT({nameof(RB_Carrier_Extend.OpenTime)},'%Y-%m-%d' )<= DATE_FORMAT('{query.EndOpenTime}','%Y-%m-%d' ) ");
}
if (query.MetroNum > 0 || !string.IsNullOrWhiteSpace(query.MetroName))
{
builder.Append($" AND {nameof(RB_Carrier_Extend.ID)} in (SELECT CarrierId from rb_carriermetro where `Status`=0 ");
if (query.MetroNum > 0)
{
builder.Append($" AND {nameof(RB_Carrier_Extend.MetroNum)} = {query.MetroNum}");
}
if (!string.IsNullOrWhiteSpace(query.MetroName))
{
builder.Append($" AND {nameof(RB_Carrier_Extend.MetroName)} like '%{query.MetroName}%'");
}
builder.Append(" )");
}
}
return GetPage<RB_Carrier_Extend>(pageIndex, pageSize, out rowCount, builder.ToString()).ToList();
}
/// <summary>
/// 载体信息列表
/// </summary>
/// <param name="query">查询条件</param>
/// <returns></returns>
public List<RB_Carrier_Extend> GetCarrierList(RB_Carrier_Extend query)
{
StringBuilder builder = new StringBuilder();
builder.Append($" SELECT * FROM {TableName} WHERE {nameof(RB_Carrier_Extend.Status)}=0 ");
if (query != null)
{
if (query.TenantId > 0)
{
builder.Append($" AND {nameof(RB_Carrier_Extend.TenantId)}={query.TenantId}");
}
if (query.MallBaseId > 0)
{
builder.Append($" AND {nameof(RB_Carrier_Extend.MallBaseId)}={query.MallBaseId}");
}
if (query.ID > 0)
{
builder.Append($" AND {nameof(RB_Carrier_Extend.ID)}={query.ID}");
}
if (query.ProjectType.HasValue && query.ProjectType > 0)
{
builder.Append($" AND {nameof(RB_Carrier_Extend.ProjectType)}={(int)query.ProjectType}");
}
if (!string.IsNullOrWhiteSpace(query.CarrierName))
{
builder.Append($" AND {nameof(RB_Carrier_Extend.CarrierName)} like '%{query.CarrierName}%'");
}
if (!string.IsNullOrWhiteSpace(query.Developers))
{
builder.Append($" AND {nameof(RB_Carrier_Extend.Developers)} like '%{query.Developers}%'");
}
if (query.MetroNum > 0 || !string.IsNullOrWhiteSpace(query.MetroName))
{
builder.Append($" AND {nameof(RB_Carrier_Extend.ID)} in (SELECT CarrierId from rb_carriermetro where `Status`=0 ");
if (query.MetroNum > 0)
{
builder.Append($" AND {nameof(RB_Carrier_Extend.MetroNum)} = {query.MetroNum}");
}
if (!string.IsNullOrWhiteSpace(query.MetroName))
{
builder.Append($" AND {nameof(RB_Carrier_Extend.MetroName)} like '%{query.MetroName}%'");
}
builder.Append(" )");
}
}
return Get<RB_Carrier_Extend>(builder.ToString()).ToList();
}
}
}
Mall.WebApi/Controllers/TradePavilion/AppletTradeController.cs
View file @ 4cafeb5e
......@@ -61,6 +61,11 @@ namespace Mall.WebApi.Controllers.TradePavilion
/// </summary>
private readonly CommerceAskModule askModule = new CommerceAskModule();
/// <summary>
/// 载体处理类对象
/// </summary>
private readonly CarrierModule carrierModule = new CarrierModule();
/// <summary>
/// 活动评论处理类对象
/// </summary>
......@@ -79,26 +84,35 @@ namespace Mall.WebApi.Controllers.TradePavilion
{
CompanyId = parms.GetInt("CompanyId"),
CompanyName = parms.GetStringValue("CompanyName"),
CompanyEnName = parms.GetStringValue("CompanyEnName"),
Principal = parms.GetStringValue("Principal"),
BusinessLicense = parms.GetStringValue("BusinessLicense"),
// Principal = parms.GetStringValue("Principal"),
Mobile = parms.GetStringValue("Mobile"),
EMail = parms.GetStringValue("EMail"),
UnifiedCode = parms.GetStringValue("UnifiedCode"),
LegalPerson = parms.GetStringValue("LegalPerson"),
WechatNo = parms.GetStringValue("WechatNo"),
CompanyIntro = parms.GetStringValue("CompanyIntro"),
DomainUrl = parms.GetStringValue("DomainUrl"),
FoundingTime = parms.GetDateTime("FoundingTime"),
EmployeeNum = parms.GetInt("EmployeeNum"),
AnnualSales = parms.GetDecimal("AnnualSales"),
AnnualImport = parms.GetDecimal("AnnualImport"),
Address = parms.GetStringValue("Address"),
EnAddress = parms.GetStringValue("EnAddress"),
Industry = parms.GetStringValue("Industry"),
ExportCountry = parms.GetStringValue("ExportCountry"),
ImportCountry = parms.GetStringValue("ImportCountry"),
ImportCategory = parms.GetStringValue("ImportCategory"),
OtherInfo = parms.GetStringValue("OtherInfo"),
// CompanyIntro = parms.GetStringValue("CompanyIntro"),
};
if (string.IsNullOrWhiteSpace(extModel.BusinessLicense))
{
return ApiResult.Failed("请上传公司营业执照");
}
if (string.IsNullOrWhiteSpace(extModel.CompanyName))
{
return ApiResult.Failed("请输入企业名称");
}
if (string.IsNullOrWhiteSpace(extModel.UnifiedCode))
{
return ApiResult.Failed("请输入统一社会信用代码");
}
if (string.IsNullOrWhiteSpace(extModel.LegalPerson))
{
return ApiResult.Failed("请输入法人代表");
}
if (string.IsNullOrWhiteSpace(extModel.Mobile))
{
return ApiResult.Failed("请输入联系电话");
}
var userInfo = AppletUserInfo;
extModel.Status = Common.Enum.DateStateEnum.Normal;
extModel.MallBaseId = userInfo.MallBaseId;
......@@ -108,8 +122,9 @@ namespace Mall.WebApi.Controllers.TradePavilion
extModel.CreateDate = DateTime.Now;
extModel.UpdateBy = Uid;
extModel.UpdateDate = DateTime.Now;
var flag = companyModule.SetCompanyModule(extModel);
return flag ? ApiResult.Success() : ApiResult.Failed();
extModel.CompanyStatus = 0;
int ID = companyModule.SetCompanyModule(extModel);
return ID > 0 ? ApiResult.Success("", new { CompanyId = ID }) : ApiResult.Failed();
}
/// <summary>
......@@ -138,7 +153,7 @@ namespace Mall.WebApi.Controllers.TradePavilion
var query = new RB_Commerce_News_Extend()
{
Title = parms.GetStringValue("Title"),
Type=parms.GetInt("Type")
Type = parms.GetInt("Type")
};
var userInfo = AppletUserInfo;
query.MallBaseId = RequestParm.MallBaseId;
......@@ -333,7 +348,7 @@ namespace Mall.WebApi.Controllers.TradePavilion
query.MallBaseId = RequestParm.MallBaseId;
query.TenantId = userInfo?.TenantId ?? 0;
var list = activityModule.GetCommerceActivityTypeListModule(query);
return ApiResult.Success(data: list.Select(qitem => new { qitem.Id, qitem.CoverImage, qitem.TypeName, LableNameList = string.IsNullOrWhiteSpace(qitem.LableName) ? new List<string>() : JsonConvert.DeserializeObject<List<string>>(qitem.LableName) })) ;
return ApiResult.Success(data: list.Select(qitem => new { qitem.Id, qitem.CoverImage, qitem.TypeName, LableNameList = string.IsNullOrWhiteSpace(qitem.LableName) ? new List<string>() : JsonConvert.DeserializeObject<List<string>>(qitem.LableName) }));
}
/// <summary>
......@@ -496,6 +511,7 @@ namespace Mall.WebApi.Controllers.TradePavilion
/// 新增活动评论
/// </summary>
/// <returns></returns>
[HttpPost]
public ApiResult AddCommerceComment()
{
JObject jObj = JObject.Parse(RequestParm.msg.ToString());
......@@ -503,11 +519,11 @@ namespace Mall.WebApi.Controllers.TradePavilion
{
Id = jObj.GetInt("Id"),
ActivityId = jObj.GetInt("ActivityId"),
CommentScore=jObj.GetInt("CommentScore"),
CommentGrade=(GoodsCommentTypeEnum)jObj.GetInt("CommentGrade"),
CommentImage=jObj.GetStringValue("CommentImage"),
PlatformSource=(UserSourceEnum)jObj.GetInt("PlatformSource"),
Content=jObj.GetStringValue("Content")
CommentScore = jObj.GetInt("CommentScore"),
CommentGrade = (GoodsCommentTypeEnum)jObj.GetInt("CommentGrade"),
CommentImage = jObj.GetStringValue("CommentImage"),
PlatformSource = (UserSourceEnum)jObj.GetInt("PlatformSource"),
Content = jObj.GetStringValue("Content")
};
var userInfo = AppletUserInfo;
extModel.UserName = userInfo.Name;
......@@ -534,5 +550,98 @@ namespace Mall.WebApi.Controllers.TradePavilion
return flag ? ApiResult.Success() : ApiResult.Failed();
}
#endregion
#region 品牌
/// <summary>
/// 新增修改品牌信息
/// </summary>
/// <returns></returns>
public ApiResult SetBrand()
{
JObject parms = JObject.Parse(RequestParm.msg.ToString());
RB_Brand_Extend extModel = JsonConvert.DeserializeObject<RB_Brand_Extend>(RequestParm.msg.ToString());
if (string.IsNullOrWhiteSpace(extModel.BrandName))
{
return ApiResult.Failed("品牌名称必填");
}
if (extModel.ShopNum == 0)
{
return ApiResult.Failed("店铺数量必须大于0");
}
if (extModel.BuiltUpArea == 0)
{
return ApiResult.Failed("店铺面积必填");
}
if (extModel.EndBuiltUpArea == 0)
{
return ApiResult.Failed("店铺面积必填");
}
if (string.IsNullOrWhiteSpace(extModel.FullBrandName))
{
return ApiResult.Failed("店铺定位必填");
}
if (string.IsNullOrWhiteSpace(extModel.CustomerType))
{
return ApiResult.Failed("请选择客户群体");
}
if (!string.IsNullOrWhiteSpace(extModel.CustomerType) && extModel.CustomerType.Split(",").ToList().Any(x => x.Contains("5")))
{
if (string.IsNullOrWhiteSpace(extModel.CustomerOtherType))
{
return ApiResult.Failed("请输入客户群体");
}
}
var userInfo = AppletUserInfo;
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 });
if (oldBrandModel != null && oldBrandModel.ID > 0)
{
extModel.ID = extModel.ID;
}
var flag = carrierModule.SetBrand(extModel);
return flag ? ApiResult.Success() : ApiResult.Failed();
}
/// <summary>
/// 获取客户群体枚举
/// </summary>
/// <returns></returns>
[HttpPost]
[AllowAnonymous]
public ApiResult GetCustomerTypeEnumList()
{
var list = EnumHelper.GetEnumList(typeof(Common.Enum.TradePavilion.CustomerTypeEnum));
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>
[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)
}));
}
#endregion
}
}
Mall.WindowsService/Mall.WindowsService.csproj.user
View file @ 4cafeb5e
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<_LastSelectedProfileId>D:\project\GitProject\Shopping\Mall.WindowsService\Properties\PublishProfiles\FolderProfile.pubxml</_LastSelectedProfileId>
<_LastSelectedProfileId>D:\project\GitProject\Mall\oldMall\Mall.WindowsService\Properties\PublishProfiles\FolderProfile.pubxml</_LastSelectedProfileId>
</PropertyGroup>
<ItemGroup>
<Compile Update="WindowsService.cs">
......
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