Skip to content

M
mall.oytour.com
Commit df54ac65 authored by 黄奎's avatar 黄奎
Browse files
Options

Merge branch 'master' of http://gitlab.oytour.com/Kui2/mall.oytour.com

parents 0915a9d1 e227abb5
Show whitespace changes
Inline Side-by-side
Showing with 59 additions and 43 deletions
Mall.Model/Entity/TradePavilion/RB_Building_Carrier.cs
View file @ df54ac65
...@@ -113,7 +113,7 @@ namespace Mall.Model.Entity.TradePavilion ...@@ -113,7 +113,7 @@ namespace Mall.Model.Entity.TradePavilion
/// <summary> /// <summary>
/// 项目类型 /// 项目类型
/// </summary> /// </summary>
public ProjectTypeEnum ProjectType { get; set; } public int? ProjectType { get; set; }
/// <summary> /// <summary>
/// 商业体量（单位：万平方米） /// 商业体量（单位：万平方米）
...@@ -160,7 +160,7 @@ namespace Mall.Model.Entity.TradePavilion ...@@ -160,7 +160,7 @@ namespace Mall.Model.Entity.TradePavilion
/// <summary> /// <summary>
/// 首店试验场 0-否，1-是 /// 首店试验场 0-否，1-是
/// </summary> /// </summary>
public int FirstStoreTest { get; set; } public int? FirstStoreTest { get; set; }
/// <summary> /// <summary>
...@@ -176,12 +176,12 @@ namespace Mall.Model.Entity.TradePavilion ...@@ -176,12 +176,12 @@ namespace Mall.Model.Entity.TradePavilion
/// <summary> /// <summary>
/// 去年业绩（单位：W） /// 去年业绩（单位：W）
/// </summary> /// </summary>
public decimal YeJi { get; set; } public decimal? YeJi { get; set; }
/// <summary> /// <summary>
/// 店铺数量 /// 店铺数量
/// </summary> /// </summary>
public int ShopNum { get; set; } public int? ShopNum { get; set; }
/// <summary> /// <summary>
/// 可租赁面积 /// 可租赁面积
...@@ -191,7 +191,7 @@ namespace Mall.Model.Entity.TradePavilion ...@@ -191,7 +191,7 @@ namespace Mall.Model.Entity.TradePavilion
/// <summary> /// <summary>
/// 可租赁面积 /// 可租赁面积
/// </summary> /// </summary>
public decimal EndAreaRequirement { get; set; } public decimal? EndAreaRequirement { get; set; }
/// <summary> /// <summary>
...@@ -202,7 +202,7 @@ namespace Mall.Model.Entity.TradePavilion ...@@ -202,7 +202,7 @@ namespace Mall.Model.Entity.TradePavilion
/// <summary> /// <summary>
/// 经营面积 /// 经营面积
/// </summary> /// </summary>
public decimal EndBuiltUpArea { get; set; } public decimal? EndBuiltUpArea { get; set; }
/// <summary> /// <summary>
...@@ -224,12 +224,12 @@ namespace Mall.Model.Entity.TradePavilion ...@@ -224,12 +224,12 @@ namespace Mall.Model.Entity.TradePavilion
/// <summary> /// <summary>
/// 类型(1-载体,2-楼宇) /// 类型(1-载体,2-楼宇)
/// </summary> /// </summary>
public int BuildingCarrierType { get; set; } public int? BuildingCarrierType { get; set; }
/// <summary> /// <summary>
/// 是否为成都载体(1-是) /// 是否为成都载体(1-是)
/// </summary> /// </summary>
public int IsChengDu { get; set; } public int? IsChengDu { get; set; }
/// <summary> /// <summary>
/// 资产权属 /// 资产权属
......
Mall.Module.TradePavilion/BuildingCarrierModule.cs
View file @ df54ac65
...@@ -167,20 +167,20 @@ namespace Mall.Module.TradePavilion ...@@ -167,20 +167,20 @@ namespace Mall.Module.TradePavilion
flag = newId > 0; flag = newId > 0;
} }
if (flag) //if (flag)
{ //{
var oldCarrierMetroList = building_CarriermetroRepository.GetBuildingCarrierMetroListRepository(new RB_Building_Carriermetro_Extend { TenantId = extModel.TenantId, MallBaseId = extModel.MallBaseId, CarrierId = extModel.ID }); // var oldCarrierMetroList = building_CarriermetroRepository.GetBuildingCarrierMetroListRepository(new RB_Building_Carriermetro_Extend { TenantId = extModel.TenantId, MallBaseId = extModel.MallBaseId, CarrierId = extModel.ID });
building_CarriermetroRepository.DeleteBatch(oldCarrierMetroList); // building_CarriermetroRepository.DeleteBatch(oldCarrierMetroList);
foreach (var item in extModel.BuildingCarriermetroList) // foreach (var item in extModel.BuildingCarriermetroList)
{ // {
item.ID = 0; // item.ID = 0;
item.Status = 0; // item.Status = 0;
item.TenantId = extModel.TenantId; // item.TenantId = extModel.TenantId;
item.MallBaseId = extModel.MallBaseId; // item.MallBaseId = extModel.MallBaseId;
item.CarrierId = extModel.ID; // item.CarrierId = extModel.ID;
} // }
building_CarriermetroRepository.InsertBatch(extModel.BuildingCarriermetroList); // building_CarriermetroRepository.InsertBatch(extModel.BuildingCarriermetroList);
} //}
return flag; return flag;
} }
......
Mall.Module.TradePavilion/BuildingCarrierModule_V2.cs
View file @ df54ac65
...@@ -689,31 +689,33 @@ namespace Mall.Module.TradePavilion ...@@ -689,31 +689,33 @@ namespace Mall.Module.TradePavilion
inserCModel.BuiltUpArea = model.BuiltUpArea ?? 0; inserCModel.BuiltUpArea = model.BuiltUpArea ?? 0;
inserCModel.AreaRequirement = model.AreaRequirement ?? 0; inserCModel.AreaRequirement = model.AreaRequirement ?? 0;
if (model.OpenTime.HasValue) if (model.OpenTime.HasValue)
{ {
if (model.OpenTime.Value <= System.DateTime.Now) if (model.OpenTime.Value <= System.DateTime.Now)
{ {
inserCModel.OpeningStatus = 1; inserCModel.OpeningStatus = 1;
} }
inserCModel.OpenTime = model.OpenTime.Value;
} }
if (!string.IsNullOrWhiteSpace(model.StartingInfo)) if (!string.IsNullOrWhiteSpace(model.StartingInfo))
{ {
inserCModel.FirstStoreTest = 1; inserCModel.FirstStoreTest = 1;
} }
int Id = building_CarrierRepository.Insert(inserCModel); int Id = building_CarrierRepository.Insert(inserCModel);
if (Id > 0) //if (Id > 0)
{ //{
var mlist = MetroList.RefMapperToList<RB_CarrierEnterpriseMetroApplyFor_Extend>(); // var mlist = MetroList.RefMapperToList<RB_CarrierEnterpriseMetroApplyFor_Extend>();
mlist.ForEach(x => // mlist.ForEach(x =>
{ // {
x.ID = 0; // x.ID = 0;
x.CarrierId = Id; // x.CarrierId = Id;
x.Status = 0; // x.Status = 0;
x.TenantId = model.TenantId; // x.TenantId = model.TenantId;
x.MallBaseId = model.MallBaseId; // x.MallBaseId = model.MallBaseId;
}); // });
carrierEnterpriseMetroApplyForRepository.InsertBatch(mlist); // carrierEnterpriseMetroApplyForRepository.InsertBatch(mlist);
} //}
#endregion #endregion
} }
} }
...@@ -839,10 +841,13 @@ namespace Mall.Module.TradePavilion ...@@ -839,10 +841,13 @@ namespace Mall.Module.TradePavilion
} }
else if (model.FirstShopType == 2) else if (model.FirstShopType == 2)
{ {
var clist = building_CarrierRepository.GetBuildingCarrierListRepository(new RB_Building_Carrier_Extend() {OpeningStatus=-1,TenantId = model.TenantId, MallBaseId = model.MallBaseId, UserId = userId });; var clist = building_CarrierRepository.GetBuildingCarrierListRepository(new RB_Building_Carrier_Extend() { OpeningStatus = -1, TenantId = model.TenantId, MallBaseId = model.MallBaseId, UserId = userId }); ;
if (clist.Any()) if (clist.Any())
{ {
model.CarrierModel = clist.FirstOrDefault().RefMapperTo<RB_CarrierEnterpriseApplyFor_Extend>(); model.CarrierModel = clist.FirstOrDefault().RefMapperTo<RB_CarrierEnterpriseApplyFor_Extend>();
model.CarrierModel.BuiltUpArea = clist.FirstOrDefault()?.BuiltUpArea;
model.CarrierModel.AreaRequirement = clist.FirstOrDefault()?.AreaRequirement;
model.CarrierModel.OpenTime = clist.FirstOrDefault()?.OpenTime;
// model.CarrierModel.BuiltUpArea = clist.FirstOrDefault().BuiltUpArea; // model.CarrierModel.BuiltUpArea = clist.FirstOrDefault().BuiltUpArea;
//var metroList = carrierEnterpriseMetroApplyForRepository.GetCarrierMetroList(new RB_CarrierEnterpriseMetroApplyFor_Extend { TenantId = model.TenantId, MallBaseId = model.MallBaseId, CarrierId = model.CarrierModel.ID }); //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>(); //model.CarrierModel.CarrierMetroList = new List<RB_CarrierEnterpriseMetroApplyFor_Extend>();
...@@ -865,9 +870,9 @@ namespace Mall.Module.TradePavilion ...@@ -865,9 +870,9 @@ namespace Mall.Module.TradePavilion
//审核通过了的 直接查询资料表 //审核通过了的 直接查询资料表
var blist = enterpriseServicesRepository.GetEnterpriseServicesListRepository(new RB_EnterpriseServices_Extend() { TenantId = model.TenantId, MallBaseId = model.MallBaseId, UserId = userId }); var blist = enterpriseServicesRepository.GetEnterpriseServicesListRepository(new RB_EnterpriseServices_Extend() { TenantId = model.TenantId, MallBaseId = model.MallBaseId, UserId = userId });
model.EnterpriseServicesModel = blist.FirstOrDefault().RefMapperTo<RB_EnterpriseServicesApply_Extend>(); model.EnterpriseServicesModel = blist.FirstOrDefault().RefMapperTo<RB_EnterpriseServicesApply_Extend>();
model.EnterpriseServicesModel.ID = blist.FirstOrDefault().ServiceId;
if (model.EnterpriseServicesModel != null) if (model.EnterpriseServicesModel != null)
{ {
if (!string.IsNullOrWhiteSpace(model.EnterpriseServicesModel.Banner)) if (!string.IsNullOrWhiteSpace(model.EnterpriseServicesModel.Banner))
{ {
model.EnterpriseServicesModel.BannerList = JsonConvert.DeserializeObject<List<string>>(model.EnterpriseServicesModel.Banner); model.EnterpriseServicesModel.BannerList = JsonConvert.DeserializeObject<List<string>>(model.EnterpriseServicesModel.Banner);
......
Mall.WebApi/Controllers/TradePavilion/AppletTradeController.cs
View file @ df54ac65
...@@ -2894,7 +2894,7 @@ namespace Mall.WebApi.Controllers.TradePavilion ...@@ -2894,7 +2894,7 @@ namespace Mall.WebApi.Controllers.TradePavilion
x.LatAndLon, x.LatAndLon,
x.Developers, x.Developers,
x.ProjectType, x.ProjectType,
ProjectTypeName = x.ProjectType.GetEnumName(), // ProjectTypeName = x.ProjectType.GetEnumName(),
x.CarrierSize, x.CarrierSize,
x.LayersNum, x.LayersNum,
x.CategoryName, x.CategoryName,
...@@ -2983,7 +2983,7 @@ namespace Mall.WebApi.Controllers.TradePavilion ...@@ -2983,7 +2983,7 @@ namespace Mall.WebApi.Controllers.TradePavilion
extModel.ManagementCompany, extModel.ManagementCompany,
extModel.BrandDemand, extModel.BrandDemand,
extModel.HonorList, extModel.HonorList,
OpenTime= StringHelper.FormatDate(extModel.OpenTime),
}); });
} }
...@@ -3343,6 +3343,15 @@ namespace Mall.WebApi.Controllers.TradePavilion ...@@ -3343,6 +3343,15 @@ namespace Mall.WebApi.Controllers.TradePavilion
{ {
var userInfo = AppletUserInfo; var userInfo = AppletUserInfo;
RB_Building_Carrier_Extend query = JsonConvert.DeserializeObject<RB_Building_Carrier_Extend>(RequestParm.msg.ToString()); RB_Building_Carrier_Extend query = JsonConvert.DeserializeObject<RB_Building_Carrier_Extend>(RequestParm.msg.ToString());
query.ProjectType = query?.ProjectType ?? 0;
query.IsChengDu = query?.IsChengDu ?? 0;
query.YeJi = query?.YeJi ?? 0;
query.EndAreaRequirement = query?.EndAreaRequirement ?? 0;
query.BuildingCarrierType = query?.BuildingCarrierType ?? 0;
query.FirstStoreTest = query?.FirstStoreTest ?? 0;
query.ShopNum = query?.ShopNum ?? 0;
query.EndBuiltUpArea = query?.EndBuiltUpArea ?? 0;
query.BuildingCarriermetroList = new List<RB_Building_Carriermetro_Extend>();
if (query.ID <= 0) if (query.ID <= 0)
{ {
return ApiResult.ParamIsNull("请传递载体id"); return ApiResult.ParamIsNull("请传递载体id");
...@@ -3419,7 +3428,9 @@ namespace Mall.WebApi.Controllers.TradePavilion ...@@ -3419,7 +3428,9 @@ namespace Mall.WebApi.Controllers.TradePavilion
{ {
var userInfo = AppletUserInfo; var userInfo = AppletUserInfo;
RB_EnterpriseServices_Extend query = JsonConvert.DeserializeObject<RB_EnterpriseServices_Extend>(RequestParm.msg.ToString()); RB_EnterpriseServices_Extend query = JsonConvert.DeserializeObject<RB_EnterpriseServices_Extend>(RequestParm.msg.ToString());
JObject parms = JObject.Parse(RequestParm.msg.ToString());
int ID = parms.GetInt("ID");
query.ServiceId = ID;
if (query.ServiceId <= 0) if (query.ServiceId <= 0)
{ {
return ApiResult.ParamIsNull("请传递企业id"); return ApiResult.ParamIsNull("请传递企业id");
...@@ -3447,7 +3458,7 @@ namespace Mall.WebApi.Controllers.TradePavilion ...@@ -3447,7 +3458,7 @@ namespace Mall.WebApi.Controllers.TradePavilion
query.UpdateDate = System.DateTime.Now; query.UpdateDate = System.DateTime.Now;
query.CreateBy = userInfo.UserId; query.CreateBy = userInfo.UserId;
var oldModel = buildingCarrierModule.GetBrandEnterpriseModule(query.ServiceId); var oldModel = buildingCarrierModule.GetEnterpriseServicesInfoModule(query.ServiceId);
if (oldModel == null) { return ApiResult.Failed("企业信息不存在"); } if (oldModel == null) { return ApiResult.Failed("企业信息不存在"); }
if (oldModel.UserId != userInfo.UserId) { return ApiResult.Failed("无法修改此企业信息"); } if (oldModel.UserId != userInfo.UserId) { return ApiResult.Failed("无法修改此企业信息"); }
...@@ -3614,7 +3625,7 @@ namespace Mall.WebApi.Controllers.TradePavilion ...@@ -3614,7 +3625,7 @@ namespace Mall.WebApi.Controllers.TradePavilion
{ {
ID = parms.GetInt("ID"), ID = parms.GetInt("ID"),
Name = parms.GetStringValue("Name"), Name = parms.GetStringValue("Name"),
Introduction = parms.GetStringValue("FullBIntroductionrandName"), Introduction = parms.GetStringValue("Introduction"),
DevIntention = parms.GetStringValue("DevIntention"), DevIntention = parms.GetStringValue("DevIntention"),
Address = parms.GetStringValue("Address"), Address = parms.GetStringValue("Address"),
LatAndLon = parms.GetStringValue("LatAndLon"), LatAndLon = parms.GetStringValue("LatAndLon"),
......
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