Skip to content

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

1

parent c7affdb4
Show whitespace changes
Inline Side-by-side
Showing with 1863 additions and 216 deletions
Mall.Common/Config.cs
View file @ ec9738a2
...@@ -791,6 +791,17 @@ namespace Mall.Common ...@@ -791,6 +791,17 @@ namespace Mall.Common
return ReadConfigKey("IsFirtsShopAutoExamine"); return ReadConfigKey("IsFirtsShopAutoExamine");
} }
} }
/// <summary>
/// 翠屏商务局（商载通）企业认证是否自动审核，1-是
/// </summary>
public static string IsCPSWJAutoExamine
{
get
{
return ReadConfigKey("IsCPSWJAutoExamine");
}
}
/// <summary> /// <summary>
/// 汇付天下回调进阶思维接口地址 /// 汇付天下回调进阶思维接口地址
......
Mall.Model/Entity/TradePavilion/RB_BrandEnterpriseApplyFor.cs
View file @ ec9738a2
...@@ -260,14 +260,6 @@ namespace Mall.Model.Entity.TradePavilion ...@@ -260,14 +260,6 @@ namespace Mall.Model.Entity.TradePavilion
/// </summary> /// </summary>
public string Complementary { get; set; } public string Complementary { get; set; }
/// <summary>
/// 状态0-待审核，1- 审核通过，2-审核失败
/// </summary>
public int ApplyForStatus { get; set; }
/// <summary>
/// 拒绝备注
/// </summary>
public string RejectRemark { get; set; }
} }
} }
Mall.Model/Entity/TradePavilion/RB_CarrierEnterpriseApplyFor.cs
View file @ ec9738a2
...@@ -268,15 +268,7 @@ namespace Mall.Model.Entity.TradePavilion ...@@ -268,15 +268,7 @@ namespace Mall.Model.Entity.TradePavilion
public int CategoryId { get; set; } public int CategoryId { get; set; }
/// <summary>
/// 状态0-待审核，1- 审核通过，2-审核失败
/// </summary>
public int ApplyForStatus { get; set; }
/// <summary>
/// 拒绝备注
/// </summary>
public string RejectRemark { get; set; }
} }
......
Mall.Model/Entity/TradePavilion/RB_CompanyEnterprise.cs 0 → 100644
View file @ ec9738a2
using Mall.Common.Enum;
using System;
using VT.FW.DB;
namespace Mall.Model.Entity.TradePavilion
{
/// <summary>
/// 【商载通】公司信息实体类
/// </summary>
[Serializable]
[DB(ConnectionName = "DefaultConnection")]
public class RB_CompanyEnterprise
{
/// <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; }
/// <summary>
/// 首店类型 1-品牌方 , 2-载体方,3-企业，4-楼宇
/// </summary>
public int FirstShopType { get; set; }
/// <summary>
/// 拒绝备注
/// </summary>
public string RejectRemark { get; set; }
/// <summary>
/// 资料是否完善 1是 其他否
/// </summary>
public int IsComplete { get; set; }
}
}
Mall.Model/Extend/TradePavilion/RB_Brand_Enterprise_Extend.cs
View file @ ec9738a2
...@@ -25,5 +25,10 @@ namespace Mall.Model.Extend.TradePavilion ...@@ -25,5 +25,10 @@ namespace Mall.Model.Extend.TradePavilion
/// Banner图片列表 /// Banner图片列表
/// </summary> /// </summary>
public List<string> BannerList { get; set; } public List<string> BannerList { get; set; }
/// <summary>
/// 根据ids查询
/// </summary>
public string SelectIds { get; set; }
} }
} }
Mall.Model/Extend/TradePavilion/RB_Building_Carrier_Extend.cs
View file @ ec9738a2
...@@ -56,5 +56,9 @@ namespace Mall.Model.Extend.TradePavilion ...@@ -56,5 +56,9 @@ namespace Mall.Model.Extend.TradePavilion
/// 首店查询类型(1-成都首店,2-宜宾商载通) /// 首店查询类型(1-成都首店,2-宜宾商载通)
/// </summary> /// </summary>
public int QShopType { get; set; } public int QShopType { get; set; }
/// <summary>
/// 根据ids查询
/// </summary>
public string SelectIds { get; set; }
} }
} }
Mall.Model/Extend/TradePavilion/RB_CompanyEnterprise_Extend.cs 0 → 100644
View file @ ec9738a2
using Mall.Model.Entity.TradePavilion;
using System;
using System.Collections.Generic;
using System.Text;
namespace Mall.Model.Extend.TradePavilion
{
/// <summary>
/// 【商载通】公司信息扩展实体类
/// </summary>
public class RB_CompanyEnterprise_Extend : RB_CompanyEnterprise
{
/// <summary>
/// 认证品牌
/// </summary>
public RB_BrandEnterpriseApplyFor_Extend BrandModel { get; set; }
/// <summary>
/// 认证载体
/// </summary>
public RB_CarrierEnterpriseApplyFor_Extend CarrierModel { get; set; }
/// <summary>
/// 用户名称
/// </summary>
public string UserName { get; set; }
/// <summary>
/// 用户头像
/// </summary>
public string UserIcon { get; set; }
/// <summary>
/// 用户ids
/// </summary>
public string UserIds { get; set; }
}
}
Mall.Model/Extend/TradePavilion/RB_Visit_Log_Extend.cs 0 → 100644
View file @ ec9738a2
using Mall.Model.Entity.TradePavilion;
using System;
using System.Collections.Generic;
using System.Text;
using VT.FW.DB;
namespace Mall.Model.Extend.TradePavilion
{
/// <summary>
/// 【商载通】访问记录信息 访问载体数，访问楼宇数，访问品牌数，访问企业数 扩展表
/// </summary>
[Serializable]
[DB(ConnectionName = "DefaultConnection")]
public class RB_Visit_Log_Extend : RB_Visit_Log
{
/// <summary>
/// 总浏览量
/// </summary>
public int TotalNum { get; set; }
/// <summary>
/// 开始日期
/// </summary>
public string startDate { get; set; }
/// <summary>
/// 结束日期
/// </summary>
public string endDate { get; set; }
/// <summary>
/// 查询top数
/// </summary>
public int SelectTopNum { get; set; }
/// <summary>
/// 产品名称
/// </summary>
public string ProductName { get; set; }
}
}
Mall.Module.TradePavilion/BuildingCarrierModule_V2.cs
View file @ ec9738a2
...@@ -6,6 +6,7 @@ using Mall.Common.Plugin; ...@@ -6,6 +6,7 @@ using Mall.Common.Plugin;
using Mall.Model.Extend.TradePavilion; using Mall.Model.Extend.TradePavilion;
using Mall.Module.User; using Mall.Module.User;
using Mall.Repository.TradePavilion; using Mall.Repository.TradePavilion;
using Newtonsoft.Json;
using Newtonsoft.Json.Linq; using Newtonsoft.Json.Linq;
using RabbitMQ.Client.Framing.Impl; using RabbitMQ.Client.Framing.Impl;
using System; using System;
...@@ -37,7 +38,14 @@ namespace Mall.Module.TradePavilion ...@@ -37,7 +38,14 @@ namespace Mall.Module.TradePavilion
/// </summary> /// </summary>
private readonly RB_CarrierEnterpriseMetroApplyForRepository carrierEnterpriseMetroApplyForRepository = new RB_CarrierEnterpriseMetroApplyForRepository(); private readonly RB_CarrierEnterpriseMetroApplyForRepository carrierEnterpriseMetroApplyForRepository = new RB_CarrierEnterpriseMetroApplyForRepository();
/// <summary>
/// 【商载通】公司仓储层
/// </summary>
private readonly RB_CompanyEnterpriseRepository companyEnterpriseRepository = new RB_CompanyEnterpriseRepository();
/// <summary>
/// 用户
/// </summary>
private readonly Repository.User.RB_Member_UserRepository member_UserRepository = new Repository.User.RB_Member_UserRepository();
#region 品牌/企业 #region 品牌/企业
/// <summary> /// <summary>
...@@ -77,6 +85,23 @@ namespace Mall.Module.TradePavilion ...@@ -77,6 +85,23 @@ namespace Mall.Module.TradePavilion
return brandEnterpriseApplyForRepository.GetEntity(ID).RefMapperTo<RB_BrandEnterpriseApplyFor_Extend>(); return brandEnterpriseApplyForRepository.GetEntity(ID).RefMapperTo<RB_BrandEnterpriseApplyFor_Extend>();
} }
/// <summary>
///删除品牌/企业申请信息状态
/// </summary>
/// <param name="CompanyId"></param>
/// <param name="Status"></param>
/// <returns></returns>
public bool RemoveBrandEnterpriseApplyForModule(int ID)
{
Dictionary<string, object> fileds = new Dictionary<string, object>()
{
{nameof(RB_Carrier_Extend.Status), (int)DateStateEnum.Delete},
};
bool flag = brandEnterpriseApplyForRepository.Update(fileds, new WhereHelper(nameof(RB_BrandEnterpriseApplyFor_Extend.ID), ID));
return flag;
}
/// <summary> /// <summary>
/// 新增/修改品牌/企业申请信息 /// 新增/修改品牌/企业申请信息
/// </summary> /// </summary>
...@@ -84,11 +109,23 @@ namespace Mall.Module.TradePavilion ...@@ -84,11 +109,23 @@ namespace Mall.Module.TradePavilion
public bool SetCarrierEnterpriseApplyFor(RB_BrandEnterpriseApplyFor_Extend model) public bool SetCarrierEnterpriseApplyFor(RB_BrandEnterpriseApplyFor_Extend model)
{ {
bool flag = false; bool flag = false;
if (model.ID > 0) var cmodel = companyEnterpriseRepository.GetEntity(model.CompanyId);
if (cmodel == null) { return false; }
//更新认证表 资料状态为完成
Dictionary<string, object> keyValues = new Dictionary<string, object>()
{ {
flag = brandEnterpriseApplyForRepository.Insert(model) > 0; { nameof(RB_CompanyEnterprise_Extend.IsComplete),1}
};
List<WhereHelper> wheres = new List<WhereHelper>()
{
new WhereHelper()
{
FiledName=nameof(RB_CompanyEnterprise_Extend.CompanyId),
FiledValue= model.CompanyId,
OperatorEnum=OperatorEnum.Equal
} }
else };
if (model.ID > 0)
{ {
Dictionary<string, object> fileds = new Dictionary<string, object>() Dictionary<string, object> fileds = new Dictionary<string, object>()
{ {
...@@ -134,9 +171,74 @@ namespace Mall.Module.TradePavilion ...@@ -134,9 +171,74 @@ namespace Mall.Module.TradePavilion
}; };
flag = brandEnterpriseApplyForRepository.Update(fileds, new WhereHelper(nameof(RB_BrandEnterpriseApplyFor_Extend.ID), model.ID)); flag = brandEnterpriseApplyForRepository.Update(fileds, new WhereHelper(nameof(RB_BrandEnterpriseApplyFor_Extend.ID), model.ID));
} }
else
{
#region 验证品牌数据是否已存在
var oldList = brandEnterpriseApplyForRepository.GetCarrierEnterpriseApplyForRepository(new RB_BrandEnterpriseApplyFor_Extend() { MallBaseId = model.MallBaseId, CompanyId = model.CompanyId });
if (oldList != null && oldList.Any())
{
return false;
}
#endregion
flag = brandEnterpriseApplyForRepository.Insert(model) > 0;
if (flag)
{
if (Config.IsCPSWJAutoExamine == "1")//自动审核
{
keyValues.Add(nameof(RB_CompanyEnterprise_Extend.CompanyStatus), 1);
try
{
var BrandModel = oldList?.FirstOrDefault();
if ((BrandModel?.ExistBrandId ?? 0) > 0)
{
Dictionary<string, object> filedsBrand = new Dictionary<string, object>()
{
{ nameof(RB_Brand_Enterprise_Extend.BrandName),model.BrandName},
{ nameof(RB_Brand_Enterprise_Extend.FullBrandName),model.FullBrandName},
{ nameof(RB_Brand_Enterprise_Extend.VideoUrl),model.VideoUrl},
{ nameof(RB_Brand_Enterprise_Extend.Logo),model.Logo},
{ nameof(RB_Brand_Enterprise_Extend.Banner),model.Banner},
{ nameof(RB_Brand_Enterprise_Extend.ShopNum),model.ShopNum},
{ nameof(RB_Brand_Enterprise_Extend.BuiltUpArea),model.BuiltUpArea},
{ nameof(RB_Brand_Enterprise_Extend.EndBuiltUpArea),model.EndBuiltUpArea},
{ nameof(RB_Brand_Enterprise_Extend.BrandType),model.BrandType},
{ nameof(RB_Brand_Enterprise_Extend.CustomerType),model.CustomerType},
{ nameof(RB_Brand_Enterprise_Extend.AreaRequirement),model.AreaRequirement},
{ nameof(RB_Brand_Enterprise_Extend.EndAreaRequirement),model.EndAreaRequirement},
{ nameof(RB_Brand_Enterprise_Extend.CategoryId),model.BrandClassId},
{ nameof(RB_Brand_Enterprise_Extend.BrandEnterpriseType),model.BrandEnterpriseType},
{ nameof(RB_Brand_Enterprise_Extend.Introduce),model.Introduce},
{ nameof(RB_Brand_Enterprise_Extend.DevIntention),model.DevIntention},
{ nameof(RB_Brand_Enterprise_Extend.PropertyDemand),model.PropertyDemand},
{ nameof(RB_Brand_Enterprise_Extend.Cooperation),model.Cooperation},
{ nameof(RB_Brand_Enterprise_Extend.Complementary),model.Complementary},
};
brand_EnterpriseRepository.Update(filedsBrand, new WhereHelper(nameof(RB_Brand_Enterprise_Extend.ID), BrandModel.ExistBrandId));
}
else
{
#region 新增品牌
var inserBModel = BrandModel.RefMapperTo<RB_Brand_Enterprise_Extend>();
inserBModel.ID = 0;
inserBModel.UserId = cmodel.CreateBy;
brand_EnterpriseRepository.Insert(inserBModel);
#endregion
}
}
catch
{
}
}
}
}
if (flag)
{ //更新认证表 资料状态为完成
companyEnterpriseRepository.Update(keyValues, wheres);
}
return flag; return flag;
} }
#endregion #endregion
...@@ -151,6 +253,9 @@ namespace Mall.Module.TradePavilion ...@@ -151,6 +253,9 @@ namespace Mall.Module.TradePavilion
{ {
bool flag = false; bool flag = false;
var cmodel = companyEnterpriseRepository.GetEntity(model.CompanyId);
if (cmodel == null) { return false; }
if (model.ID > 0) if (model.ID > 0)
{ {
Dictionary<string, object> fileds = new Dictionary<string, object>() Dictionary<string, object> fileds = new Dictionary<string, object>()
...@@ -195,6 +300,144 @@ namespace Mall.Module.TradePavilion ...@@ -195,6 +300,144 @@ namespace Mall.Module.TradePavilion
{ {
var oldCarrierMetroList = carrierEnterpriseMetroApplyForRepository.GetCarrierMetroList(new RB_CarrierEnterpriseMetroApplyFor_Extend { TenantId = model.TenantId, MallBaseId = model.MallBaseId, CarrierId = model.ID }); var oldCarrierMetroList = carrierEnterpriseMetroApplyForRepository.GetCarrierMetroList(new RB_CarrierEnterpriseMetroApplyFor_Extend { TenantId = model.TenantId, MallBaseId = model.MallBaseId, CarrierId = model.ID });
carrierEnterpriseMetroApplyForRepository.DeleteBatch(oldCarrierMetroList); carrierEnterpriseMetroApplyForRepository.DeleteBatch(oldCarrierMetroList);
}
}
else
{
#region 验证载体申请是否已存在
var oldList = carrierEnterpriseApplyForRepository.GetCarrierEnterpriseList(new RB_CarrierEnterpriseApplyFor_Extend() { MallBaseId = model.MallBaseId, CompanyId = model.CompanyId });
if (oldList.Any())
{
return false;
}
#endregion
int Id = carrierEnterpriseApplyForRepository.Insert(model);
model.ID = Id;
flag = Id > 0;
}
if (flag)
{
//更新认证表 资料状态为完成
//更新认证表 资料状态为完成
Dictionary<string, object> keyValues = new Dictionary<string, object>() {
{ nameof(RB_CompanyEnterprise_Extend.IsComplete),1}
};
List<WhereHelper> wheres = new List<WhereHelper>() {
new WhereHelper(){
FiledName=nameof(RB_CompanyEnterprise_Extend.CompanyId),
FiledValue= model.CompanyId,
OperatorEnum=OperatorEnum.Equal
}
};
if (Config.IsFirtsShopAutoExamine == "1")//自动审核
{
keyValues.Add(nameof(RB_CompanyEnterprise_Extend.CompanyStatus), 1);
//载体
var carrierList = carrierEnterpriseApplyForRepository.GetCarrierEnterpriseList(new RB_CarrierEnterpriseApplyFor_Extend() { MallBaseId = cmodel.MallBaseId, CompanyId = cmodel.CompanyId });
if (carrierList != null && carrierList.Any())
{
var CarrierModel = carrierList.FirstOrDefault();
var MetroList = carrierEnterpriseMetroApplyForRepository.GetCarrierMetroList(new RB_CarrierEnterpriseMetroApplyFor_Extend { MallBaseId = cmodel.MallBaseId, CarrierId = CarrierModel.ID });
if (CarrierModel.ExistCarrierId > 0)
{
var carrmodel = building_CarrierRepository.GetEntity(CarrierModel.ExistCarrierId);
#region 修改载体
int FirstStoreTest = 0;
if (!string.IsNullOrWhiteSpace(CarrierModel.StartingInfo))
{
FirstStoreTest = 1;
}
int OpeningStatus = 0;
if (CarrierModel.OpenTime.HasValue)
{
if (CarrierModel.OpenTime.Value <= System.DateTime.Now)
{
OpeningStatus = 1;
}
}
Dictionary<string, object> filedsCarrier = new Dictionary<string, object>()
{
{nameof(RB_Building_Carrier_Extend.CarrierName),model.CarrierName },
{nameof(RB_Building_Carrier_Extend.Logo),model.Logo },
{nameof(RB_Building_Carrier_Extend.Banner),model.Banner },
{nameof(RB_Building_Carrier_Extend.Honor),model.Honor },
{nameof(RB_Building_Carrier_Extend.Developers),model.Developers },
{nameof(RB_Building_Carrier_Extend.OpeningStatus),OpeningStatus },
{nameof(RB_Building_Carrier_Extend.VideoUrl),model.VideoUrl },
{nameof(RB_Building_Carrier_Extend.Address),model.Address },
{nameof(RB_Building_Carrier_Extend.LatAndLon),model.LatAndLon },
{nameof(RB_Building_Carrier_Extend.OpenTime),model.OpenTime },
{nameof(RB_Building_Carrier_Extend.BuildingCarrierType),model.BuildingCarrierType },
{nameof(RB_Building_Carrier_Extend.CategoryId),model.CategoryId },
{nameof(RB_Building_Carrier_Extend.Ascription),model.Ascription },
{nameof(RB_Building_Carrier_Extend.CarrierSize),model.CarrierSize },
{nameof(RB_Building_Carrier_Extend.PropertyComposition),model.PropertyComposition },
{nameof(RB_Building_Carrier_Extend.Location),model.Location },
{nameof(RB_Building_Carrier_Extend.Crowd),model.Crowd },
{nameof(RB_Building_Carrier_Extend.VisitorsFlowrate),model.VisitorsFlowrate },
{nameof(RB_Building_Carrier_Extend.LayersNum),model.LayersNum },
{nameof(RB_Building_Carrier_Extend.SupportingFacilities),model.SupportingFacilities },
{nameof(RB_Building_Carrier_Extend.ManagementCompany),model.ManagementCompany },
{nameof(RB_Building_Carrier_Extend.BrandDemand),model.BrandDemand },
{nameof(RB_Building_Carrier_Extend.UpdateBy),model.UpdateBy },
{nameof(RB_Building_Carrier_Extend.UpdateDate),model.UpdateDate },
};
flag = building_CarrierRepository.Update(filedsCarrier, new WhereHelper(nameof(RB_Building_Carrier_Extend.ID), carrmodel.ID));
if (flag)
{
var oldCarrierMetroList = carrierEnterpriseMetroApplyForRepository.GetCarrierMetroList(new RB_CarrierEnterpriseMetroApplyFor_Extend { MallBaseId = CarrierModel.MallBaseId, CarrierId = carrmodel.ID });
carrierEnterpriseMetroApplyForRepository.DeleteBatch(oldCarrierMetroList);
var mlist = MetroList.RefMapperToList<RB_CarrierEnterpriseMetroApplyFor_Extend>();
mlist.ForEach(x =>
{
x.ID = 0;
x.CarrierId = carrmodel.ID;
x.Status = 0;
x.TenantId = CarrierModel.TenantId;
x.MallBaseId = CarrierModel.MallBaseId;
});
carrierEnterpriseMetroApplyForRepository.InsertBatch(mlist);
}
#endregion
}
else
{
#region 新增载体
var inserCModel = CarrierModel.RefMapperTo<RB_Building_Carrier_Extend>();
inserCModel.ID = 0;
inserCModel.UserId = cmodel.CreateBy;
if (CarrierModel.OpenTime.HasValue)
{
if (CarrierModel.OpenTime.Value <= System.DateTime.Now)
{
inserCModel.OpeningStatus = 1;
}
}
if (!string.IsNullOrWhiteSpace(CarrierModel.StartingInfo))
{
inserCModel.FirstStoreTest = 1;
}
int Id = building_CarrierRepository.Insert(inserCModel);
if (Id > 0)
{
var mlist = MetroList.RefMapperToList<RB_CarrierEnterpriseMetroApplyFor_Extend>();
mlist.ForEach(x =>
{
x.ID = 0;
x.CarrierId = Id;
x.Status = 0;
x.TenantId = CarrierModel.TenantId;
x.MallBaseId = CarrierModel.MallBaseId;
});
carrierEnterpriseMetroApplyForRepository.InsertBatch(mlist);
}
#endregion
}
}
}
model.CarrierMetroList.ForEach(x => model.CarrierMetroList.ForEach(x =>
{ {
x.CarrierId = model.ID; x.CarrierId = model.ID;
...@@ -203,190 +446,665 @@ namespace Mall.Module.TradePavilion ...@@ -203,190 +446,665 @@ namespace Mall.Module.TradePavilion
x.MallBaseId = model.MallBaseId; x.MallBaseId = model.MallBaseId;
}); });
carrierEnterpriseMetroApplyForRepository.InsertBatch(model.CarrierMetroList); carrierEnterpriseMetroApplyForRepository.InsertBatch(model.CarrierMetroList);
companyEnterpriseRepository.Update(keyValues, wheres);
}
return flag;
}
//更新认证表 资料状态为完成
//Dictionary<string, object> keyValues = new Dictionary<string, object>() {
// { nameof(RB_Company_Extend.IsComplete),1} #endregion
//};
//List<WhereHelper> wheres = new List<WhereHelper>() {
// new WhereHelper(){ #region 公司
// FiledName=nameof(RB_Company_Extend.CompanyId),
// FiledValue= model.CompanyId, /// <summary>
// OperatorEnum=OperatorEnum.Equal /// 新增修改公司信息
// } /// </summary>
//}; /// <param name="model"></param>
//companyRepository.Update(keyValues, wheres); /// <returns></returns>
public int SetCompanyModule(RB_CompanyEnterprise_Extend model)
{
int ID;
if (model.CompanyId > 0)
{
ID = model.CompanyId;
Dictionary<string, object> fileds = new Dictionary<string, object>()
{
{nameof(RB_CompanyEnterprise_Extend.CompanyName),model.CompanyName },
{nameof(RB_CompanyEnterprise_Extend.Principal),model.Principal },
{nameof(RB_CompanyEnterprise_Extend.Mobile),model.Mobile },
{nameof(RB_CompanyEnterprise_Extend.BusinessLicense),model.BusinessLicense },
{nameof(RB_CompanyEnterprise_Extend.LegalPerson),model.LegalPerson },
{nameof(RB_CompanyEnterprise_Extend.UnifiedCode),model.UnifiedCode },
{nameof(RB_CompanyEnterprise_Extend.CompanyIntro),model.CompanyIntro },
{nameof(RB_CompanyEnterprise_Extend.FirstShopType),model.FirstShopType },
{nameof(RB_CompanyEnterprise_Extend.CompanyStatus),model.CompanyStatus },
{nameof(RB_CompanyEnterprise_Extend.UpdateBy),model.UpdateBy },
{nameof(RB_CompanyEnterprise_Extend.UpdateDate),model.UpdateDate },
};
companyEnterpriseRepository.Update(fileds, new WhereHelper(nameof(RB_CompanyEnterprise_Extend.CompanyId), model.CompanyId));
}
else
{
var newId = companyEnterpriseRepository.Insert(model);
model.CompanyId = newId;
ID = newId;
} }
return ID;
}
/// <summary>
/// 获取公司信息实体
/// </summary>
/// <param name="CompanyId"></param>
/// <returns></returns>
public RB_CompanyEnterprise_Extend GetCompanyByUserIdModule(int userId)
{
var model = companyEnterpriseRepository.GetCompanyRepository(new RB_CompanyEnterprise_Extend() { CreateBy = userId });
if (model != null && model.CompanyId > 0)
{
model.BrandModel = new RB_BrandEnterpriseApplyFor_Extend();
model.CarrierModel = new RB_CarrierEnterpriseApplyFor_Extend();
if (model.CompanyStatus == 1)
{
if (model.FirstShopType == 1)
{
//审核通过了的 直接查询资料表
var blist = brand_EnterpriseRepository.GetBrandEnterpriseListRepository(new RB_Brand_Enterprise_Extend() { TenantId = model.TenantId, MallBaseId = model.MallBaseId, UserId = userId });
model.BrandModel = blist.FirstOrDefault().RefMapperTo<RB_BrandEnterpriseApplyFor_Extend>();
if (model.BrandModel != null)
{
if (!string.IsNullOrWhiteSpace(model.BrandModel.CustomerType))
{
model.BrandModel.CustomerTypeInfo = new List<string>();
foreach (var itemCustomerType in model.BrandModel.CustomerType.Split(","))
{
model.BrandModel.CustomerTypeInfo.Add(Common.Plugin.EnumHelper.GetEnumName(itemCustomerType));
}
}
if (!string.IsNullOrWhiteSpace(model.BrandModel.Banner))
{
model.BrandModel.BannerList = JsonConvert.DeserializeObject<List<string>>(model.BrandModel.Banner);
} }
else else
{ {
#region 验证载体申请是否已存在 model.BrandModel.BannerList = new List<string>();
//var oldList = carrierEnterpriseApplyForRepository.GetCarrierEnterpriseList(new RB_CarrierEnterpriseApplyFor_Extend() { MallBaseId = model.MallBaseId, CompanyId = model.CompanyId }); }
//if (oldList.Any()) }
else
{
model.BrandModel = new RB_BrandEnterpriseApplyFor_Extend
{
BannerList = new List<string>(),
CustomerTypeInfo = new List<string>()
};
}
}
else
{
var clist = building_CarrierRepository.GetBuildingCarrierListRepository(new RB_Building_Carrier_Extend() { TenantId = model.TenantId, MallBaseId = model.MallBaseId, UserId = userId });
if (clist.Any())
{
model.CarrierModel = clist.FirstOrDefault().RefMapperTo<RB_CarrierEnterpriseApplyFor_Extend>();
var metroList = carrierEnterpriseMetroApplyForRepository.GetCarrierMetroList(new RB_CarrierEnterpriseMetroApplyFor_Extend { TenantId = model.TenantId, MallBaseId = model.MallBaseId, CarrierId = model.CarrierModel.ID });
model.CarrierModel.CarrierMetroList = new List<RB_CarrierEnterpriseMetroApplyFor_Extend>();
if (metroList != null && metroList.Any())
{
model.CarrierModel.CarrierMetroList = metroList.RefMapperToList<RB_CarrierEnterpriseMetroApplyFor_Extend>();
}
if (!string.IsNullOrWhiteSpace(model.CarrierModel.Banner))
{
model.CarrierModel.BannerList = JsonConvert.DeserializeObject<List<string>>(model.CarrierModel.Banner);
}
else
{
model.CarrierModel.BannerList = new List<string>();
}
}
}
}
else
{
if (model.FirstShopType == 1)
{
var brandList = brandEnterpriseApplyForRepository.GetCarrierEnterpriseApplyForRepository(new RB_BrandEnterpriseApplyFor_Extend { TenantId = model.TenantId, MallBaseId = model.MallBaseId, CompanyId = model.CompanyId });
if (brandList != null && brandList.Any())
{
model.BrandModel = brandList.FirstOrDefault();
if (model.BrandModel != null)
{
if (!string.IsNullOrWhiteSpace(model.BrandModel.CustomerType))
{
model.BrandModel.CustomerTypeInfo = new List<string>();
foreach (var itemCustomerType in model.BrandModel.CustomerType.Split(","))
{
model.BrandModel.CustomerTypeInfo.Add(Common.Plugin.EnumHelper.GetEnumName(itemCustomerType));
}
}
if (!string.IsNullOrWhiteSpace(model.BrandModel.Banner))
{
model.BrandModel.BannerList = JsonConvert.DeserializeObject<List<string>>(model.BrandModel.Banner);
}
else
{
model.BrandModel.BannerList = new List<string>();
}
}
else
{
model.BrandModel = new RB_BrandEnterpriseApplyFor_Extend
{
BannerList = new List<string>(),
CustomerTypeInfo = new List<string>()
};
}
}
}
else
{
var carrierList = carrierEnterpriseApplyForRepository.GetCarrierEnterpriseList(new RB_CarrierEnterpriseApplyFor_Extend() { TenantId = model.TenantId, MallBaseId = model.MallBaseId, CompanyId = model.CompanyId });
if (carrierList.Any())
{
model.CarrierModel = carrierList.FirstOrDefault();
var metroList = carrierEnterpriseMetroApplyForRepository.GetCarrierMetroList(new RB_CarrierEnterpriseMetroApplyFor_Extend { TenantId = model.TenantId, MallBaseId = model.MallBaseId, CarrierId = model.CarrierModel.ID });
model.CarrierModel.CarrierMetroList = new List<RB_CarrierEnterpriseMetroApplyFor_Extend>();
if (metroList != null && metroList.Any())
{
model.CarrierModel.CarrierMetroList = metroList;
}
if (!string.IsNullOrWhiteSpace(model.CarrierModel.Banner))
{
model.CarrierModel.BannerList = JsonConvert.DeserializeObject<List<string>>(model.CarrierModel.Banner);
}
else
{
model.CarrierModel.BannerList = new List<string>();
}
if (!string.IsNullOrWhiteSpace(model.CarrierModel.Honor))
{
model.CarrierModel.HonorList = JsonConvert.DeserializeObject<List<string>>(model.CarrierModel.Honor);
}
else
{
model.CarrierModel.HonorList = new List<string>();
}
if (!string.IsNullOrWhiteSpace(model.CarrierModel.FirstShopNum))
{
model.CarrierModel.FirstShopNumList = JsonConvert.DeserializeObject<List<FirstShopNumModel>>(model.CarrierModel.FirstShopNum);
}
else
{
model.CarrierModel.FirstShopNumList = new List<FirstShopNumModel>();
}
}
}
}
}
return model;
}
/// <summary>
/// 获取认证状态
/// </summary>
/// <param name="userId"></param>
/// <returns></returns>
public object GetCommpanyStatus(int userId)
{
var model = companyEnterpriseRepository.GetCompanyRepository(new RB_CompanyEnterprise_Extend() { CreateBy = userId });
if (model != null)
{
if (model.CompanyStatus == 1)
{
return new
{
CompanyStatus = 5,//认证通过
model.FirstShopType,
model.CompanyName
};
}
else if (model.CompanyStatus == 0)
{
if (model.IsComplete == 1)
{
return new
{
CompanyStatus = 3,//认证审核中
model.FirstShopType,
model.CompanyName
};
}
else
{
return new
{
CompanyStatus = 2,//认证待完善
model.FirstShopType,
model.CompanyName
};
}
}
else if (model.CompanyStatus == 2)
{
return new
{
CompanyStatus = 4,//认证未通过
model.FirstShopType,
model.CompanyName
};
}
}
else
{
return new
{
CompanyStatus = 1,//未认证
FirstShopType = 0,
CompanyName = ""
};
}
return model;
}
/// <summary>
/// 获取公司信息分页列表
/// </summary>
/// <param name="pageIndex"></param>
/// <param name="pageSize"></param>
/// <param name="rowsCount"></param>
/// <param name="query"></param>
/// <returns></returns>
public List<RB_CompanyEnterprise_Extend> GetCompanyEnterprisePageListModule(int pageIndex, int pageSize, out long rowsCount, RB_CompanyEnterprise_Extend query)
{
var list = companyEnterpriseRepository.GetCompanyPageListRepository(pageIndex, pageSize, out rowsCount, query);
if (list != null && list.Any())
{
//查询用户列表
string userIds = string.Join(",", list.Select(x => x.CreateBy));
var ulist = member_UserRepository.GetList(new Model.Extend.User.RB_Member_User_Extend() { MallBaseId = query.MallBaseId, UserIds = userIds });
foreach (var item in list)
{
var umodel = ulist.Where(x => x.Id == item.CreateBy).FirstOrDefault();
item.UserName = umodel.Name;
item.UserIcon = umodel.Photo;
}
}
return list;
}
/// <summary>
/// 获取公司信息实体
/// </summary>
/// <param name="CompanyId"></param>
/// <returns></returns>
public RB_CompanyEnterprise_Extend GetCompanyModule(object CompanyId)
{
var model = companyEnterpriseRepository.GetEntity<RB_CompanyEnterprise_Extend>(CompanyId);
if (model != null && model.CompanyId > 0)
{
model.BrandModel = new RB_BrandEnterpriseApplyFor_Extend();
model.CarrierModel = new RB_CarrierEnterpriseApplyFor_Extend();
if (model.FirstShopType == 1)
{
var brandList = brandEnterpriseApplyForRepository.GetCarrierEnterpriseApplyForRepository(new RB_BrandEnterpriseApplyFor_Extend { TenantId = model.TenantId, MallBaseId = model.MallBaseId, CompanyId = model.CompanyId });
if (brandList != null && brandList.Any())
{
model.BrandModel = brandList.FirstOrDefault();
if (model.BrandModel != null && !string.IsNullOrWhiteSpace(model.BrandModel.CustomerType))
{
model.BrandModel.CustomerTypeInfo = new List<string>();
foreach (var itemCustomerType in model.BrandModel.CustomerType.Split(","))
{
model.BrandModel.CustomerTypeInfo.Add(Common.Plugin.EnumHelper.GetEnumName(itemCustomerType));
}
}
if (!string.IsNullOrWhiteSpace(model.BrandModel.Banner))
{
model.BrandModel.BannerList = JsonConvert.DeserializeObject<List<string>>(model.BrandModel.Banner);
}
else
{
model.BrandModel.BannerList = new List<string>();
}
model.BrandModel.ProjectName = model.BrandModel.ProjectType.GetEnumName();
}
}
else
{
var carrierList = carrierEnterpriseApplyForRepository.GetCarrierEnterpriseList(new RB_CarrierEnterpriseApplyFor_Extend() { TenantId = model.TenantId, MallBaseId = model.MallBaseId, CompanyId = model.CompanyId });
if (carrierList.Any())
{
model.CarrierModel = carrierList.FirstOrDefault();
var metroList = carrierEnterpriseMetroApplyForRepository.GetCarrierMetroList(new RB_CarrierEnterpriseMetroApplyFor_Extend { TenantId = model.TenantId, MallBaseId = model.MallBaseId, CarrierId = model.CarrierModel.ID });
model.CarrierModel.CarrierMetroList = new List<RB_CarrierEnterpriseMetroApplyFor_Extend>();
if (metroList != null && metroList.Any())
{
model.CarrierModel.CarrierMetroList = metroList;
}
if (!string.IsNullOrWhiteSpace(model.CarrierModel.Banner))
{
model.CarrierModel.BannerList = JsonConvert.DeserializeObject<List<string>>(model.CarrierModel.Banner);
}
else
{
model.CarrierModel.BannerList = new List<string>();
}
model.CarrierModel.ProjectName = model.CarrierModel.ProjectType.GetEnumName();
}
}
}
return model;
}
/// <summary>
/// 更新公司信息状态
/// </summary>
/// <param name="CompanyId"></param>
/// <param name="Status"></param>
/// <returns></returns>
public bool RemoveCompanyModule(int CompanyId, int Status)
{
Dictionary<string, object> fileds = new Dictionary<string, object>()
{
{nameof(RB_CompanyEnterprise_Extend.Status),Status },
};
bool flag = companyEnterpriseRepository.Update(fileds, new WhereHelper(nameof(RB_CompanyEnterprise_Extend.CompanyId), CompanyId));
return flag;
}
/// <summary>
/// 获取公司信息实体
/// </summary>
/// <param name="CompanyId"></param>
/// <returns></returns>
public RB_CompanyEnterprise_Extend GetCompanyEntity(object CompanyId)
{
var model = companyEnterpriseRepository.GetEntity<RB_CompanyEnterprise_Extend>(CompanyId);
return model;
}
/// <summary>
/// 更新公司审核状态
/// </summary>
/// <param name="CompanyId"></param>
/// <param name="Status"></param>
/// <param name="remark"></param>
/// <returns></returns>
public string UpdateCompanyStatus(int CompanyId, int Status, string remark)
{
var trans = companyEnterpriseRepository.DbTransaction;
try
{
Dictionary<string, object> fileds = new Dictionary<string, object>()
{
{nameof(RB_CompanyEnterprise_Extend.CompanyStatus),Status },
};
if (Status == 2)
{
fileds.Add(nameof(RB_CompanyEnterprise_Extend.RejectRemark), remark);
}
List<WhereHelper> wheres = new List<WhereHelper>() {
new WhereHelper(){
FiledName=nameof(RB_CompanyEnterprise_Extend.CompanyId),
FiledValue=CompanyId,
OperatorEnum=OperatorEnum.Equal
}
};
bool flag = companyEnterpriseRepository.Update(fileds, wheres, trans);
if (flag)
{
//新增 更新品牌 载体信息
if (Status == 1)
{
var cmodel = companyEnterpriseRepository.GetEntity(CompanyId);
if (cmodel.FirstShopType == 1)
{
//品牌
var brandList = brandEnterpriseApplyForRepository.GetCarrierEnterpriseApplyForRepository(new RB_BrandEnterpriseApplyFor_Extend { MallBaseId = cmodel.MallBaseId, CompanyId = cmodel.CompanyId });
if (brandList != null && brandList.Any())
{
var BrandModel = brandList.FirstOrDefault();
if (BrandModel.ExistBrandId > 0)
{
//修改
#region 验证品牌是否已关联用户
//var bmodel = brand2Repository.GetEntity(BrandModel.ExistBrandId);
//if (bmodel.UserId > 0)
//{ //{
// return false; // companyEnterpriseRepository.DBSession.Rollback();
// return "该品牌已被其他用户认证，请核实后再试";
//} //}
#endregion #endregion
int Id = carrierEnterpriseApplyForRepository.Insert(model); Dictionary<string, object> filedsBrand = new Dictionary<string, object>()
if (Id > 0)
{ {
model.CarrierMetroList.ForEach(x => { nameof(RB_Brand_Enterprise_Extend.BrandName),BrandModel.BrandName},
{ nameof(RB_Brand_Enterprise_Extend.FullBrandName),BrandModel.FullBrandName},
{ nameof(RB_Brand_Enterprise_Extend.VideoUrl),BrandModel.VideoUrl},
{ nameof(RB_Brand_Enterprise_Extend.Logo),BrandModel.Logo},
{ nameof(RB_Brand_Enterprise_Extend.Banner),BrandModel.Banner},
{ nameof(RB_Brand_Enterprise_Extend.ShopNum),BrandModel.ShopNum},
{ nameof(RB_Brand_Enterprise_Extend.BuiltUpArea),BrandModel.BuiltUpArea},
{ nameof(RB_Brand_Enterprise_Extend.EndBuiltUpArea),BrandModel.EndBuiltUpArea},
{ nameof(RB_Brand_Enterprise_Extend.BrandType),BrandModel.BrandType},
{ nameof(RB_Brand_Enterprise_Extend.CustomerType),BrandModel.CustomerType},
{ nameof(RB_Brand_Enterprise_Extend.AreaRequirement),BrandModel.AreaRequirement},
{ nameof(RB_Brand_Enterprise_Extend.EndAreaRequirement),BrandModel.EndAreaRequirement},
{ nameof(RB_Brand_Enterprise_Extend.CategoryId),BrandModel.BrandClassId},
{ nameof(RB_Brand_Enterprise_Extend.BrandEnterpriseType),BrandModel.BrandEnterpriseType},
{ nameof(RB_Brand_Enterprise_Extend.Introduce),BrandModel.Introduce},
{ nameof(RB_Brand_Enterprise_Extend.DevIntention),BrandModel.DevIntention},
{ nameof(RB_Brand_Enterprise_Extend.PropertyDemand),BrandModel.PropertyDemand},
{ nameof(RB_Brand_Enterprise_Extend.Cooperation),BrandModel.Cooperation},
{ nameof(RB_Brand_Enterprise_Extend.Complementary),BrandModel.Complementary},
};
brand_EnterpriseRepository.Update(filedsBrand, new WhereHelper(nameof(RB_Brand_Enterprise_Extend.ID), BrandModel.ExistBrandId), trans);
}
else
{
//新增
#region 再次验证品牌名称
//if (ValidateBrandName(BrandModel.BrandName, cmodel.MallBaseId))
//{
// companyEnterpriseRepository.DBSession.Rollback();
// return "该品牌名称已存在,请确认品牌名称后再次审核";
//}
//if (ValidateFullBrandName(BrandModel.FullBrandName, cmodel.MallBaseId))
//{
// companyEnterpriseRepository.DBSession.Rollback();
// return "该品牌全名已存在,请确认品牌全名后再次审核";
//}
#endregion
#region 新增品牌
var inserBModel = BrandModel.RefMapperTo<RB_Brand_Enterprise_Extend>();
inserBModel.ID = 0;
inserBModel.UserId = cmodel.CreateBy;
brand_EnterpriseRepository.Insert(inserBModel, trans);
#endregion
}
}
}
else
{
//载体
var carrierList = carrierEnterpriseApplyForRepository.GetCarrierEnterpriseList(new RB_CarrierEnterpriseApplyFor_Extend() { MallBaseId = cmodel.MallBaseId, CompanyId = cmodel.CompanyId });
if (carrierList != null && carrierList.Any())
{
var CarrierModel = carrierList.FirstOrDefault();
var MetroList = carrierEnterpriseMetroApplyForRepository.GetCarrierMetroList(new RB_CarrierEnterpriseMetroApplyFor_Extend { MallBaseId = cmodel.MallBaseId, CarrierId = CarrierModel.ID });
if (CarrierModel.ExistCarrierId > 0)
{
//修改
#region 验证品牌是否已关联用户
var carrmodel = building_CarrierRepository.GetEntity(CarrierModel.ExistCarrierId);
//if (carrmodel.UserId > 0)
//{
// companyEnterpriseRepository.DBSession.Rollback();
// return "该载体已被其他用户认证，请核实后再试";
//}
#endregion
#region 修改载体
int FirstStoreTest = 0;
if (!string.IsNullOrWhiteSpace(CarrierModel.StartingInfo))
{
FirstStoreTest = 1;
}
int OpeningStatus = 0;
if (CarrierModel.OpenTime.HasValue)
{
if (CarrierModel.OpenTime.Value <= System.DateTime.Now)
{
OpeningStatus = 1;
}
}
Dictionary<string, object> filedsCarrier = new Dictionary<string, object>()
{
{nameof(RB_Building_Carrier_Extend.CarrierName),CarrierModel.CarrierName },
{nameof(RB_Building_Carrier_Extend.Logo),CarrierModel.Logo },
{nameof(RB_Building_Carrier_Extend.Banner),CarrierModel.Banner },
{nameof(RB_Building_Carrier_Extend.Honor),CarrierModel.Honor },
{nameof(RB_Building_Carrier_Extend.Developers),CarrierModel.Developers },
{nameof(RB_Building_Carrier_Extend.OpeningStatus),OpeningStatus },
{nameof(RB_Building_Carrier_Extend.VideoUrl),CarrierModel.VideoUrl },
{nameof(RB_Building_Carrier_Extend.Address),CarrierModel.Address },
{nameof(RB_Building_Carrier_Extend.LatAndLon),CarrierModel.LatAndLon },
{nameof(RB_Building_Carrier_Extend.OpenTime),CarrierModel.OpenTime },
{nameof(RB_Building_Carrier_Extend.BuildingCarrierType),CarrierModel.BuildingCarrierType },
{nameof(RB_Building_Carrier_Extend.CategoryId),CarrierModel.CategoryId },
{nameof(RB_Building_Carrier_Extend.Ascription),CarrierModel.Ascription },
{nameof(RB_Building_Carrier_Extend.CarrierSize),CarrierModel.CarrierSize },
{nameof(RB_Building_Carrier_Extend.PropertyComposition),CarrierModel.PropertyComposition },
{nameof(RB_Building_Carrier_Extend.Location),CarrierModel.Location },
{nameof(RB_Building_Carrier_Extend.Crowd),CarrierModel.Crowd },
{nameof(RB_Building_Carrier_Extend.VisitorsFlowrate),CarrierModel.VisitorsFlowrate },
{nameof(RB_Building_Carrier_Extend.LayersNum),CarrierModel.LayersNum },
{nameof(RB_Building_Carrier_Extend.SupportingFacilities),CarrierModel.SupportingFacilities },
{nameof(RB_Building_Carrier_Extend.ManagementCompany),CarrierModel.ManagementCompany },
{nameof(RB_Building_Carrier_Extend.BrandDemand),CarrierModel.BrandDemand },
{nameof(RB_Building_Carrier_Extend.UpdateBy),CarrierModel.UpdateBy },
{nameof(RB_Building_Carrier_Extend.UpdateDate),CarrierModel.UpdateDate },
};
flag = building_CarrierRepository.Update(filedsCarrier, new WhereHelper(nameof(RB_Building_Carrier_Extend.ID), carrmodel.ID), trans);
if (flag)
{
var oldCarrierMetroList = carrierEnterpriseMetroApplyForRepository.GetCarrierMetroList(new RB_CarrierEnterpriseMetroApplyFor_Extend { MallBaseId = CarrierModel.MallBaseId, CarrierId = carrmodel.ID });
carrierEnterpriseMetroApplyForRepository.DeleteBatch(oldCarrierMetroList);
var mlist = MetroList.RefMapperToList<RB_CarrierEnterpriseMetroApplyFor_Extend>();
mlist.ForEach(x =>
{ {
x.ID = 0; x.ID = 0;
x.CarrierId = Id; x.CarrierId = carrmodel.ID;
x.Status = 0; x.Status = 0;
x.TenantId = model.TenantId; x.TenantId = CarrierModel.TenantId;
x.MallBaseId = model.MallBaseId; x.MallBaseId = CarrierModel.MallBaseId;
}); });
carrierEnterpriseMetroApplyForRepository.InsertBatch(model.CarrierMetroList); carrierEnterpriseMetroApplyForRepository.InsertBatch(mlist);
//更新认证表 资料状态为完成
//Dictionary<string, object> keyValues = new Dictionary<string, object>() {
// { nameof(RB_Company_Extend.IsComplete),1}
//};
//List<WhereHelper> wheres = new List<WhereHelper>() {
// new WhereHelper(){
// FiledName=nameof(RB_Company_Extend.CompanyId),
// FiledValue= model.CompanyId,
// OperatorEnum=OperatorEnum.Equal
// }
//};
// companyRepository.Update(keyValues, wheres);
} }
flag = Id > 0; #endregion
} }
if (flag) else
{ {
//if (Config.IsFirtsShopAutoExamine == "1")//自动审核 //新增
#region 再次验证载体名称
//if (ValidateCarrierName(CarrierModel.CarrierName, CarrierModel.MallBaseId))
//{ //{
//// Dictionary<string, object> fileds = new Dictionary<string, object>() // return "该载体名称已存在,请确认载体名称后再次审核";
//// {
//// {nameof(RB_Company_Extend.CompanyStatus),1 },
//// };
//// List<WhereHelper> wheres = new List<WhereHelper>() {
//// new WhereHelper(){
//// FiledName=nameof(RB_Company_Extend.CompanyId),
//// FiledValue= model.CompanyId,
//// OperatorEnum=OperatorEnum.Equal
//// }
////};
//// companyRepository.Update(fileds, wheres);
// //载体
// var carrierList = carrierEnterpriseApplyForRepository.GetCarrierEnterpriseList(new RB_CarrierEnterpriseApplyFor_Extend() { MallBaseId = model.MallBaseId, CompanyId = model.CompanyId });
// if (carrierList != null && carrierList.Any())
// {
// var CarrierModel = carrierList.FirstOrDefault();
// var MetroList = carrierEnterpriseMetroApplyForRepository.GetCarrierMetroList(new RB_CarrierEnterpriseMetroApplyFor_Extend { MallBaseId = model.MallBaseId, CarrierId = CarrierModel.ID });
// if (CarrierModel.ExistCarrierId > 0)
// {
// var carrmodel = carrierRepository.GetEntity(CarrierModel.ExistCarrierId);
// #region 修改载体
// int FirstStoreTest = 0;
// if (!string.IsNullOrWhiteSpace(CarrierModel.StartingInfo))
// {
// FirstStoreTest = 1;
// }
// int OpeningStatus = 0;
// if (CarrierModel.OpenTime.HasValue)
// {
// if (CarrierModel.OpenTime.Value <= System.DateTime.Now)
// {
// OpeningStatus = 1;
// }
// }
// Dictionary<string, object> filedsCarrier = new Dictionary<string, object>()
// {
// {nameof(RB_Carrier_Extend.Logo),CarrierModel.Logo },
// {nameof(RB_Carrier_Extend.Banner),CarrierModel.Banner },
// {nameof(RB_Carrier_Extend.VideoUrl),CarrierModel.VideoUrl },
// {nameof(RB_Carrier_Extend.Address),CarrierModel.Address },
// {nameof(RB_Carrier_Extend.LatAndLon),CarrierModel.LatAndLon },
// {nameof(RB_Carrier_Extend.Developers),CarrierModel.Developers },
// {nameof(RB_Carrier_Extend.OpenTime),CarrierModel.OpenTime },
// {nameof(RB_Carrier_Extend.CarrierSize),CarrierModel.CarrierSize },
// {nameof(RB_Carrier_Extend.ProjectType),(int)CarrierModel.ProjectType },
// {nameof(RB_Carrier_Extend.LayersNum),CarrierModel.LayersNum },
// {nameof(RB_Carrier_Extend.CarNum),CarrierModel.CarNum },
// {nameof(RB_Carrier_Extend.CarrierPlan),CarrierModel.CarrierPlan },
// {nameof(RB_Carrier_Extend.CarrierTarget),CarrierModel.CarrierTarget },
// {nameof(RB_Carrier_Extend.Location),CarrierModel.Location },
// {nameof(RB_Carrier_Extend.Crowd),CarrierModel.Crowd },
// {nameof(RB_Carrier_Extend.UserId),cmodel.CreateBy },
// {nameof(RB_Carrier_Extend.Discount),CarrierModel.Discount },
// {nameof(RB_Carrier_Extend.Honor),CarrierModel.Honor },
// {nameof(RB_Carrier_Extend.YeJi),CarrierModel.YeJi },
// {nameof(RB_Carrier_Extend.ShopNum),CarrierModel.ShopNum },
// {nameof(RB_Carrier_Extend.AreaRequirement ),CarrierModel.AreaRequirement },
// {nameof(RB_Carrier_Extend.EndAreaRequirement),CarrierModel.EndAreaRequirement },
// {nameof(RB_Carrier_Extend.BuiltUpArea),CarrierModel.BuiltUpArea },
// {nameof(RB_Carrier_Extend.EndBuiltUpArea),CarrierModel.EndBuiltUpArea },
// {nameof(RB_Carrier_Extend.FirstShopNum),CarrierModel.FirstShopNum },
// {nameof(RB_Carrier_Extend.StartingInfo),CarrierModel.StartingInfo },
// {nameof(RB_Carrier_Extend.FirstStoreTest),FirstStoreTest },
// {nameof(RB_Carrier_Extend.OpeningStatus),OpeningStatus }
// };
// flag = carrierRepository.Update(filedsCarrier, new WhereHelper(nameof(RB_Carrier_Extend.ID), carrmodel.ID));
// if (flag)
// {
// var oldCarrierMetroList = carrierMetroRepository.GetCarrierMetroList(new RB_CarrierMetro_Extend { MallBaseId = CarrierModel.MallBaseId, CarrierId = carrmodel.ID });
// carrierMetroRepository.DeleteBatch(oldCarrierMetroList);
// var mlist = MetroList.RefMapperToList<RB_CarrierMetro_Extend>();
// mlist.ForEach(x =>
// {
// x.ID = 0;
// x.CarrierId = carrmodel.ID;
// x.Status = 0;
// x.TenantId = CarrierModel.TenantId;
// x.MallBaseId = CarrierModel.MallBaseId;
// });
// carrierMetroRepository.InsertBatch(mlist);
// }
// #endregion
// }
// else
// {
// #region 新增载体
// var inserCModel = CarrierModel.RefMapperTo<RB_Carrier_Extend>();
// inserCModel.ID = 0;
// inserCModel.UserId = cmodel.CreateBy;
// if (CarrierModel.OpenTime.HasValue)
// {
// if (CarrierModel.OpenTime.Value <= System.DateTime.Now)
// {
// inserCModel.OpeningStatus = 1;
// }
// }
// if (!string.IsNullOrWhiteSpace(CarrierModel.StartingInfo))
// {
// inserCModel.FirstStoreTest = 1;
// }
// int Id = carrierRepository.Insert(inserCModel);
// if (Id > 0)
// {
// var mlist = MetroList.RefMapperToList<RB_CarrierMetro_Extend>();
// mlist.ForEach(x =>
// {
// x.ID = 0;
// x.CarrierId = Id;
// x.Status = 0;
// x.TenantId = CarrierModel.TenantId;
// x.MallBaseId = CarrierModel.MallBaseId;
// });
// carrierMetroRepository.InsertBatch(mlist);
// }
// #endregion
// }
// }
//} //}
#endregion
#region 新增载体
var inserCModel = CarrierModel.RefMapperTo<RB_Building_Carrier_Extend>();
inserCModel.ID = 0;
inserCModel.UserId = cmodel.CreateBy;
if (CarrierModel.OpenTime.HasValue)
{
if (CarrierModel.OpenTime.Value <= System.DateTime.Now)
{
inserCModel.OpeningStatus = 1;
} }
return flag; }
if (!string.IsNullOrWhiteSpace(CarrierModel.StartingInfo))
{
inserCModel.FirstStoreTest = 1;
}
int Id = building_CarrierRepository.Insert(inserCModel, trans);
if (Id > 0)
{
var mlist = MetroList.RefMapperToList<RB_CarrierEnterpriseMetroApplyFor_Extend>();
mlist.ForEach(x =>
{
x.ID = 0;
x.CarrierId = Id;
x.Status = 0;
x.TenantId = CarrierModel.TenantId;
x.MallBaseId = CarrierModel.MallBaseId;
});
carrierEnterpriseMetroApplyForRepository.InsertBatch(mlist, trans);
} }
#endregion #endregion
}
}
}
}
}
companyEnterpriseRepository.DBSession.Commit();
return flag ? "" : "出错了，请联系管理员";
}
catch (Exception ex)
{
LogHelper.Write(ex, "UpdateCompanyStatus");
companyEnterpriseRepository.DBSession.Rollback();
return "出错了，请联系管理员";
}
}
#endregion
#region 访问量统计
/// <summary>
/// 获取访问记录信息
/// </summary>
/// <param name="query"></param>
/// <param name="startTime"></param>
/// <param name="endTime"></param>
/// <returns></returns>
public List<RB_Visit_Log_Extend> GetTopStatisticsList(RB_Visit_Log_Extend query)
{
var list = visit_LogRepository.GetTopStatisticsList(query);
if (list != null && list.Any())
{
string productIds = string.Join(",", list.Select(x => x.ProductID).Distinct());
if (query.ProductType == 1)
{
var productList = building_CarrierRepository.GetBuildingCarrierListRepository(new RB_Building_Carrier_Extend { TenantId = query.TenantId, MallBaseId = query.MallBaseId, SelectIds = productIds, OpeningStatus = -1 });
list.ForEach(x => x.ProductName = productList?.FirstOrDefault(z => z.ID == x.ProductID)?.CarrierName ?? "");
}
else if (query.ProductType == 2) { }
else if (query.ProductType == 3)
{
var productList = brand_EnterpriseRepository.GetBrandEnterpriseListRepository(new RB_Brand_Enterprise_Extend { TenantId = query.TenantId, MallBaseId = query.MallBaseId, SelectIds = productIds });
list.ForEach(x => x.ProductName = productList?.FirstOrDefault(z => z.ID == x.ProductID)?.BrandName ?? "");
}
else if (query.ProductType == 4) { }
} }
return list;
}
#endregion
}
} }
Mall.Module.TradePavilion/WechatStatisticsModule.cs
View file @ ec9738a2
...@@ -33,5 +33,7 @@ namespace Mall.Module.TradePavilion ...@@ -33,5 +33,7 @@ namespace Mall.Module.TradePavilion
{ {
return wechat_StatisticsRepository.GetList(dmodel); return wechat_StatisticsRepository.GetList(dmodel);
} }
} }
} }
Mall.Repository/TradePavilion/RB_BrandEnterpriseApplyForRepository.cs
View file @ ec9738a2
...@@ -67,10 +67,7 @@ namespace Mall.Repository.TradePavilion ...@@ -67,10 +67,7 @@ namespace Mall.Repository.TradePavilion
{ {
builder.AppendFormat(" AND a.{0}={1} ", nameof(RB_BrandEnterpriseApplyFor_Extend.BrandClassId), query.BrandClassId); builder.AppendFormat(" AND a.{0}={1} ", nameof(RB_BrandEnterpriseApplyFor_Extend.BrandClassId), query.BrandClassId);
} }
if (query.ApplyForStatus > -1)
{
builder.AppendFormat(" AND a.{0}={1} ", nameof(RB_BrandEnterpriseApplyFor_Extend.ApplyForStatus), query.ApplyForStatus);
}
if (!string.IsNullOrEmpty(query.StartTime)) if (!string.IsNullOrEmpty(query.StartTime))
{ {
builder.Append($" AND a.{nameof(RB_BrandEnterpriseApplyFor_Extend.CreateDate)} >= '{query.StartTime}'"); builder.Append($" AND a.{nameof(RB_BrandEnterpriseApplyFor_Extend.CreateDate)} >= '{query.StartTime}'");
......
Mall.Repository/TradePavilion/RB_Brand_EnterpriseRepository.cs
View file @ ec9738a2
...@@ -147,6 +147,10 @@ WHERE 1=1 ...@@ -147,6 +147,10 @@ WHERE 1=1
builder.AppendFormat(" AND A.{0} LIKE @BrandName ", nameof(RB_Brand_Enterprise_Extend.BrandName)); builder.AppendFormat(" AND A.{0} LIKE @BrandName ", nameof(RB_Brand_Enterprise_Extend.BrandName));
parameters.Add("@BrandName", "%" + query.BrandName + "%"); parameters.Add("@BrandName", "%" + query.BrandName + "%");
} }
if (!string.IsNullOrEmpty(query.SelectIds))
{
builder.AppendFormat(" AND A.{0} in ({1}) ", nameof(RB_Brand_Enterprise_Extend.ID), query.SelectIds);
}
} }
return Get<RB_Brand_Enterprise_Extend>(builder.ToString(), parameters).ToList(); return Get<RB_Brand_Enterprise_Extend>(builder.ToString(), parameters).ToList();
} }
......
Mall.Repository/TradePavilion/RB_Building_CarrierRepository.cs
View file @ ec9738a2
...@@ -124,6 +124,10 @@ WHERE 1=1 ...@@ -124,6 +124,10 @@ WHERE 1=1
{ {
builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_Building_Carrier_Extend.MallBaseId), query.MallBaseId); builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_Building_Carrier_Extend.MallBaseId), query.MallBaseId);
} }
if (!string.IsNullOrWhiteSpace(query.SelectIds))
{
builder.AppendFormat(" AND A.{0} in ({1}) ", nameof(RB_Building_Carrier_Extend.ID), query.SelectIds);
}
if (query.BuildingCarrierType > 0) if (query.BuildingCarrierType > 0)
{ {
builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_Building_Carrier_Extend.BuildingCarrierType), query.BuildingCarrierType); builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_Building_Carrier_Extend.BuildingCarrierType), query.BuildingCarrierType);
......
Mall.Repository/TradePavilion/RB_CompanyEnterpriseRepository.cs 0 → 100644
View file @ ec9738a2
using Mall.Common.Enum;
using Mall.Model.Entity.TradePavilion;
using Mall.Model.Extend.TradePavilion;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using VT.FW.DB.Dapper;
namespace Mall.Repository.TradePavilion
{
/// <summary>
/// 公司信息仓储层
/// </summary>
public class RB_CompanyEnterpriseRepository : BaseRepository<RB_CompanyEnterprise>
{
/// <summary>
/// 获取公司信息分页列表
/// </summary>
/// <param name="pageIndex"></param>
/// <param name="pageSize"></param>
/// <param name="rowsCount"></param>
/// <param name="query"></param>
/// <returns></returns>
public List<RB_CompanyEnterprise_Extend> GetCompanyPageListRepository(int pageIndex, int pageSize, out long rowsCount, RB_CompanyEnterprise_Extend query)
{
rowsCount = 0;
DynamicParameters parameters = new DynamicParameters();
StringBuilder builder = new StringBuilder();
builder.AppendFormat(@"
SELECT *
FROM RB_CompanyEnterprise
WHERE 1=1
");
builder.AppendFormat(" AND {0}={1} ", nameof(RB_CompanyEnterprise_Extend.Status), (int)DateStateEnum.Normal);
if (query == null)
{
return new List<RB_CompanyEnterprise_Extend>();
}
else
{
if (query.TenantId > 0)
{
builder.AppendFormat(" AND {0}={1} ", nameof(RB_CompanyEnterprise_Extend.TenantId), query.TenantId);
}
if (query.MallBaseId > 0)
{
builder.AppendFormat(" AND {0}={1} ", nameof(RB_CompanyEnterprise_Extend.MallBaseId), query.MallBaseId);
}
if (query.CreateBy > 0)
{
builder.AppendFormat(" AND {0}={1} ", nameof(RB_CompanyEnterprise_Extend.CreateBy), query.CreateBy);
}
if (query.CompanyStatus > -1)
{
builder.AppendFormat(" AND {0}={1} ", nameof(RB_CompanyEnterprise_Extend.CompanyStatus), query.CompanyStatus);
}
if (!string.IsNullOrEmpty(query.CompanyName))
{
builder.AppendFormat(" AND {0} LIKE @Name ", nameof(RB_CompanyEnterprise_Extend.CompanyName));
parameters.Add("Name", "%" + query.CompanyName.Trim() + "%");
}
}
builder.AppendFormat(" order by CompanyId desc ");
return GetPage<RB_CompanyEnterprise_Extend>(pageIndex, pageSize, out rowsCount, builder.ToString(), parameters).ToList();
}
/// <summary>
/// 根据查询条件获取公司信息实体
/// </summary>
/// <param name="query"></param>
/// <returns></returns>
public RB_CompanyEnterprise_Extend GetCompanyRepository(RB_CompanyEnterprise_Extend query)
{
DynamicParameters parameters = new DynamicParameters();
StringBuilder builder = new StringBuilder();
builder.AppendFormat(@"
SELECT *
FROM RB_CompanyEnterprise
WHERE 1=1
");
builder.AppendFormat(" AND {0}={1} ", nameof(RB_CompanyEnterprise_Extend.Status), (int)DateStateEnum.Normal);
if (query == null)
{
return new RB_CompanyEnterprise_Extend();
}
else
{
if (query.TenantId > 0)
{
builder.AppendFormat(" AND {0}={1} ", nameof(RB_CompanyEnterprise_Extend.TenantId), query.TenantId);
}
if (query.MallBaseId > 0)
{
builder.AppendFormat(" AND {0}={1} ", nameof(RB_CompanyEnterprise_Extend.MallBaseId), query.MallBaseId);
}
if (!string.IsNullOrEmpty(query.CompanyName))
{
builder.AppendFormat(" AND {0} LIKE @Name ", nameof(RB_CompanyEnterprise_Extend.CompanyName));
parameters.Add("Name", "%" + query.CompanyName.Trim() + "%");
}
if (query.CreateBy > 0)
{
builder.AppendFormat(" AND {0}={1} ", nameof(RB_CompanyEnterprise_Extend.CreateBy), query.CreateBy);
}
}
return Get<RB_CompanyEnterprise_Extend>(builder.ToString(), parameters).FirstOrDefault();
}
/// <summary>
/// 获取列表
/// </summary>
/// <param name="query"></param>
/// <returns></returns>
public List<RB_CompanyEnterprise_Extend> GetCompanyListRepository(RB_CompanyEnterprise_Extend query)
{
DynamicParameters parameters = new DynamicParameters();
StringBuilder builder = new StringBuilder();
builder.AppendFormat(@"
SELECT *
FROM RB_CompanyEnterprise
WHERE 1=1
");
builder.AppendFormat(" AND {0}={1} ", nameof(RB_CompanyEnterprise_Extend.Status), (int)DateStateEnum.Normal);
if (query == null)
{
return new List<RB_CompanyEnterprise_Extend>();
}
else
{
if (query.TenantId > 0)
{
builder.AppendFormat(" AND {0}={1} ", nameof(RB_CompanyEnterprise_Extend.TenantId), query.TenantId);
}
if (query.MallBaseId > 0)
{
builder.AppendFormat(" AND {0}={1} ", nameof(RB_CompanyEnterprise_Extend.MallBaseId), query.MallBaseId);
}
if (!string.IsNullOrEmpty(query.CompanyName))
{
builder.AppendFormat(" AND {0} LIKE @Name ", nameof(RB_CompanyEnterprise_Extend.CompanyName));
parameters.Add("Name", "%" + query.CompanyName.Trim() + "%");
}
if (query.CreateBy > 0)
{
builder.AppendFormat(" AND {0}={1} ", nameof(RB_CompanyEnterprise_Extend.CreateBy), query.CreateBy);
}
if (!string.IsNullOrEmpty(query.UserIds))
{
builder.AppendFormat(" AND {0} in({1}) ", nameof(RB_CompanyEnterprise_Extend.CreateBy), query.UserIds);
}
}
return Get<RB_CompanyEnterprise_Extend>(builder.ToString(), parameters).ToList();
}
}
}
Mall.Repository/TradePavilion/RB_Visit_LogRepository.cs
View file @ ec9738a2
...@@ -52,6 +52,49 @@ namespace Mall.Repository.TradePavilion ...@@ -52,6 +52,49 @@ namespace Mall.Repository.TradePavilion
return Get<RB_Visit_Log>(builder.ToString()).ToList(); return Get<RB_Visit_Log>(builder.ToString()).ToList();
} }
/// <summary>
/// 获取访问记录信息
/// </summary>
/// <param name="query"></param>
/// <param name="startTime"></param>
/// <param name="endTime"></param>
/// <returns></returns>
public List<RB_Visit_Log_Extend> GetTopStatisticsList(RB_Visit_Log_Extend query)
{
StringBuilder builder = new StringBuilder();
builder.Append($" SELECT * from ( SELECT ProductType,ProductID,Count(ID) as TotalNum FROM {TableName} WHERE 1=1");
if (query != null)
{
if (query.TenantId > 0)
{
builder.Append($" AND {nameof(RB_Visit_Log_Extend.TenantId)}={query.TenantId}");
}
if (query.MallBaseId > 0)
{
builder.Append($" AND {nameof(RB_Visit_Log_Extend.MallBaseId)}={query.MallBaseId}");
}
if (query.ProductType > 0)
{
builder.Append($" AND {nameof(RB_Visit_Log_Extend.ProductType)}={query.ProductType}");
}
if (!string.IsNullOrWhiteSpace(query.startDate))
{
builder.Append($" and DATE_FORMAT({nameof(RB_Visit_Log_Extend.CreateDate)},'%Y-%m-%d' )>=DATE_FORMAT('{query.startDate}','%Y-%m-%d' ) ");
}
if (!string.IsNullOrWhiteSpace(query.endDate))
{
builder.Append($" and DATE_FORMAT({nameof(RB_Visit_Log_Extend.CreateDate)},'%Y-%m-%d' )<= DATE_FORMAT('{query.endDate}','%Y-%m-%d' ) ");
}
}
builder.Append($" GROUP BY ProductType,ProductID ) as t ORDER BY t.TotalNum desc ");
if (query.SelectTopNum>0)
{
builder.Append($" LIMIT {query.SelectTopNum} ");
}
return Get<RB_Visit_Log_Extend>(builder.ToString()).ToList();
}
/// <summary> /// <summary>
/// 新增访问记录 /// 新增访问记录
/// </summary> /// </summary>
......
Mall.WebApi/Controllers/TradePavilion/AppletTradeController.cs
View file @ ec9738a2
...@@ -3049,15 +3049,11 @@ namespace Mall.WebApi.Controllers.TradePavilion ...@@ -3049,15 +3049,11 @@ namespace Mall.WebApi.Controllers.TradePavilion
{ {
var userInfo = AppletUserInfo; var userInfo = AppletUserInfo;
RB_BrandEnterpriseApplyFor_Extend query = JsonConvert.DeserializeObject<RB_BrandEnterpriseApplyFor_Extend>(RequestParm.msg.ToString()); RB_BrandEnterpriseApplyFor_Extend query = JsonConvert.DeserializeObject<RB_BrandEnterpriseApplyFor_Extend>(RequestParm.msg.ToString());
//if (query.CompanyId <= 0) if (query.CompanyId <= 0)
//{
// return ApiResult.ParamIsNull("请传递认证id");
//}
string tipsName = "品牌";
if (query.BrandEnterpriseType == 2)
{ {
tipsName = "企业"; return ApiResult.ParamIsNull("请传递认证id");
} }
string tipsName = "品牌";
if (string.IsNullOrWhiteSpace(query.BrandName)) if (string.IsNullOrWhiteSpace(query.BrandName))
{ {
return ApiResult.Failed("请输入" + tipsName + "名称"); return ApiResult.Failed("请输入" + tipsName + "名称");
...@@ -3300,6 +3296,202 @@ namespace Mall.WebApi.Controllers.TradePavilion ...@@ -3300,6 +3296,202 @@ namespace Mall.WebApi.Controllers.TradePavilion
#endregion #endregion
#region 公司信息(管理端)
/// <summary>
/// 新增修改公司信息
/// </summary>
/// <returns></returns>
[HttpPost]
public ApiResult SetCompanyEnterprise()
{
JObject parms = JObject.Parse(RequestParm.msg.ToString());
var extModel = new RB_CompanyEnterprise_Extend()
{
CompanyId = parms.GetInt("CompanyId"),
CompanyName = parms.GetStringValue("CompanyName"),
BusinessLicense = parms.GetStringValue("BusinessLicense"),
Mobile = parms.GetStringValue("Mobile"),
UnifiedCode = parms.GetStringValue("UnifiedCode"),
LegalPerson = parms.GetStringValue("LegalPerson"),
FirstShopType = parms.GetInt("FirstShopType", 0)
};
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("请输入联系电话");
}
if (extModel.FirstShopType <= 0)
{
return ApiResult.Failed("请选择身份类型");
}
var userInfo = AppletUserInfo;
extModel.Status = Common.Enum.DateStateEnum.Normal;
extModel.MallBaseId = userInfo.MallBaseId;
extModel.TenantId = userInfo.TenantId;
Int32.TryParse(userInfo.UserId.ToString(), out int Uid);
extModel.CreateBy = Uid;
extModel.CreateDate = DateTime.Now;
extModel.UpdateBy = Uid;
extModel.UpdateDate = DateTime.Now;
extModel.CompanyStatus = 0;
int ID = buildingCarrierModule.SetCompanyModule(extModel);
if (ID > 0)
{
//获取订阅消息
var miniModel = programModule.GetMiniProgramModule(new Model.Extend.User.RB_MiniProgram_Extend { TenantId = userInfo.TenantId, MallBaseId = userInfo.MallBaseId });
List<string> template_message_list = new List<string>();
if (miniModel != null)
{
if (!string.IsNullOrWhiteSpace(miniModel.HatchExamineTpl))
{
template_message_list.Add(miniModel.HatchExamineTpl);
}
}
return ApiResult.Success("", new { CompanyId = ID, template_message_list });
}
return ApiResult.Failed();
}
/// <summary>
/// 获取当前用户的公司信息实体
/// </summary>
/// <returns></returns>
[HttpPost]
public ApiResult GetUserCompanyEnterprise()
{
var userInfo = AppletUserInfo;
var model = buildingCarrierModule.GetCompanyByUserIdModule(userInfo.UserId);
return ApiResult.Success(data: model);
}
/// <summary>
/// 获取认证状态
/// </summary>
/// <returns></returns>
[HttpPost]
public ApiResult GetCommpanyEnterpriseStatus()
{
var userInfo = AppletUserInfo;
var model = buildingCarrierModule.GetCommpanyStatus(userInfo.UserId);
return ApiResult.Success(data: model);
}
/// <summary>
/// 获取公司信息分页列表
/// </summary>
/// <returns></returns>
public ApiResult GetAdminCompanyEnterprisePageList()
{
var userInfo = AppletUserInfo;
ResultPageModel pageModel = JsonConvert.DeserializeObject<ResultPageModel>(RequestParm.msg.ToString());
JObject parms = JObject.Parse(RequestParm.msg.ToString());
var query = new RB_CompanyEnterprise_Extend()
{
CompanyName = parms.GetStringValue("CompanyName"),
CompanyStatus = parms.GetInt("CompanyStatus", -1),
IsComplete = 1//需是 已完善了资料的
};
query.MallBaseId = userInfo.MallBaseId;
query.TenantId = userInfo.TenantId;
var list = buildingCarrierModule.GetCompanyEnterprisePageListModule(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>
public ApiResult GetAdminCompanyEnterprise()
{
JObject parms = JObject.Parse(RequestParm.msg.ToString());
var CompanyId = parms.GetInt("CompanyId", 0);
var extModel = buildingCarrierModule.GetCompanyModule(CompanyId);
return ApiResult.Success(data: extModel);
}
/// <summary>
/// 审核公司信息
/// </summary>
/// <returns></returns>
public ApiResult UpdateAdminCompanyEnterpriseStatus()
{
var userInfo = AppletUserInfo;
JObject parms = JObject.Parse(RequestParm.msg.ToString());
var CompanyId = parms.GetInt("CompanyId", 0);
var Status = parms.GetInt("CompanyStatus", 0);
var Remark = parms.GetStringValue("Remark");//不通过备注
var model = buildingCarrierModule.GetCompanyEntity(CompanyId);
if (model == null || model.CompanyId <= 0)
{
return ApiResult.Failed("公司信息不存在");
}
if (Status != 1 && Status != 2)
{
return ApiResult.Failed("状态有误");
}
if (Status == 2 && string.IsNullOrEmpty(Remark))
{
return ApiResult.ParamIsNull("请输入不通过的原因");
}
if (model.CompanyStatus == 1)
{
return ApiResult.Failed("公司信息已审核通过，请勿重复审核");
}
#region 验证登录用户具有审核权限
var adminModel = userModule.GetMemberUserInfo(userInfo.UserId);
if (adminModel == null) { return ApiResult.Failed("无权限审核"); }
if (adminModel.IsAdmin != 1)
{
return ApiResult.Failed("不是管理员，无法操作");
}
#endregion
var msg = companyModule.UpdateCompanyStatus(CompanyId, Status, Remark);
if (msg == "" && Status > 0)//推送审核结果
{
//查询用户的信息
var umodel = userModule.GetMemberUserInfo(model.CreateBy);
if (umodel != null && !string.IsNullOrWhiteSpace(umodel.OpenId))
{
DateTime dt1 = DateTime.Now;
List<string> openidList = new List<string>
{
umodel.OpenId
};
new Module.User.MiniProgramMsgModule().SendHatchExamineMsg(model.TenantId, model.MallBaseId, openidList, Status == 1 ? "认证通过" : "认证失败", "企业认证结果通知", System.DateTime.Now.ToString("yyyy年MM月dd日 HH:mm"));
DateTime dt2 = DateTime.Now;
LogHelper.Write("认证通知耗时：" + (dt2 - dt1).TotalSeconds);
}
}
return msg == "" ? ApiResult.Success() : ApiResult.Failed(msg);
}
#endregion
#endregion #endregion
} }
} }
Mall.WebApi/Controllers/TradePavilion/TradeController.cs
View file @ ec9738a2
...@@ -30,6 +30,7 @@ using Microsoft.Extensions.Options; ...@@ -30,6 +30,7 @@ using Microsoft.Extensions.Options;
using Newtonsoft.Json; using Newtonsoft.Json;
using Newtonsoft.Json.Linq; using Newtonsoft.Json.Linq;
using NPOI.SS.Formula.Functions; using NPOI.SS.Formula.Functions;
using Senparc.Weixin.MP.AdvancedAPIs.Wxa.MerchantJson;
using SharpCompress.Common; using SharpCompress.Common;
using static Google.Protobuf.WellKnownTypes.Field; using static Google.Protobuf.WellKnownTypes.Field;
...@@ -3676,6 +3677,8 @@ namespace Mall.WebApi.Controllers.TradePavilion ...@@ -3676,6 +3677,8 @@ namespace Mall.WebApi.Controllers.TradePavilion
return ApiResult.Success(data: extModel); return ApiResult.Success(data: extModel);
} }
#region 【商载通】
/// <summary> /// <summary>
/// 获取【商载通】载体、楼宇下载枚举列表 /// 获取【商载通】载体、楼宇下载枚举列表
/// </summary> /// </summary>
...@@ -4340,5 +4343,262 @@ namespace Mall.WebApi.Controllers.TradePavilion ...@@ -4340,5 +4343,262 @@ namespace Mall.WebApi.Controllers.TradePavilion
LogHelper.Write(ex, string.Format("GetBrandEnterpriseListToExcel_Request: {0}", JsonHelper.Serialize(demodel))); LogHelper.Write(ex, string.Format("GetBrandEnterpriseListToExcel_Request: {0}", JsonHelper.Serialize(demodel)));
} }
} }
#region 载体/楼宇 、品牌/企业 入住
/// <summary>
/// 获取品牌、企业申请分页列表
/// </summary>
/// <returns></returns>
[HttpPost]
public ApiResult GetBuildingCarrierApplyForPage()
{
JObject parms = JObject.Parse(RequestParm.msg.ToString());
ResultPageModel pageModel = new ResultPageModel()
{
pageIndex = parms.GetInt("pageIndex"),
pageSize = parms.GetInt("pageSize"),
};
RB_BrandEnterpriseApplyFor_Extend query = new RB_BrandEnterpriseApplyFor_Extend()
{
BrandClassId = parms.GetInt("BrandClassId", 0),
BrandEnterpriseType = parms.GetInt("BrandEnterpriseType", 1),
MallBaseId = RequestParm.MallBaseId,
TenantId = RequestParm.TenantId,
BrandName = parms.GetStringValue("BrandName"),
};
List<object> list = new List<object>();
var dataList = buildingCarrierModule.GetBrandEnterpriseApplyForPageList(pageModel.pageIndex, pageModel.pageSize, out long rowsCount, query);
foreach (var item in dataList)
{
List<string> BannerList = new List<string>();
if (!string.IsNullOrWhiteSpace(item.Banner))
{
try
{
BannerList = Common.Plugin.JsonHelper.DeserializeObject<List<string>>(item.Banner);
}
catch
{
}
}
list.Add(new
{
ID = item?.ID ?? 0,
BrandName = item?.BrandName ?? "",
FullBrandName = item?.FullBrandName ?? "",
VideoUrl = item?.VideoUrl ?? "",
Logo = item?.Logo ?? "",
ShopNum = item?.ShopNum ?? 0,
BuiltUpArea = item?.BuiltUpArea ?? 0,
EndBuiltUpArea = item?.EndBuiltUpArea ?? 0,
BrandType = item?.BrandType ?? "",
CustomerType = item?.CustomerType ?? "",
AreaRequirement = item?.AreaRequirement ?? 0,
EndAreaRequirement = item?.EndAreaRequirement ?? 0,
CategoryId = item?.BrandClassId ?? 0,
CategoryName = item?.ClassName ?? "",
BrandEnterpriseType = item?.BrandEnterpriseType ?? 0,
Introduce = item?.Introduce ?? "",
DevIntention = item?.DevIntention ?? "",
PropertyDemand = item?.PropertyDemand ?? "",
Cooperation = item?.Cooperation ?? "",
Complementary = item?.Complementary ?? "",
BannerList,
});
}
pageModel.count = Convert.ToInt32(rowsCount);
pageModel.pageData = list;
return ApiResult.Success(data: pageModel);
}
/// <summary>
/// 根据编号获取品牌、企业申请详情
/// </summary>
/// <returns></returns>
public ApiResult GetBBuildingCarrierApplyForInfo()
{
JObject parms = JObject.Parse(RequestParm.msg.ToString());
int Id = parms.GetInt("ID");
if (Id <= 0)
{
return ApiResult.ParamIsNull(message: "编号不能为空!");
}
List<string> BannerList = new List<string>();
var extModel = buildingCarrierModule.GetCarrierEnterpriseApplyForModule(new RB_BrandEnterpriseApplyFor_Extend { ID = Id, MallBaseId = RequestParm.MallBaseId, TenantId = RequestParm.TenantId })?.FirstOrDefault() ?? new RB_BrandEnterpriseApplyFor_Extend();
string Banner = extModel?.Banner ?? "";
if (!string.IsNullOrEmpty(Banner))
{
try
{
BannerList = Common.Plugin.JsonHelper.DeserializeObject<List<string>>(Banner);
}
catch
{
}
}
var dataObj = new
{
ID = extModel?.ID ?? 0,
BrandName = extModel?.BrandName ?? "",
FullBrandName = extModel?.FullBrandName ?? "",
VideoUrl = extModel?.VideoUrl ?? "",
Logo = extModel?.Logo ?? "",
ShopNum = extModel?.ShopNum ?? 0,
BuiltUpArea = extModel?.BuiltUpArea ?? 0,
EndBuiltUpArea = extModel?.EndBuiltUpArea ?? 0,
BrandType = extModel?.BrandType ?? "",
CustomerType = extModel?.CustomerType ?? "",
AreaRequirement = extModel?.AreaRequirement ?? 0,
EndAreaRequirement = extModel?.EndAreaRequirement ?? 0,
CategoryId = extModel?.BrandClassId ?? 0,
CategoryName = extModel?.ClassName ?? "",
BrandEnterpriseType = extModel?.BrandEnterpriseType ?? 0,
Introduce = extModel?.Introduce ?? "",
DevIntention = extModel?.DevIntention ?? "",
PropertyDemand = extModel?.PropertyDemand ?? "",
Cooperation = extModel?.Cooperation ?? "",
Complementary = extModel?.Complementary ?? "",
BannerList,
};
return ApiResult.Success(data: dataObj);
}
#endregion
#region 【商载通】公司信息管理
/// <summary>
/// 获取公司信息分页列表
/// </summary>
/// <returns></returns>
public ApiResult GetCompanyEnterprisePageList()
{
ResultPageModel pageModel = JsonConvert.DeserializeObject<ResultPageModel>(RequestParm.msg.ToString());
JObject parms = JObject.Parse(RequestParm.msg.ToString());
var query = new RB_CompanyEnterprise_Extend()
{
CompanyName = parms.GetStringValue("CompanyName"),
CompanyStatus = parms.GetInt("CompanyStatus", -1),
CreateBy = parms.GetInt("CreateBy", 0),
IsComplete = 1//需是 已完善了资料的
};
query.MallBaseId = RequestParm.MallBaseId;
query.TenantId = RequestParm.TenantId;
var list = buildingCarrierModule.GetCompanyEnterprisePageListModule(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>
public ApiResult GetCompanyEnterprise()
{
JObject parms = JObject.Parse(RequestParm.msg.ToString());
var CompanyId = parms.GetInt("CompanyId", 0);
var extModel = buildingCarrierModule.GetCompanyModule(CompanyId);
return ApiResult.Success(data: extModel);
}
/// <summary>
/// 删除公司信息
/// </summary>
/// <returns></returns>
public ApiResult RemoveCompanyEnterprise()
{
JObject parms = JObject.Parse(RequestParm.msg.ToString());
var CompanyId = parms.GetInt("CompanyId", 0);
var Status = parms.GetInt("Status", 0);
var flag = buildingCarrierModule.RemoveCompanyModule(CompanyId, Status);
return flag ? ApiResult.Success() : ApiResult.Failed();
}
/// <summary>
/// 审核公司信息
/// </summary>
/// <returns></returns>
public ApiResult UpdateCompanyEnterpriseStatus()
{
JObject parms = JObject.Parse(RequestParm.msg.ToString());
var CompanyId = parms.GetInt("CompanyId", 0);
var Status = parms.GetInt("CompanyStatus", 0);
var Remark = parms.GetStringValue("Remark");//不通过备注
var model = buildingCarrierModule.GetCompanyEntity(CompanyId);
if (model == null || model.CompanyId <= 0)
{
return ApiResult.Failed("公司信息不存在");
}
if (Status != 1 && Status != 2)
{
return ApiResult.Failed("状态有误");
}
if (Status == 2 && string.IsNullOrEmpty(Remark))
{
return ApiResult.ParamIsNull("请输入不通过的原因");
}
if (model.CompanyStatus == 1)
{
return ApiResult.Failed("公司信息已审核通过，请勿重复审核");
}
var msg = buildingCarrierModule.UpdateCompanyStatus(CompanyId, Status, Remark);
if (msg == "" && Status > 0)//推送审核结果
{
//查询用户的信息
var umodel = userModule.GetMemberUserInfo(model.CreateBy);
if (umodel != null && !string.IsNullOrWhiteSpace(umodel.OpenId))
{
DateTime dt1 = DateTime.Now;
List<string> openidList = new List<string>
{
umodel.OpenId
};
new Module.User.MiniProgramMsgModule().SendHatchExamineMsg(model.TenantId, model.MallBaseId, openidList, Status == 1 ? "认证通过" : "认证失败", "企业认证结果通知", System.DateTime.Now.ToString("yyyy年MM月dd日 HH:mm"));
DateTime dt2 = DateTime.Now;
LogHelper.Write("认证通知耗时：" + (dt2 - dt1).TotalSeconds);
}
}
return msg == "" ? ApiResult.Success() : ApiResult.Failed(msg);
}
#endregion
#region 访问量统计
/// <summary>
/// 访问量统计
/// </summary>
/// <returns></returns>
public ApiResult GetTopVisitStatisticsList()
{
JObject parms = JObject.Parse(RequestParm.msg.ToString());
RB_Visit_Log_Extend model = new RB_Visit_Log_Extend();
model.MallBaseId = RequestParm.MallBaseId;
model.TenantId = RequestParm.TenantId;
model.startDate = parms.GetStringValue("StartDate");
model.endDate = parms.GetStringValue("EndDate");
model.SelectTopNum = parms.GetInt("SelectTopNum", 0);
model.ProductType = parms.GetInt("ProductType", 1);
var list = buildingCarrierModule.GetTopStatisticsList(model);
var result = list.Select(x => new
{
x.ProductID,
x.ProductName,
x.TotalNum,
x.ProductType
});
return ApiResult.Success(data: result);
}
#endregion
#endregion
} }
} }
\ No newline at end of file
Mall.WebApi/appsettings.json
View file @ ec9738a2
...@@ -81,6 +81,7 @@ ...@@ -81,6 +81,7 @@
"FileService": "2", "FileService": "2",
"IsNormalServer": 2, "IsNormalServer": 2,
"IsFirtsShopAutoExamine": 1, //首店企业认证是否自动审核，1-是 "IsFirtsShopAutoExamine": 1, //首店企业认证是否自动审核，1-是
"IsCPSWJAutoExamine": 1, //翠屏商务局（商载通）企业认证是否自动审核，1-是
"FinanceSetting": { "FinanceSetting": {
"TenantId": 1, "TenantId": 1,
"MallBaseId": 1, "MallBaseId": 1,
......
Mall.WindowsService/Module/CuiPingModule.cs
View file @ ec9738a2
...@@ -71,7 +71,7 @@ namespace Mall.WindowsService.Module ...@@ -71,7 +71,7 @@ namespace Mall.WindowsService.Module
var miniProgramModel = miniProgramRepository.GetEntity(Convert.ToInt32(item)); var miniProgramModel = miniProgramRepository.GetEntity(Convert.ToInt32(item));
if ((miniProgramModel?.MallBaseId ?? 0) > 0) if ((miniProgramModel?.MallBaseId ?? 0) > 0)
{ {
DateTime dateTime = DateTime.Now.AddDays(-1); DateTime dateTime = DateTime.Now.AddDays(-1);//Convert.ToDateTime("2024-12-09");//
RB_Wechat_Statistics model = new RB_Wechat_Statistics(); RB_Wechat_Statistics model = new RB_Wechat_Statistics();
model.TenantId = miniProgramModel.TenantId ?? 0; model.TenantId = miniProgramModel.TenantId ?? 0;
model.MallBaseId = miniProgramModel.MallBaseId; model.MallBaseId = miniProgramModel.MallBaseId;
......
Mall.WindowsService/Program.cs
View file @ ec9738a2
...@@ -7,9 +7,9 @@ namespace Mall.WindowsService ...@@ -7,9 +7,9 @@ namespace Mall.WindowsService
{ {
static void Main(string[] args) static void Main(string[] args)
{ {
//Module.CuiPingModule.AddWechatStatistics(); Module.CuiPingModule.AddWechatStatistics();
ServiceBase[] services = new ServiceBase[] { new WindowsService() }; // ServiceBase[] services = new ServiceBase[] { new WindowsService() };
ServiceBase.Run(services); // ServiceBase.Run(services);
} }
} }
} }
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