Skip to content

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

提交代码

parent b5639adb
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 ...@@ -31,6 +31,12 @@ namespace Mall.Model.Entity.TradePavilion
/// </summary> /// </summary>
public string Title { get; set; } public string Title { get; set; }
/// <summary>
/// 副标题
/// </summary>
public string Subtitle { get; set; }
/// <summary> /// <summary>
/// 行业 /// 行业
/// </summary> /// </summary>
......
Mall.Model/Entity/TradePavilion/RB_Company.cs
View file @ 4cafeb5e
...@@ -4,151 +4,168 @@ using VT.FW.DB; ...@@ -4,151 +4,168 @@ using VT.FW.DB;
namespace Mall.Model.Entity.TradePavilion namespace Mall.Model.Entity.TradePavilion
{ {
/// <summary> /// <summary>
/// 公司信息实体类 /// 公司信息实体类
/// </summary> /// </summary>
[Serializable] [Serializable]
[DB(ConnectionName = "DefaultConnection")] [DB(ConnectionName = "DefaultConnection")]
public class RB_Company public class RB_Company
{ {
/// <summary> /// <summary>
/// 主键(公司编号) /// 主键(公司编号)
/// </summary> /// </summary>
public int CompanyId { get; set; } public int CompanyId { get; set; }
/// <summary> /// <summary>
/// 公司名称 /// 公司名称
/// </summary> /// </summary>
public string CompanyName { get; set; } public string CompanyName { get; set; }
/// <summary> /// <summary>
/// 公司英文名称 /// 公司营业执照
/// </summary> /// </summary>
public string CompanyEnName { get; set; } public string BusinessLicense { get; set; }
/// <summary>
/// 联系人(责任人) /// <summary>
/// </summary> /// 统一社会信用代码
public string Principal { get; set; } /// </summary>
public string UnifiedCode { get; set; }
/// <summary>
/// 联系电话 /// <summary>
/// </summary> /// 公司状态0-待审核，1- 审核通过，2-审核失败
public string Mobile { get; set; } /// </summary>
public int CompanyStatus { get; set; }
/// <summary>
/// 邮箱
/// </summary> /// <summary>
public string EMail { get; set; } /// 公司英文名称
/// </summary>
/// <summary> // public string CompanyEnName { get; set; }
/// 法人
/// </summary> /// <summary>
public string LegalPerson { get; set; } /// 联系人(责任人)
/// </summary>
/// <summary> public string Principal { get; set; }
/// 公司微信
/// </summary> /// <summary>
public string WechatNo { get; set; } /// 联系电话
/// </summary>
/// <summary> public string Mobile { get; set; }
/// 公司介绍
/// </summary> /// <summary>
public string CompanyIntro { get; set; } /// 邮箱
/// </summary>
/// <summary> //public string EMail { get; set; }
/// 官网
/// </summary> /// <summary>
public string DomainUrl { get; set; } /// 法人
/// </summary>
/// <summary> public string LegalPerson { get; set; }
/// 成立时间
/// </summary> /// <summary>
public DateTime? FoundingTime { get; set; } /// 公司微信
/// </summary>
/// <summary> ////public string WechatNo { get; set; }
/// 员工人数
/// </summary> /// <summary>
public int EmployeeNum { get; set; } /// 公司介绍
/// </summary>
/// <summary> public string CompanyIntro { get; set; }
/// 年销售(万元)
/// </summary> /// <summary>
public decimal AnnualSales { get; set; } /// 官网
/// </summary>
/// <summary> // public string DomainUrl { get; set; }
/// 年进口额
/// </summary> /// <summary>
public decimal AnnualImport { get; set; } /// 成立时间
/// </summary>
/// <summary> //public DateTime? FoundingTime { get; set; }
/// 详细地址
/// </summary> /// <summary>
public string Address { get; set; } /// 员工人数
/// </summary>
/// <summary> //public int EmployeeNum { get; set; }
/// 详细地址(英文)
/// </summary> /// <summary>
public string EnAddress { get; set; } /// 年销售(万元)
/// </summary>
/// <summary> ///public decimal AnnualSales { get; set; }
/// 行业
/// </summary> /// <summary>
public string Industry { get; set; } /// 年进口额
/// </summary>
/// <summary> // public decimal AnnualImport { get; set; }
/// 主要出口国
/// </summary> /// <summary>
public string ExportCountry { get; set; } /// 详细地址
/// </summary>
/// <summary> //public string Address { get; set; }
/// 主要进口国家
/// </summary> /// <summary>
public string ImportCountry { get; set; } /// 详细地址(英文)
/// </summary>
/// <summary> //public string EnAddress { get; set; }
/// 进口品目
/// </summary> /// <summary>
public string ImportCategory { get; set; } /// 行业
/// </summary>
/// <summary> //public string Industry { get; set; }
/// 其他内容
/// </summary> /// <summary>
public string OtherInfo { get; set; } /// 主要出口国
/// </summary>
/// <summary> //public string ExportCountry { get; set; }
/// 商户号id
/// </summary> /// <summary>
public int TenantId { get; set; } /// 主要进口国家
/// </summary>
/// <summary> //public string ImportCountry { get; set; }
/// 小程序id
/// </summary> /// <summary>
public int MallBaseId { get; set; } /// 进口品目
/// </summary>
/// <summary> // public string ImportCategory { get; set; }
/// 创建人
/// </summary> /// <summary>
public int CreateBy { get; set; } /// 其他内容
/// </summary>
/// <summary> //public string OtherInfo { get; set; }
/// 创建时间
/// </summary> /// <summary>
public DateTime CreateDate { get; set; } /// 商户号id
/// </summary>
/// <summary> public int TenantId { get; set; }
/// 修改人
/// </summary> /// <summary>
public int UpdateBy { get; set; } /// 小程序id
/// </summary>
/// <summary> public int MallBaseId { get; set; }
/// 修改时间
/// </summary> /// <summary>
public DateTime UpdateDate { get; set; } /// 创建人
/// </summary>
/// <summary> public int CreateBy { get; set; }
/// 删除状态
/// </summary> /// <summary>
public DateStateEnum Status { get; set; } /// 创建时间
} /// </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 ...@@ -11,14 +11,8 @@ namespace Mall.Model.Extend.TradePavilion
public class RB_Company_Extend : RB_Company public class RB_Company_Extend : RB_Company
{ {
/// <summary> /// <summary>
/// 成立时间字符串 /// 公司品牌
/// </summary> /// </summary>
public string FoundingTimeStr public RB_Brand_Extend BrandModel { get; set; }
{
get
{
return Common.ConvertHelper.FormatDate(this.FoundingTime);
}
}
} }
} }
Mall.Module.TradePavilion/CarrierModule.cs 0 → 100644
View file @ 4cafeb5e
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using Mall.Model.Extend.TradePavilion;
using Mall.Repository.TradePavilion;
using Newtonsoft.Json;
using VT.FW.DB;
namespace Mall.Module.TradePavilion
{
public class CarrierModule
{
/// <summary>
/// 载体信息仓储层对象
/// </summary>
private readonly RB_CarrierRepository carrierRepository = new RB_CarrierRepository();
/// <summary>
/// 载体地铁信息仓储层对象
/// </summary>
private readonly RB_CarrierMetroRepository carrierMetroRepository = new RB_CarrierMetroRepository();
/// <summary>
/// 载体信息仓储层对象
/// </summary>
private readonly RB_BrandRepository brandRepository = new RB_BrandRepository();
/// <summary>
/// 公司信息仓储层对象
/// </summary>
private readonly RB_CompanyRepository companyRepository = new RB_CompanyRepository();
#region 载体
/// <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)
{
var list = carrierRepository.GetCarrierPageList(pageIndex, pageSize, out rowCount, query);
if (list != null && list.Any())
{
string carrierIds = string.Join(",", list.Select(x => x.ID));
if (!string.IsNullOrWhiteSpace(carrierIds))
{
var metroList = carrierMetroRepository.GetCarrierMetroList(new RB_CarrierMetro_Extend { TenantId = query.TenantId, MallBaseId = query.MallBaseId, CarrierIds = carrierIds });
if (metroList != null && metroList.Any())
{
foreach (var item in list)
{
item.CarrierMetroList = new List<RB_CarrierMetro_Extend>();
item.CarrierMetroList = metroList.Where(x => x.CarrierId == item.ID).ToList();
}
}
}
}
return list;
}
/// <summary>
/// 载体信息列表
/// </summary>
/// <param name="query">查询条件</param>
/// <returns></returns>
public List<RB_Carrier_Extend> GetCarrierList(RB_Carrier_Extend query)
{
var list = carrierRepository.GetCarrierList(query);
if (list != null && list.Any())
{
string carrierIds = string.Join(",", list.Select(x => x.ID));
if (!string.IsNullOrWhiteSpace(carrierIds))
{
var metroList = carrierMetroRepository.GetCarrierMetroList(new RB_CarrierMetro_Extend { TenantId = query.TenantId, MallBaseId = query.MallBaseId, CarrierIds = carrierIds });
if (metroList != null && metroList.Any())
{
foreach (var item in list)
{
if (!string.IsNullOrWhiteSpace(item.Banner))
{
item.BannerList = JsonConvert.DeserializeObject<List<string>>(item.Banner);
}
item.CarrierMetroList = new List<RB_CarrierMetro_Extend>();
item.CarrierMetroList = metroList.Where(x => x.CarrierId == item.ID).ToList();
}
}
}
}
return list;
}
/// <summary>
/// 载体信息列表
/// </summary>
/// <param name="query">查询条件</param>
/// <returns></returns>
public RB_Carrier_Extend GetCarrierModel(RB_Carrier_Extend query)
{
var model = carrierRepository.GetCarrierList(query).FirstOrDefault();
if (model != null && model.ID > 0)
{
var metroList = carrierMetroRepository.GetCarrierMetroList(new RB_CarrierMetro_Extend { TenantId = query.TenantId, MallBaseId = query.MallBaseId, CarrierId = model.ID });
if (metroList != null && metroList.Any())
{
if (!string.IsNullOrWhiteSpace(model.Banner))
{
model.BannerList = JsonConvert.DeserializeObject<List<string>>(model.Banner);
}
model.CarrierMetroList = new List<RB_CarrierMetro_Extend>();
model.CarrierMetroList = metroList;
}
}
return model;
}
/// <summary>
/// 新增/修改载体
/// </summary>
/// <param name="model"></param>
/// <returns></returns>
public bool SetCarrier(RB_Carrier_Extend model)
{
bool flag = false;
int Id = 0;
if (model.ID > 0)
{
Dictionary<string, object> fileds = new Dictionary<string, object>()
{
{nameof(RB_Carrier_Extend.CarrierName),model.CarrierName },
{nameof(RB_Carrier_Extend.Logo),model.Logo },
{nameof(RB_Carrier_Extend.Banner),model.Banner },
{nameof(RB_Carrier_Extend.VideoUrl),model.VideoUrl },
{nameof(RB_Carrier_Extend.Address),model.Address },
{nameof(RB_Carrier_Extend.LatAndLon),model.LatAndLon },
{nameof(RB_Carrier_Extend.Developers),model.Developers },
{nameof(RB_Carrier_Extend.OpenTime),model.OpenTime },
{nameof(RB_Carrier_Extend.CarrierSize),model.CarrierSize },
{nameof(RB_Carrier_Extend.ProjectType),(int)model.ProjectType },
{nameof(RB_Carrier_Extend.LayersNum),model.LayersNum },
{nameof(RB_Carrier_Extend.CarNum),model.CarNum },
{nameof(RB_Carrier_Extend.CarrierPlan),model.CarrierPlan },
{nameof(RB_Carrier_Extend.CarrierTarget),model.CarrierTarget },
{nameof(RB_Carrier_Extend.Location),model.Location },
{nameof(RB_Carrier_Extend.Crowd),model.Crowd }
};
flag = carrierRepository.Update(fileds, new WhereHelper(nameof(RB_Carrier_Extend.ID), model.ID));
if (flag)
{
var oldCarrierMetroList = carrierMetroRepository.GetCarrierMetroList(new RB_CarrierMetro_Extend { TenantId = model.TenantId, MallBaseId = model.MallBaseId, CarrierId = model.ID });
carrierMetroRepository.DeleteBatch(oldCarrierMetroList);
model.CarrierMetroList.ForEach(x => x.CarrierId = Id);
model.CarrierMetroList.ForEach(x => x.Status = 0);
model.CarrierMetroList.ForEach(x => x.TenantId = model.TenantId);
model.CarrierMetroList.ForEach(x => x.MallBaseId = model.MallBaseId);
carrierMetroRepository.InsertBatch(model.CarrierMetroList);
Id = model.ID;
}
}
else
{
Id = carrierRepository.Insert(model);
if (Id > 0)
{
model.CarrierMetroList.ForEach(x => x.CarrierId = Id);
model.CarrierMetroList.ForEach(x => x.Status = 0);
model.CarrierMetroList.ForEach(x => x.TenantId = model.TenantId);
model.CarrierMetroList.ForEach(x => x.MallBaseId = model.MallBaseId);
carrierMetroRepository.InsertBatch(model.CarrierMetroList);
}
flag = Id > 0;
}
return flag;
}
/// <summary>
///删除载体信息状态
/// </summary>
/// <param name="CompanyId"></param>
/// <param name="Status"></param>
/// <returns></returns>
public bool RemoveCarrierModule(int CarrierId, int TenantId, int MallBaseId, int Status)
{
Dictionary<string, object> fileds = new Dictionary<string, object>()
{
{nameof(RB_Carrier_Extend.Status),Status },
};
bool flag = carrierRepository.Update(fileds, new WhereHelper(nameof(RB_Carrier_Extend.ID), CarrierId));
if (flag)
{
var oldCarrierMetroList = carrierMetroRepository.GetCarrierMetroList(new RB_CarrierMetro_Extend { TenantId = TenantId, MallBaseId = MallBaseId, CarrierId = CarrierId });
if (oldCarrierMetroList != null && oldCarrierMetroList.Any())
{
oldCarrierMetroList.ForEach(x => x.Status = Common.Enum.DateStateEnum.Delete);
carrierMetroRepository.UpdateBatch(oldCarrierMetroList);
}
}
return flag;
}
#endregion
#region 品牌
/// <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)
{
return brandRepository.GetBrandPageListRepository(pageIndex, pageSize, out rowsCount, query);
}
/// <summary>
/// 根据查询条件获取品牌信息实体
/// </summary>
/// <param name="query"></param>
/// <returns></returns>
public RB_Brand_Extend GetBrandRepository(RB_Brand_Extend query)
{
return brandRepository.GetBrandRepository(query);
}
/// <summary>
/// 新增修改品牌
/// </summary>
/// <param name="model"></param>
/// <returns></returns>
public bool SetBrand(RB_Brand_Extend model)
{
if (model.ID == 0)
{
return brandRepository.Insert(model) > 0;
}
else
{
Dictionary<string, object> fileds = new Dictionary<string, object>()
{
{nameof(RB_Brand_Extend.BrandName),model.BrandName },
{nameof(RB_Brand_Extend.ShopNum),model.ShopNum },
{nameof(RB_Brand_Extend.BuiltUpArea),model.BuiltUpArea },
{nameof(RB_Brand_Extend.EndBuiltUpArea),model.EndBuiltUpArea },
{nameof(RB_Brand_Extend.FullBrandName),model.FullBrandName },
{nameof(RB_Brand_Extend.CustomerType),model.CustomerType },
{nameof(RB_Brand_Extend.CustomerOtherType),model.CustomerOtherType },
{nameof(RB_Brand_Extend.StoreExpansion),model.StoreExpansion },
{nameof(RB_Brand_Extend.ProjectType),(int)model.ProjectType },
{nameof(RB_Brand_Extend.AreaRequirement),model.AreaRequirement },
{nameof(RB_Brand_Extend.EndAreaRequirement),model.EndAreaRequirement }
};
return brandRepository.Update(fileds, new WhereHelper(nameof(RB_Brand_Extend.ID), model.ID));
}
}
#endregion
}
}
Mall.Module.TradePavilion/CommerceNewsModule.cs
View file @ 4cafeb5e
...@@ -45,6 +45,7 @@ namespace Mall.Module.TradePavilion ...@@ -45,6 +45,7 @@ namespace Mall.Module.TradePavilion
{ nameof(RB_Commerce_News_Extend.CoverImg),model.CoverImg}, { nameof(RB_Commerce_News_Extend.CoverImg),model.CoverImg},
{ nameof(RB_Commerce_News_Extend.Type),model.Type}, { nameof(RB_Commerce_News_Extend.Type),model.Type},
{ nameof(RB_Commerce_News_Extend.Title),model.Title}, { 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.Industry),model.Industry},
{ nameof(RB_Commerce_News_Extend.PublishTime),model.PublishTime}, { nameof(RB_Commerce_News_Extend.PublishTime),model.PublishTime},
{ nameof(RB_Commerce_News_Extend.NewsInfo),model.NewsInfo}, { nameof(RB_Commerce_News_Extend.NewsInfo),model.NewsInfo},
......
Mall.Module.TradePavilion/CompanyModule.cs
View file @ 4cafeb5e
using Mall.Model.Extend.TradePavilion; using Mall.Model.Extend.TradePavilion;
using Mall.Repository.TradePavilion; using Mall.Repository.TradePavilion;
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq;
using VT.FW.DB; using VT.FW.DB;
namespace Mall.Module.TradePavilion namespace Mall.Module.TradePavilion
...@@ -11,6 +12,7 @@ namespace Mall.Module.TradePavilion ...@@ -11,6 +12,7 @@ namespace Mall.Module.TradePavilion
public class CompanyModule public class CompanyModule
{ {
private readonly RB_CompanyRepository companyRepository = new RB_CompanyRepository(); private readonly RB_CompanyRepository companyRepository = new RB_CompanyRepository();
private readonly RB_BrandRepository brandRepository = new RB_BrandRepository();
/// <summary> /// <summary>
/// 获取公司信息分页列表 /// 获取公司信息分页列表
...@@ -22,7 +24,53 @@ namespace Mall.Module.TradePavilion ...@@ -22,7 +24,53 @@ namespace Mall.Module.TradePavilion
/// <returns></returns> /// <returns></returns>
public List<RB_Company_Extend> GetCompanyPageListModule(int pageIndex, int pageSize, out long rowsCount, RB_Company_Extend query) 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> /// <summary>
...@@ -32,7 +80,33 @@ namespace Mall.Module.TradePavilion ...@@ -32,7 +80,33 @@ namespace Mall.Module.TradePavilion
/// <returns></returns> /// <returns></returns>
public RB_Company_Extend GetCompanyModule(object CompanyId) 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> /// <summary>
...@@ -50,45 +124,34 @@ namespace Mall.Module.TradePavilion ...@@ -50,45 +124,34 @@ namespace Mall.Module.TradePavilion
/// </summary> /// </summary>
/// <param name="model"></param> /// <param name="model"></param>
/// <returns></returns> /// <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) if (model.CompanyId > 0)
{ {
ID = model.CompanyId;
Dictionary<string, object> fileds = new Dictionary<string, object>() Dictionary<string, object> fileds = new Dictionary<string, object>()
{ {
{nameof(RB_Company_Extend.CompanyName),model.CompanyName }, {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.Principal),model.Principal },
{nameof(RB_Company_Extend.Mobile),model.Mobile }, {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.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.CompanyIntro),model.CompanyIntro },
{nameof(RB_Company_Extend.DomainUrl),model.DomainUrl }, {nameof(RB_Company_Extend.CompanyStatus),model.CompanyStatus },
{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.UpdateBy),model.UpdateBy }, {nameof(RB_Company_Extend.UpdateBy),model.UpdateBy },
{nameof(RB_Company_Extend.UpdateDate),model.UpdateDate }, {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 else
{ {
var newId = companyRepository.Insert(model); var newId = companyRepository.Insert(model);
model.CompanyId = newId; model.CompanyId = newId;
flag = newId > 0; ID = newId;
} }
return flag; return ID;
} }
/// <summary> /// <summary>
...@@ -106,5 +169,21 @@ namespace Mall.Module.TradePavilion ...@@ -106,5 +169,21 @@ namespace Mall.Module.TradePavilion
bool flag = companyRepository.Update(fileds, new WhereHelper(nameof(RB_Company_Extend.CompanyId), CompanyId)); bool flag = companyRepository.Update(fileds, new WhereHelper(nameof(RB_Company_Extend.CompanyId), CompanyId));
return flag; 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 ...@@ -34,7 +34,7 @@ namespace Mall.Repository.MarketingCenter
{ {
builder.Append($" AND {nameof(RB_Coupon_Extend.TenantId)}={query.TenantId}"); 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}"); builder.Append($" AND {nameof(RB_Coupon_Extend.MallBaseId)}={query.MallBaseId}");
} }
...@@ -66,7 +66,7 @@ namespace Mall.Repository.MarketingCenter ...@@ -66,7 +66,7 @@ namespace Mall.Repository.MarketingCenter
{ {
builder.Append($" AND {nameof(RB_Coupon_Extend.TenantId)}={query.TenantId}"); 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}"); 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 ...@@ -61,6 +61,11 @@ namespace Mall.WebApi.Controllers.TradePavilion
/// </summary> /// </summary>
private readonly CommerceAskModule askModule = new CommerceAskModule(); private readonly CommerceAskModule askModule = new CommerceAskModule();
/// <summary>
/// 载体处理类对象
/// </summary>
private readonly CarrierModule carrierModule = new CarrierModule();
/// <summary> /// <summary>
/// 活动评论处理类对象 /// 活动评论处理类对象
/// </summary> /// </summary>
...@@ -79,26 +84,35 @@ namespace Mall.WebApi.Controllers.TradePavilion ...@@ -79,26 +84,35 @@ namespace Mall.WebApi.Controllers.TradePavilion
{ {
CompanyId = parms.GetInt("CompanyId"), CompanyId = parms.GetInt("CompanyId"),
CompanyName = parms.GetStringValue("CompanyName"), CompanyName = parms.GetStringValue("CompanyName"),
CompanyEnName = parms.GetStringValue("CompanyEnName"), BusinessLicense = parms.GetStringValue("BusinessLicense"),
Principal = parms.GetStringValue("Principal"), // Principal = parms.GetStringValue("Principal"),
Mobile = parms.GetStringValue("Mobile"), Mobile = parms.GetStringValue("Mobile"),
EMail = parms.GetStringValue("EMail"), UnifiedCode = parms.GetStringValue("UnifiedCode"),
LegalPerson = parms.GetStringValue("LegalPerson"), LegalPerson = parms.GetStringValue("LegalPerson"),
WechatNo = parms.GetStringValue("WechatNo"), // CompanyIntro = parms.GetStringValue("CompanyIntro"),
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"),
}; };
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; var userInfo = AppletUserInfo;
extModel.Status = Common.Enum.DateStateEnum.Normal; extModel.Status = Common.Enum.DateStateEnum.Normal;
extModel.MallBaseId = userInfo.MallBaseId; extModel.MallBaseId = userInfo.MallBaseId;
...@@ -108,8 +122,9 @@ namespace Mall.WebApi.Controllers.TradePavilion ...@@ -108,8 +122,9 @@ namespace Mall.WebApi.Controllers.TradePavilion
extModel.CreateDate = DateTime.Now; extModel.CreateDate = DateTime.Now;
extModel.UpdateBy = Uid; extModel.UpdateBy = Uid;
extModel.UpdateDate = DateTime.Now; extModel.UpdateDate = DateTime.Now;
var flag = companyModule.SetCompanyModule(extModel); extModel.CompanyStatus = 0;
return flag ? ApiResult.Success() : ApiResult.Failed(); int ID = companyModule.SetCompanyModule(extModel);
return ID > 0 ? ApiResult.Success("", new { CompanyId = ID }) : ApiResult.Failed();
} }
/// <summary> /// <summary>
...@@ -138,7 +153,7 @@ namespace Mall.WebApi.Controllers.TradePavilion ...@@ -138,7 +153,7 @@ namespace Mall.WebApi.Controllers.TradePavilion
var query = new RB_Commerce_News_Extend() var query = new RB_Commerce_News_Extend()
{ {
Title = parms.GetStringValue("Title"), Title = parms.GetStringValue("Title"),
Type=parms.GetInt("Type") Type = parms.GetInt("Type")
}; };
var userInfo = AppletUserInfo; var userInfo = AppletUserInfo;
query.MallBaseId = RequestParm.MallBaseId; query.MallBaseId = RequestParm.MallBaseId;
...@@ -333,7 +348,7 @@ namespace Mall.WebApi.Controllers.TradePavilion ...@@ -333,7 +348,7 @@ namespace Mall.WebApi.Controllers.TradePavilion
query.MallBaseId = RequestParm.MallBaseId; query.MallBaseId = RequestParm.MallBaseId;
query.TenantId = userInfo?.TenantId ?? 0; query.TenantId = userInfo?.TenantId ?? 0;
var list = activityModule.GetCommerceActivityTypeListModule(query); 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> /// <summary>
...@@ -496,6 +511,7 @@ namespace Mall.WebApi.Controllers.TradePavilion ...@@ -496,6 +511,7 @@ namespace Mall.WebApi.Controllers.TradePavilion
/// 新增活动评论 /// 新增活动评论
/// </summary> /// </summary>
/// <returns></returns> /// <returns></returns>
[HttpPost]
public ApiResult AddCommerceComment() public ApiResult AddCommerceComment()
{ {
JObject jObj = JObject.Parse(RequestParm.msg.ToString()); JObject jObj = JObject.Parse(RequestParm.msg.ToString());
...@@ -503,11 +519,11 @@ namespace Mall.WebApi.Controllers.TradePavilion ...@@ -503,11 +519,11 @@ namespace Mall.WebApi.Controllers.TradePavilion
{ {
Id = jObj.GetInt("Id"), Id = jObj.GetInt("Id"),
ActivityId = jObj.GetInt("ActivityId"), ActivityId = jObj.GetInt("ActivityId"),
CommentScore=jObj.GetInt("CommentScore"), CommentScore = jObj.GetInt("CommentScore"),
CommentGrade=(GoodsCommentTypeEnum)jObj.GetInt("CommentGrade"), CommentGrade = (GoodsCommentTypeEnum)jObj.GetInt("CommentGrade"),
CommentImage=jObj.GetStringValue("CommentImage"), CommentImage = jObj.GetStringValue("CommentImage"),
PlatformSource=(UserSourceEnum)jObj.GetInt("PlatformSource"), PlatformSource = (UserSourceEnum)jObj.GetInt("PlatformSource"),
Content=jObj.GetStringValue("Content") Content = jObj.GetStringValue("Content")
}; };
var userInfo = AppletUserInfo; var userInfo = AppletUserInfo;
extModel.UserName = userInfo.Name; extModel.UserName = userInfo.Name;
...@@ -534,5 +550,98 @@ namespace Mall.WebApi.Controllers.TradePavilion ...@@ -534,5 +550,98 @@ namespace Mall.WebApi.Controllers.TradePavilion
return flag ? ApiResult.Success() : ApiResult.Failed(); return flag ? ApiResult.Success() : ApiResult.Failed();
} }
#endregion #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.WebApi/Controllers/TradePavilion/TradeController.cs
View file @ 4cafeb5e
...@@ -51,6 +51,10 @@ namespace Mall.WebApi.Controllers.TradePavilion ...@@ -51,6 +51,10 @@ namespace Mall.WebApi.Controllers.TradePavilion
/// 韩国馆新闻处理类 /// 韩国馆新闻处理类
/// </summary> /// </summary>
private readonly CommerceNewsModule commerceNewsModule = new CommerceNewsModule(); private readonly CommerceNewsModule commerceNewsModule = new CommerceNewsModule();
/// <summary>
/// 韩国馆新闻处理类
/// </summary>
private readonly CarrierModule carrierModule = new CarrierModule();
/// <summary> /// <summary>
...@@ -192,7 +196,7 @@ namespace Mall.WebApi.Controllers.TradePavilion ...@@ -192,7 +196,7 @@ namespace Mall.WebApi.Controllers.TradePavilion
var query = new RB_InvestmentProcurement_Extend() var query = new RB_InvestmentProcurement_Extend()
{ {
CompanyName = parms.GetStringValue("CompanyName"), CompanyName = parms.GetStringValue("CompanyName"),
Type=parms.GetInt("Type"), Type = parms.GetInt("Type"),
}; };
query.MallBaseId = RequestParm.MallBaseId; query.MallBaseId = RequestParm.MallBaseId;
query.TenantId = RequestParm.TenantId; query.TenantId = RequestParm.TenantId;
...@@ -202,7 +206,7 @@ namespace Mall.WebApi.Controllers.TradePavilion ...@@ -202,7 +206,7 @@ namespace Mall.WebApi.Controllers.TradePavilion
return ApiResult.Success(data: pageModel); return ApiResult.Success(data: pageModel);
} }
/// <summary> /// <summary>
/// 获取投资采购详情 /// 获取投资采购详情
...@@ -240,7 +244,7 @@ namespace Mall.WebApi.Controllers.TradePavilion ...@@ -240,7 +244,7 @@ namespace Mall.WebApi.Controllers.TradePavilion
var extModel = new RB_InvestmentProcurement_Extend() var extModel = new RB_InvestmentProcurement_Extend()
{ {
Id = parms.GetInt("Id"), Id = parms.GetInt("Id"),
AuditStatus=parms.GetInt("AuditStatus"), AuditStatus = parms.GetInt("AuditStatus"),
AuditTime = DateTime.Now, AuditTime = DateTime.Now,
AuditBy = Uid, AuditBy = Uid,
AuditContent = parms.GetStringValue("AuditContent") AuditContent = parms.GetStringValue("AuditContent")
...@@ -297,6 +301,28 @@ namespace Mall.WebApi.Controllers.TradePavilion ...@@ -297,6 +301,28 @@ namespace Mall.WebApi.Controllers.TradePavilion
var flag = companyModule.RemoveCompanyModule(CompanyId, Status); var flag = companyModule.RemoveCompanyModule(CompanyId, Status);
return flag ? ApiResult.Success() : ApiResult.Failed(); return flag ? ApiResult.Success() : ApiResult.Failed();
} }
/// <summary>
/// 更新公司信息
/// </summary>
/// <returns></returns>
public ApiResult UpdateCompanyStatus()
{
JObject parms = JObject.Parse(RequestParm.msg.ToString());
var CompanyId = parms.GetInt("CompanyId", 0);
var Status = parms.GetInt("CompanyStatus", 0);
var model = companyModule.GetCompanyEntity(CompanyId);
if (model == null || model.CompanyId <= 0)
{
return ApiResult.Failed("公司信息不存在");
}
if (model.CompanyStatus == 1)
{
return ApiResult.Failed("公司信息已审核通过，请勿重复审核");
}
var flag = companyModule.UpdateCompanyStatus(CompanyId, Status);
return flag ? ApiResult.Success() : ApiResult.Failed();
}
#endregion #endregion
#region 商会活动管理 #region 商会活动管理
...@@ -315,7 +341,7 @@ namespace Mall.WebApi.Controllers.TradePavilion ...@@ -315,7 +341,7 @@ namespace Mall.WebApi.Controllers.TradePavilion
}; };
query.MallBaseId = RequestParm.MallBaseId; query.MallBaseId = RequestParm.MallBaseId;
query.TenantId = RequestParm.TenantId; query.TenantId = RequestParm.TenantId;
var list = activityModule.GetCommerceActivityPageListModule(pageModel.pageIndex, pageModel.pageSize, out long rowsCount, query,isQuerySignup:true); var list = activityModule.GetCommerceActivityPageListModule(pageModel.pageIndex, pageModel.pageSize, out long rowsCount, query, isQuerySignup: true);
pageModel.count = Convert.ToInt32(rowsCount); pageModel.count = Convert.ToInt32(rowsCount);
pageModel.pageData = list; pageModel.pageData = list;
return ApiResult.Success(data: pageModel); return ApiResult.Success(data: pageModel);
...@@ -359,7 +385,8 @@ namespace Mall.WebApi.Controllers.TradePavilion ...@@ -359,7 +385,8 @@ namespace Mall.WebApi.Controllers.TradePavilion
extModel.CreateDate = DateTime.Now; extModel.CreateDate = DateTime.Now;
extModel.UpdateBy = Uid; extModel.UpdateBy = Uid;
extModel.UpdateDate = DateTime.Now; extModel.UpdateDate = DateTime.Now;
if (extModel.IsFree == 1) { if (extModel.IsFree == 1)
{
extModel.Price = 0; extModel.Price = 0;
} }
var flag = activityModule.SetCommerceActivityModule(extModel); var flag = activityModule.SetCommerceActivityModule(extModel);
...@@ -406,7 +433,7 @@ namespace Mall.WebApi.Controllers.TradePavilion ...@@ -406,7 +433,7 @@ namespace Mall.WebApi.Controllers.TradePavilion
query.MallBaseId = RequestParm.MallBaseId; query.MallBaseId = RequestParm.MallBaseId;
query.TenantId = RequestParm.TenantId; query.TenantId = RequestParm.TenantId;
var list = activityModule.GetCommerceActivityTypePageListModule(pageModel.pageIndex, pageModel.pageSize, out long rowsCount, query); var list = activityModule.GetCommerceActivityTypePageListModule(pageModel.pageIndex, pageModel.pageSize, out long rowsCount, query);
list.ForEach(x=>x.LableNameList = string.IsNullOrWhiteSpace(x.LableName) ? new List<string>() : JsonConvert.DeserializeObject<List<string>>(x.LableName) ); list.ForEach(x => x.LableNameList = string.IsNullOrWhiteSpace(x.LableName) ? new List<string>() : JsonConvert.DeserializeObject<List<string>>(x.LableName));
pageModel.count = Convert.ToInt32(rowsCount); pageModel.count = Convert.ToInt32(rowsCount);
pageModel.pageData = list; pageModel.pageData = list;
return ApiResult.Success(data: pageModel); return ApiResult.Success(data: pageModel);
...@@ -456,7 +483,8 @@ namespace Mall.WebApi.Controllers.TradePavilion ...@@ -456,7 +483,8 @@ namespace Mall.WebApi.Controllers.TradePavilion
{ {
extModel.LableName = JsonConvert.SerializeObject(extModel.LableNameList); extModel.LableName = JsonConvert.SerializeObject(extModel.LableNameList);
} }
else { else
{
extModel.LableName = ""; extModel.LableName = "";
} }
var flag = activityModule.SetCommerceActivityTypeModule(extModel); var flag = activityModule.SetCommerceActivityTypeModule(extModel);
...@@ -511,7 +539,7 @@ namespace Mall.WebApi.Controllers.TradePavilion ...@@ -511,7 +539,7 @@ namespace Mall.WebApi.Controllers.TradePavilion
return ApiResult.Success(data: list); return ApiResult.Success(data: list);
} }
/// <summary> /// <summary>
/// 根据编号获取商会活动报名实体 /// 根据编号获取商会活动报名实体
...@@ -548,11 +576,14 @@ namespace Mall.WebApi.Controllers.TradePavilion ...@@ -548,11 +576,14 @@ namespace Mall.WebApi.Controllers.TradePavilion
var Id = parms.GetInt("Id", 0); var Id = parms.GetInt("Id", 0);
var ApplyForCancelStatus = parms.GetInt("ApplyForCancelStatus", 0);//申请取消审核状态 1同意 2拒绝 var ApplyForCancelStatus = parms.GetInt("ApplyForCancelStatus", 0);//申请取消审核状态 1同意 2拒绝
var RejectRemark = parms.GetStringValue("RejectRemark");//拒绝备注 var RejectRemark = parms.GetStringValue("RejectRemark");//拒绝备注
if (Id <= 0) { if (Id <= 0)
{
return ApiResult.ParamIsNull("请传递"); return ApiResult.ParamIsNull("请传递");
} }
if (ApplyForCancelStatus == 2) { if (ApplyForCancelStatus == 2)
if (string.IsNullOrEmpty(RejectRemark)) { {
if (string.IsNullOrEmpty(RejectRemark))
{
return ApiResult.ParamIsNull("请输入拒绝的原因"); return ApiResult.ParamIsNull("请输入拒绝的原因");
} }
} }
...@@ -574,7 +605,7 @@ namespace Mall.WebApi.Controllers.TradePavilion ...@@ -574,7 +605,7 @@ namespace Mall.WebApi.Controllers.TradePavilion
var query = new RB_Commerce_News_Extend() var query = new RB_Commerce_News_Extend()
{ {
Title = parms.GetStringValue("Title"), Title = parms.GetStringValue("Title"),
Type=parms.GetInt("Type"), Type = parms.GetInt("Type"),
}; };
query.MallBaseId = RequestParm.MallBaseId; query.MallBaseId = RequestParm.MallBaseId;
query.TenantId = RequestParm.TenantId; query.TenantId = RequestParm.TenantId;
...@@ -620,12 +651,13 @@ namespace Mall.WebApi.Controllers.TradePavilion ...@@ -620,12 +651,13 @@ namespace Mall.WebApi.Controllers.TradePavilion
var extModel = new RB_Commerce_News_Extend() var extModel = new RB_Commerce_News_Extend()
{ {
Id = jObj.GetInt("Id"), Id = jObj.GetInt("Id"),
CoverImg=jObj.GetStringValue("CoverImg"), CoverImg = jObj.GetStringValue("CoverImg"),
Title= jObj.GetStringValue("Title"), Title = jObj.GetStringValue("Title"),
Industry = jObj.GetStringValue("Industry"), Industry = jObj.GetStringValue("Industry"),
PublishTime = jObj.GetDateTime("PublishTime"), PublishTime = jObj.GetDateTime("PublishTime"),
NewsInfo = jObj.GetStringValue("NewsInfo"), NewsInfo = jObj.GetStringValue("NewsInfo"),
Type=jObj.GetInt("Type"), Type = jObj.GetInt("Type"),
Subtitle = jObj.GetStringValue("Subtitle"),
}; };
extModel.Status = Common.Enum.DateStateEnum.Normal; extModel.Status = Common.Enum.DateStateEnum.Normal;
extModel.MallBaseId = RequestParm.MallBaseId; extModel.MallBaseId = RequestParm.MallBaseId;
...@@ -685,13 +717,125 @@ namespace Mall.WebApi.Controllers.TradePavilion ...@@ -685,13 +717,125 @@ namespace Mall.WebApi.Controllers.TradePavilion
{ {
Id = parms.GetInt("Id", 0), Id = parms.GetInt("Id", 0),
AskStatus = parms.GetInt("AskStatus"), AskStatus = parms.GetInt("AskStatus"),
ReplyTime =DateTime.Now, ReplyTime = DateTime.Now,
FatContent=parms.GetStringValue("FatContent"), FatContent = parms.GetStringValue("FatContent"),
ReplyId= Uid ReplyId = Uid
}; };
var extModel = askModule.ReplyCommerceAskModule(model); var extModel = askModule.ReplyCommerceAskModule(model);
return ApiResult.Success(data: extModel); return ApiResult.Success(data: extModel);
} }
#endregion #endregion
#region 载体信息
/// <summary>
/// 获取载体分页列表
/// </summary>
/// <returns></returns>
[HttpGet]
[HttpPost]
public ApiResult GetCarrierPageList()
{
ResultPageModel pageModel = JsonConvert.DeserializeObject<ResultPageModel>(RequestParm.msg.ToString());
JObject parms = JObject.Parse(RequestParm.msg.ToString());
var query = new RB_Carrier_Extend()
{
MetroName = parms.GetStringValue("MetroName"),
CarrierName = parms.GetStringValue("CarrierName"),
MetroNum = parms.GetInt("MetroNum", 0),
Developers = parms.GetStringValue("Developers"),
StartOpenTime = parms.GetStringValue("StartOpenTime"),
EndOpenTime = parms.GetStringValue("EndOpenTime"),
ProjectType = (Common.Enum.TradePavilion.ProjectTypeEnum)parms.GetInt("ProjectType", 0)
};
query.MallBaseId = RequestParm.MallBaseId;
query.TenantId = RequestParm.TenantId;
var list = carrierModule.GetCarrierPageList(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 GetCarrierDetails()
{
JObject parms = JObject.Parse(RequestParm.msg.ToString());
var query = new RB_Carrier_Extend()
{
ID = parms.GetInt("ID", 0),
};
query.MallBaseId = RequestParm.MallBaseId;
query.TenantId = RequestParm.TenantId;
var extModel = carrierModule.GetCarrierModel(query);
return ApiResult.Success(data: extModel);
}
/// <summary>
/// 新增/修改载体信息
/// </summary>
/// <returns></returns>
[HttpPost]
public ApiResult GetSetCarrier()
{
JObject parms = JObject.Parse(RequestParm.msg.ToString());
RB_Carrier_Extend query = JsonConvert.DeserializeObject<RB_Carrier_Extend>(RequestParm.msg.ToString());
if (string.IsNullOrWhiteSpace(query.CarrierName))
{
return ApiResult.Failed("请输入载体名称");
}
if (string.IsNullOrWhiteSpace(query.Logo))
{
return ApiResult.Failed("请上传Logo");
}
if (string.IsNullOrWhiteSpace(query.Developers))
{
return ApiResult.Failed("请输入开发商");
}
if (string.IsNullOrWhiteSpace(query.CarrierName))
{
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.UpdateDate = System.DateTime.Now;
bool flag = carrierModule.SetCarrier(query);
return flag ? ApiResult.Success() : ApiResult.Failed();
}
/// <summary>
/// 删除载体信息
/// </summary>
/// <returns></returns>
public ApiResult RemoveCarrier()
{
JObject parms = JObject.Parse(RequestParm.msg.ToString());
var CarrierId = parms.GetInt("CarrierId", 0);
var Status = parms.GetInt("Status", 0);
var flag = carrierModule.RemoveCarrierModule(CarrierId, RequestParm.TenantId, RequestParm.MallBaseId, Status);
return flag ? ApiResult.Success() : ApiResult.Failed();
}
#endregion
} }
} }
Mall.WindowsService/Mall.WindowsService.csproj.user
View file @ 4cafeb5e
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Project ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup> <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> </PropertyGroup>
<ItemGroup> <ItemGroup>
<Compile Update="WindowsService.cs"> <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