Commit 0b109486 authored by 黄奎's avatar 黄奎

11

parent 66bb5ff7
......@@ -6,7 +6,7 @@ using VT.FW.DB;
namespace Mall.Model.Entity.TradePavilion
{
/// <summary>
/// 楼宇实体类
/// 【商载通】楼宇、载体 实体类
/// </summary>
[Serializable]
[DB(ConnectionName = "DefaultConnection")]
......
using Mall.Common.Enum;
using System;
using VT.FW.DB;
namespace Mall.Model.Entity.TradePavilion
{
/// <summary>
/// 【商载通】 楼宇、载体地铁实体表
/// </summary>
[Serializable]
[DB(ConnectionName = "DefaultConnection")]
public class RB_Building_Carriermetro
{
/// <summary>
/// 编号
/// </summary>
public int ID { get; set; }
/// <summary>
/// 地铁线路
/// </summary>
public string 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; }
}
}
using Mall.Model.Entity.TradePavilion;
using System.Collections.Generic;
namespace Mall.Model.Extend.TradePavilion
{
/// <summary>
/// 楼宇扩展实体类
/// 【商载通】楼宇、载体扩展实体类
/// </summary>
public class RB_Building_Carrier_Extend : RB_Building_Carrier
{
......@@ -21,5 +22,25 @@ namespace Mall.Model.Extend.TradePavilion
/// 开业结束时间
/// </summary>
public string QEndDate { get; set; }
/// <summary>
/// 地铁站名称
/// </summary>
public string MetroName { get; set; }
/// <summary>
/// 地铁线路
/// </summary>
public int MetroNum { get; set; }
/// <summary>
/// 地铁信息
/// </summary>
public List<RB_Building_Carriermetro_Extend> BuildingCarriermetroList { get; set; }
/// <summary>
/// 首店查询类型(1-成都首店,2-宜宾商载通)
/// </summary>
public int QShopType { get; set; }
}
}
using Mall.Model.Entity.TradePavilion;
namespace Mall.Model.Extend.TradePavilion
{
/// <summary>
/// 【商载通】 楼宇、载体地铁 扩展实体表
/// </summary>
public class RB_Building_Carriermetro_Extend:RB_Building_Carriermetro
{
/// <summary>
/// 载体Id【查询使用】
/// </summary>
public string CarrierIds { get; set; }
}
}
using Mall.Common.Enum;
using Mall.Model.Extend.TradePavilion;
using Mall.Repository.TradePavilion;
using System;
using System.Collections.Generic;
using System.Linq;
using VT.FW.DB;
namespace Mall.Module.TradePavilion
{
/// <summary>
/// 载体处理类
/// </summary>
public class BuildingCarrierModule
{
/// <summary>
/// 【商载通】楼宇、载体仓储层
/// </summary>
private readonly RB_Building_CarrierRepository building_CarrierRepository = new RB_Building_CarrierRepository();
/// <summary>
/// 【商载通】楼宇、载体地铁仓储层
/// </summary>
private readonly RB_Building_CarriermetroRepository building_CarriermetroRepository = new RB_Building_CarriermetroRepository();
/// <summary>
/// 获取楼宇分页列表
/// </summary>
/// <param name="pageIndex"></param>
/// <param name="pageSize"></param>
/// <param name="rowsCount"></param>
/// <param name="query"></param>
/// <returns></returns>
public List<RB_Building_Carrier_Extend> GetBuildingCarrierPageModule(int pageIndex, int pageSize, out long rowsCount, RB_Building_Carrier_Extend query)
{
var list= building_CarrierRepository.GetBuildingCarrierPageRepository(pageIndex, pageSize, out rowsCount, query);
if (list != null && list.Count > 0)
{
string Ids = string.Join(",", list.Select(qitem => qitem.ID));
List<RB_Building_Carriermetro_Extend> metroList = new List<RB_Building_Carriermetro_Extend>();
if (!string.IsNullOrEmpty(Ids))
{
metroList= building_CarriermetroRepository.GetBuildingCarrierMetroListRepository(new RB_Building_Carriermetro_Extend() { CarrierIds = Ids });
}
foreach (var item in list)
{
item.BuildingCarriermetroList = metroList.Where(qitem => qitem.CarrierId == item.ID)?.ToList() ?? new List<RB_Building_Carriermetro_Extend>();
}
}
return list;
}
/// <summary>
/// 获取楼宇列表
/// </summary>
/// <param name="query"></param>
/// <returns></returns>
public List<RB_Building_Carrier_Extend> GetBuildingCarrierListModule(RB_Building_Carrier_Extend query)
{
return building_CarrierRepository.GetBuildingCarrierListRepository(query);
}
/// <summary>
/// 新增修改楼宇
/// </summary>
/// <param name="extModel"></param>
/// <returns></returns>
public bool SetBuildingCarrierModule(RB_Building_Carrier_Extend extModel)
{
bool flag = false;
if (extModel.ID > 0)
{
Dictionary<string, object> fileds = new Dictionary<string, object>()
{
{nameof(RB_Building_Carrier_Extend.CarrierName),extModel.CarrierName },
{nameof(RB_Building_Carrier_Extend.Logo),extModel.Logo },
{nameof(RB_Building_Carrier_Extend.Banner),extModel.Banner },
{nameof(RB_Building_Carrier_Extend.Honor),extModel.Honor },
{nameof(RB_Building_Carrier_Extend.Developers),extModel.Developers },
{nameof(RB_Building_Carrier_Extend.OpeningStatus),extModel.OpeningStatus },
{nameof(RB_Building_Carrier_Extend.VideoUrl),extModel.VideoUrl },
{nameof(RB_Building_Carrier_Extend.Address),extModel.Address },
{nameof(RB_Building_Carrier_Extend.LatAndLon),extModel.LatAndLon },
{nameof(RB_Building_Carrier_Extend.OpenTime),extModel.OpenTime },
{nameof(RB_Building_Carrier_Extend.BuildingCarrierType),extModel.BuildingCarrierType },
{nameof(RB_Building_Carrier_Extend.CategoryId),extModel.CategoryId },
{nameof(RB_Building_Carrier_Extend.Ascription),extModel.Ascription },
{nameof(RB_Building_Carrier_Extend.CarrierSize),extModel.CarrierSize },
{nameof(RB_Building_Carrier_Extend.PropertyComposition),extModel.PropertyComposition },
{nameof(RB_Building_Carrier_Extend.Location),extModel.Location },
{nameof(RB_Building_Carrier_Extend.Crowd),extModel.Crowd },
{nameof(RB_Building_Carrier_Extend.VisitorsFlowrate),extModel.VisitorsFlowrate },
{nameof(RB_Building_Carrier_Extend.LayersNum),extModel.LayersNum },
{nameof(RB_Building_Carrier_Extend.SupportingFacilities),extModel.SupportingFacilities },
{nameof(RB_Building_Carrier_Extend.ManagementCompany),extModel.ManagementCompany },
{nameof(RB_Building_Carrier_Extend.BrandDemand),extModel.BrandDemand },
{nameof(RB_Building_Carrier_Extend.UpdateBy),extModel.UpdateBy },
{nameof(RB_Building_Carrier_Extend.UpdateDate),extModel.UpdateDate },
};
flag = building_CarrierRepository.Update(fileds, new WhereHelper(nameof(RB_Building_Carrier_Extend.ID), extModel.ID));
}
else
{
var newId = building_CarrierRepository.Insert(extModel);
extModel.ID = newId;
flag = newId > 0;
}
if (flag)
{
var oldCarrierMetroList = building_CarriermetroRepository.GetBuildingCarrierMetroListRepository(new RB_Building_Carriermetro_Extend { TenantId = extModel.TenantId, MallBaseId = extModel.MallBaseId, CarrierId = extModel.ID });
building_CarriermetroRepository.DeleteBatch(oldCarrierMetroList);
foreach (var item in extModel.BuildingCarriermetroList)
{
item.ID = 0;
item.Status = 0;
item.TenantId = extModel.TenantId;
item.MallBaseId = extModel.MallBaseId;
item.CarrierId = extModel.ID;
}
building_CarriermetroRepository.InsertBatch(extModel.BuildingCarriermetroList);
}
return flag;
}
/// <summary>
/// 删除楼宇
/// </summary>
/// <param name="ID"></param>
/// <returns></returns>
public bool RemoveBuildingCarrierModule(int ID)
{
Dictionary<string, object> fileds = new Dictionary<string, object>()
{
{nameof(RB_Building_Carrier_Extend.Status),(int)DateStateEnum.Delete },
{nameof(RB_Building_Carrier_Extend.UpdateDate),DateTime.Now }
};
bool flag = building_CarrierRepository.Update(fileds, new WhereHelper(nameof(RB_Building_Carrier_Extend.ID), ID));
return flag;
}
/// <summary>
/// 根据编号获取楼宇详情
/// </summary>
/// <param name="ID"></param>
/// <returns></returns>
public RB_Building_Carrier_Extend GetBuildingCarrierModule(int ID)
{
var extModel = building_CarrierRepository.GetEntity<RB_Building_Carrier_Extend>(ID);
if (extModel != null && extModel.ID > 0)
{
var bcMetroList = building_CarriermetroRepository.GetBuildingCarrierMetroListRepository(new RB_Building_Carriermetro_Extend() { CarrierId = extModel.ID });
extModel.BuildingCarriermetroList = bcMetroList ?? new List<RB_Building_Carriermetro_Extend>();
}
return extModel;
}
}
}
......@@ -10,6 +10,7 @@ using Mall.Common.Plugin;
using Mall.Common;
using Mall.Common.Enum;
using VT.FW.DB.Dapper;
using RabbitMQ.Client.Framing.Impl;
namespace Mall.Module.TradePavilion
{
......@@ -72,9 +73,13 @@ namespace Mall.Module.TradePavilion
private readonly RB_PrizeRepository prizeRepository = new RB_PrizeRepository();
/// <summary>
/// 楼宇仓储层
/// 【商载通】楼宇、载体仓储层
/// </summary>
private readonly RB_Building_CarrierRepository buildingRepository = new RB_Building_CarrierRepository();
private readonly RB_Building_CarrierRepository building_CarrierRepository = new RB_Building_CarrierRepository();
/// <summary>
/// 【商载通】楼宇、载体地铁仓储层
/// </summary>
private readonly RB_Building_CarriermetroRepository building_CarriermetroRepository = new RB_Building_CarriermetroRepository();
#region 载体
/// <summary>
......@@ -1298,104 +1303,5 @@ namespace Mall.Module.TradePavilion
return flag;
}
#endregion
/// <summary>
/// 获取楼宇分页列表
/// </summary>
/// <param name="pageIndex"></param>
/// <param name="pageSize"></param>
/// <param name="rowsCount"></param>
/// <param name="query"></param>
/// <returns></returns>
public List<RB_Building_Carrier_Extend> GetBuildingPageModule(int pageIndex, int pageSize, out long rowsCount, RB_Building_Carrier_Extend query)
{
return buildingRepository.GetBuildingPageRepository(pageIndex, pageSize, out rowsCount, query);
}
/// <summary>
/// 获取楼宇列表
/// </summary>
/// <param name="query"></param>
/// <returns></returns>
public List<RB_Building_Carrier_Extend> GetBuildingListModule(RB_Building_Carrier_Extend query)
{
return buildingRepository.GetBuildingListRepository(query);
}
/// <summary>
/// 新增修改楼宇
/// </summary>
/// <param name="extModel"></param>
/// <returns></returns>
public bool SetBuildingCarrierModule(RB_Building_Carrier_Extend extModel)
{
bool flag = false;
if (extModel.ID > 0)
{
Dictionary<string, object> fileds = new Dictionary<string, object>()
{
{nameof(RB_Building_Carrier_Extend.CarrierName),extModel.CarrierName },
{nameof(RB_Building_Carrier_Extend.Logo),extModel.Logo },
{nameof(RB_Building_Carrier_Extend.Banner),extModel.Banner },
{nameof(RB_Building_Carrier_Extend.Honor),extModel.Honor },
{nameof(RB_Building_Carrier_Extend.Developers),extModel.Developers },
{nameof(RB_Building_Carrier_Extend.OpeningStatus),extModel.OpeningStatus },
{nameof(RB_Building_Carrier_Extend.VideoUrl),extModel.VideoUrl },
{nameof(RB_Building_Carrier_Extend.Address),extModel.Address },
{nameof(RB_Building_Carrier_Extend.LatAndLon),extModel.LatAndLon },
{nameof(RB_Building_Carrier_Extend.OpenTime),extModel.OpenTime },
{nameof(RB_Building_Carrier_Extend.BuildingCarrierType),extModel.BuildingCarrierType },
{nameof(RB_Building_Carrier_Extend.CategoryId),extModel.CategoryId },
{nameof(RB_Building_Carrier_Extend.Ascription),extModel.Ascription },
{nameof(RB_Building_Carrier_Extend.CarrierSize),extModel.CarrierSize },
{nameof(RB_Building_Carrier_Extend.PropertyComposition),extModel.PropertyComposition },
{nameof(RB_Building_Carrier_Extend.Location),extModel.Location },
{nameof(RB_Building_Carrier_Extend.Crowd),extModel.Crowd },
{nameof(RB_Building_Carrier_Extend.VisitorsFlowrate),extModel.VisitorsFlowrate },
{nameof(RB_Building_Carrier_Extend.LayersNum),extModel.LayersNum },
{nameof(RB_Building_Carrier_Extend.SupportingFacilities),extModel.SupportingFacilities },
{nameof(RB_Building_Carrier_Extend.ManagementCompany),extModel.ManagementCompany },
{nameof(RB_Building_Carrier_Extend.BrandDemand),extModel.BrandDemand },
{nameof(RB_Building_Carrier_Extend.UpdateBy),extModel.UpdateBy },
{nameof(RB_Building_Carrier_Extend.UpdateDate),extModel.UpdateDate },
};
flag = buildingRepository.Update(fileds, new WhereHelper(nameof(RB_Building_Carrier_Extend.ID), extModel.ID));
}
else
{
var newId = buildingRepository.Insert(extModel);
extModel.ID = newId;
flag = newId > 0;
}
return flag;
}
/// <summary>
/// 删除楼宇
/// </summary>
/// <param name="ID"></param>
/// <returns></returns>
public bool RemoveBuildingModule(int ID)
{
Dictionary<string, object> fileds = new Dictionary<string, object>()
{
{nameof(RB_Building_Carrier_Extend.Status),(int)DateStateEnum.Delete },
{nameof(RB_Building_Carrier_Extend.UpdateDate),DateTime.Now }
};
bool flag = buildingRepository.Update(fileds, new WhereHelper(nameof(RB_Building_Carrier_Extend.ID), ID));
return flag;
}
/// <summary>
/// 根据编号获取楼宇详情
/// </summary>
/// <param name="ID"></param>
/// <returns></returns>
public RB_Building_Carrier_Extend GetBuildingModule(int ID)
{
var extModel = buildingRepository.GetEntity<RB_Building_Carrier_Extend>(ID);
return extModel;
}
}
}
......@@ -9,19 +9,19 @@ using VT.FW.DB.Dapper;
namespace Mall.Repository.TradePavilion
{
/// <summary>
/// 楼宇仓储层
/// 【商载通】 楼宇、载体仓储层
/// </summary>
public class RB_Building_CarrierRepository :BaseRepository<RB_Building_Carrier>
{
/// <summary>
/// 获取楼宇分页列表
/// 【商载通】获取楼宇、载体分页列表
/// </summary>
/// <param name="pageIndex"></param>
/// <param name="pageSize"></param>
/// <param name="rowsCount"></param>
/// <param name="query"></param>
/// <returns></returns>
public List<RB_Building_Carrier_Extend> GetBuildingPageRepository(int pageIndex, int pageSize, out long rowsCount, RB_Building_Carrier_Extend query)
public List<RB_Building_Carrier_Extend> GetBuildingCarrierPageRepository(int pageIndex, int pageSize, out long rowsCount, RB_Building_Carrier_Extend query)
{
DynamicParameters parameters = new DynamicParameters();
StringBuilder builder = new StringBuilder();
......@@ -41,27 +41,70 @@ WHERE 1=1
{
builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_Building_Carrier_Extend.MallBaseId), query.MallBaseId);
}
if (query.BuildingCarrierType > 0)
{
builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_Building_Carrier_Extend.BuildingCarrierType), query.BuildingCarrierType);
}
if (!string.IsNullOrEmpty(query.CarrierName))
{
builder.AppendFormat(" AND A.{0} LIKE @CarrierName ", nameof(RB_Building_Carrier_Extend.CarrierName));
parameters.Add("@CarrierName", "%" + query.CarrierName.Trim() + "%");
}
if (!string.IsNullOrWhiteSpace(query.Developers))
{
builder.AppendFormat(" AND A.{0} LIKE @Developers ", nameof(RB_Building_Carrier_Extend.Developers));
parameters.Add("@Developers", "%" + query.Developers.Trim() + "%");
}
if (query.OpeningStatus > -1)
{
builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_Building_Carrier_Extend.OpeningStatus), query.OpeningStatus);
}
if (query.CategoryId > 0)
{
builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_Building_Carrier_Extend.CategoryId), query.CategoryId);
}
if (!string.IsNullOrEmpty(query.QStartDate))
{
builder.AppendFormat(" AND A.{0}>='{1}' ", nameof(RB_Building_Carrier_Extend.OpenTime), query.QStartDate);
}
if (!string.IsNullOrEmpty(query.QEndDate))
{
builder.AppendFormat(" AND A.{0}<='{1} 23:59:59' ", nameof(RB_Building_Carrier_Extend.OpenTime), query.QEndDate);
}
if (query.MetroNum > 0 || !string.IsNullOrWhiteSpace(query.MetroName))
{
builder.Append($" AND A.{nameof(RB_Building_Carrier_Extend.ID)} IN (SELECT CarrierId FROM RB_Building_Carriermetro WHERE `Status`=0 ");
if (query.MetroNum > 0)
{
builder.Append($" AND {nameof(RB_Building_Carriermetro.MetroNum)} = {query.MetroNum}");
}
if (!string.IsNullOrWhiteSpace(query.MetroName))
{
builder.Append($" AND {nameof(RB_Building_Carriermetro.MetroName)} LIKE @MetroName ");
parameters.Add("@MetroName", "%" + query.MetroName.Trim() + "%");
}
builder.Append(" )");
}
if (query.QShopType == 1)
{
builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_Building_Carrier_Extend.IsChengDu), 1);
}
if (query.QShopType == 2)
{
builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_Building_Carrier_Extend.OpenTime), 0);
}
}
builder.AppendFormat(" ORDER BY A.BuildingId DESC ");
builder.AppendFormat(" ORDER BY A.ID DESC ");
return GetPage<RB_Building_Carrier_Extend>(pageIndex, pageSize, out rowsCount, builder.ToString(), parameters).ToList();
}
/// <summary>
/// 获取楼宇列表
/// 【商载通】获取楼宇、载体列表
/// </summary>
/// <param name="query"></param>
/// <returns></returns>
public List<RB_Building_Carrier_Extend> GetBuildingListRepository(RB_Building_Carrier_Extend query)
public List<RB_Building_Carrier_Extend> GetBuildingCarrierListRepository(RB_Building_Carrier_Extend query)
{
DynamicParameters parameters = new DynamicParameters();
StringBuilder builder = new StringBuilder();
......
using Mall.Model.Entity.TradePavilion;
using Mall.Model.Extend.TradePavilion;
using System.Collections.Generic;
using System.Linq;
using System.Text;
namespace Mall.Repository.TradePavilion
{
/// <summary>
/// 【商载通】 楼宇、载体地铁 仓储层
/// </summary>
public class RB_Building_CarriermetroRepository : BaseRepository<RB_Building_Carriermetro>
{
/// <summary>
/// 【商载通】 楼宇、载体地铁 信息列表
/// </summary>
/// <param name="query">查询条件</param>
/// <returns></returns>
public List<RB_Building_Carriermetro_Extend> GetBuildingCarrierMetroListRepository(RB_Building_Carriermetro_Extend query)
{
StringBuilder builder = new StringBuilder();
builder.Append($" SELECT * FROM RB_Building_Carriermetro WHERE {nameof(RB_Building_Carriermetro_Extend.Status)}=0 ");
if (query != null)
{
if (query.TenantId > 0)
{
builder.Append($" AND {nameof(RB_Building_Carriermetro_Extend.TenantId)}={query.TenantId}");
}
if (query.MallBaseId > 0)
{
builder.Append($" AND {nameof(RB_Building_Carriermetro_Extend.MallBaseId)}={query.MallBaseId}");
}
if (query.CarrierId > 0)
{
builder.Append($" AND {nameof(RB_Building_Carriermetro_Extend.CarrierId)}={query.CarrierId}");
}
if (!string.IsNullOrWhiteSpace(query.MetroNum))
{
builder.Append($" AND {nameof(RB_Building_Carriermetro_Extend.MetroNum)} like '%{query.MetroNum}%'");
}
if (!string.IsNullOrWhiteSpace(query.MetroName))
{
builder.Append($" AND {nameof(RB_Building_Carriermetro_Extend.MetroName)} like '%{query.MetroName}%'");
}
if (!string.IsNullOrWhiteSpace(query.CarrierIds))
{
builder.Append($" AND {nameof(RB_Building_Carriermetro_Extend.CarrierId)} in({query.CarrierIds}) ");
}
}
return Get<RB_Building_Carriermetro_Extend>(builder.ToString()).ToList();
}
}
}
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