Skip to content

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

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

parents 3f88b48f bdc6c52b
Show whitespace changes
Inline Side-by-side
Showing with 108 additions and 118 deletions
Mall.Model/Entity/TradePavilion/RB_EnterpriseServices.cs
View file @ 9778b549
......@@ -52,7 +52,7 @@ namespace Mall.Model.Entity.TradePavilion
public string OperationTime { get; set; }
/// <summary>
/// 楼宇等级
/// 企业分类
/// </summary>
public int CategoryId { get; set; }
......@@ -142,7 +142,7 @@ namespace Mall.Model.Entity.TradePavilion
public DateStateEnum Status { get; set; }
/// <summary>
/// 企业类别
/// 楼宇等级
/// </summary>
public int EType { get; set; }
}
......
Mall.Model/Extend/TradePavilion/RB_EnterpriseServices_Extend.cs
View file @ 9778b549
......@@ -9,12 +9,12 @@ namespace Mall.Model.Extend.TradePavilion
public class RB_EnterpriseServices_Extend : RB_EnterpriseServices
{
/// <summary>
/// 分类名称
/// 企业分类
/// </summary>
public string CategoryName { get; set; }
/// <summary>
/// 企业类别名称
/// 楼宇等级
/// </summary>
public string ETypeName { get; set; }
......
Mall.Module.TradePavilion/BuildingCarrierModule_V2.cs
View file @ 9778b549
......@@ -14,6 +14,7 @@ using RabbitMQ.Client.Framing.Impl;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Reflection;
using VT.FW.DB;
using static ICSharpCode.SharpZipLib.Zip.ExtendedUnixData;
......@@ -118,6 +119,7 @@ namespace Mall.Module.TradePavilion
bool flag = brandEnterpriseApplyForRepository.Update(fileds, new WhereHelper(nameof(RB_BrandEnterpriseApplyFor_Extend.ID), ID));
return flag;
}
/// <summary>
/// 新增/修改品牌/企业申请信息
/// </summary>
......@@ -212,27 +214,23 @@ namespace Mall.Module.TradePavilion
{
Dictionary<string, object> filedsBrand = new Dictionary<string, object>()
{
{ nameof(RB_Brand_Enterprise_Extend.BrandName),BrandModel.BrandName},
{ nameof(RB_Brand_Enterprise_Extend.FullBrandName),BrandModel.FullBrandName},
{ nameof(RB_Brand_Enterprise_Extend.BrandName),BrandModel.BrandName},
{ 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.ShopNum),BrandModel.ShopNum},
{ nameof(RB_Brand_Enterprise_Extend.AreaRequirement),BrandModel.ShopNum},
{ nameof(RB_Brand_Enterprise_Extend.CustomerType),BrandModel.CustomerType},
{ nameof(RB_Brand_Enterprise_Extend.BrandType),BrandModel.BrandType},
{ nameof(RB_Brand_Enterprise_Extend.Cooperation),BrandModel.Cooperation},
{ nameof(RB_Brand_Enterprise_Extend.PropertyDemand),BrandModel.PropertyDemand},
{ nameof(RB_Brand_Enterprise_Extend.Complementary),BrandModel.Complementary},
{nameof(RB_Brand_Enterprise_Extend.ContactName),BrandModel.ContactName },
{nameof(RB_Brand_Enterprise_Extend.ContactPhone),BrandModel.ContactPhone },
{ nameof(RB_Brand_Enterprise_Extend.ContactName),BrandModel.ContactName},
{ nameof(RB_Brand_Enterprise_Extend.ContactPhone),BrandModel.ContactPhone},
{ nameof(RB_Brand_Enterprise_Extend.BrandEnterpriseType),BrandModel.BrandEnterpriseType},
};
brand_EnterpriseRepository.Update(filedsBrand, new WhereHelper(nameof(RB_Brand_Enterprise_Extend.ID), BrandModel.ExistBrandId));
}
......@@ -593,12 +591,14 @@ namespace Mall.Module.TradePavilion
if (flag)
{
//更新认证表 资料状态为完成
//更新认证表 资料状态为完成
Dictionary<string, object> keyValues = new Dictionary<string, object>() {
Dictionary<string, object> keyValues = new Dictionary<string, object>()
{
{ nameof(RB_CompanyEnterprise_Extend.IsComplete),1}
};
List<WhereHelper> wheres = new List<WhereHelper>() {
new WhereHelper(){
List<WhereHelper> wheres = new List<WhereHelper>()
{
new WhereHelper()
{
FiledName=nameof(RB_CompanyEnterprise_Extend.CompanyId),
FiledValue= model.CompanyId,
OperatorEnum=OperatorEnum.Equal
......@@ -637,29 +637,30 @@ namespace Mall.Module.TradePavilion
{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.VideoUrl),CarrierModel.VideoUrl },
{nameof(RB_Building_Carrier_Extend.OpeningStatus),CarrierModel },
{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.CarNum),CarrierModel.CarNum },
{nameof(RB_Building_Carrier_Extend.BuiltUpArea),CarrierModel.BuiltUpArea},
{nameof(RB_Building_Carrier_Extend.AreaRequirement),CarrierModel.AreaRequirement},
{nameof(RB_Building_Carrier_Extend.OpenTime),CarrierModel.OpenTime },
{nameof(RB_Building_Carrier_Extend.VisitorsFlowrate),CarrierModel.VisitorsFlowrate },
{nameof(RB_Building_Carrier_Extend.SupportingFacilities),CarrierModel.SupportingFacilities },
{nameof(RB_Building_Carrier_Extend.ManagementCompany),CarrierModel.ManagementCompany },
{nameof(RB_Building_Carrier_Extend.Developers),CarrierModel.Developers },
{nameof(RB_Building_Carrier_Extend.CategoryId),CarrierModel.CategoryId },
{nameof(RB_Building_Carrier_Extend.Ascription),CarrierModel.Ascription },
{nameof(RB_Building_Carrier_Extend.CarrierPlan),CarrierModel.CarrierPlan },
{nameof(RB_Building_Carrier_Extend.BrandDemand),CarrierModel.BrandDemand },
{nameof(RB_Building_Carrier_Extend.UpdateBy),CarrierModel.UpdateBy },
{nameof(RB_Building_Carrier_Extend.UpdateDate),CarrierModel.UpdateDate },
{nameof(RB_Building_Carrier_Extend.Location),CarrierModel.Location },
{nameof(RB_Building_Carrier_Extend.ContactName),CarrierModel.ContactName },
{nameof(RB_Building_Carrier_Extend.ContactPhone),CarrierModel.ContactPhone },
{nameof(RB_Building_Carrier_Extend.BuildingCarrierType),CarrierModel.BuildingCarrierType },
{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));
if (flag)
......@@ -681,15 +682,12 @@ namespace Mall.Module.TradePavilion
}
else
{
#region 新增载体
var inserCModel = model.RefMapperTo<RB_Building_Carrier_Extend>();
inserCModel.ID = 0;
inserCModel.UserId = cmodel.CreateBy;
inserCModel.BuiltUpArea = model.BuiltUpArea ?? 0;
inserCModel.AreaRequirement = model.AreaRequirement ?? 0;
if (model.OpenTime.HasValue)
{
if (model.OpenTime.Value <= System.DateTime.Now)
......@@ -1352,45 +1350,63 @@ namespace Mall.Module.TradePavilion
var BrandModel = brandList.FirstOrDefault();
var brandEnterpriseModel = new RB_Brand_Enterprise_Extend()
{
FullBrandName = BrandModel.FullBrandName,
BrandName = BrandModel.BrandName,
VideoUrl = BrandModel.VideoUrl,
Logo = BrandModel.Logo,
Banner = BrandModel.Banner,
CategoryId = BrandModel.BrandClassId,
Introduce = BrandModel.Introduce,
ShopNum = BrandModel.ShopNum,
AreaRequirement = BrandModel.ShopNum,
CustomerType = BrandModel.CustomerType,
BrandType = BrandModel.BrandType,
Cooperation = BrandModel.Cooperation,
PropertyDemand = BrandModel.PropertyDemand,
Complementary = BrandModel.Complementary,
ContactName = BrandModel.ContactName,
ContactPhone = BrandModel.ContactPhone,
BrandEnterpriseType = BrandModel.BrandEnterpriseType,
TenantId = BrandModel.TenantId,
MallBaseId = BrandModel.MallBaseId,
};
if (BrandModel.ExistBrandId > 0)
{
Dictionary<string, object> filedsBrand = new Dictionary<string, object>()
{
{ nameof(RB_Brand_Enterprise_Extend.FullBrandName),BrandModel.FullBrandName},
{ nameof(RB_Brand_Enterprise_Extend.BrandName),BrandModel.BrandName},
{ 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.CategoryId),BrandModel.BrandClassId},
{ nameof(RB_Brand_Enterprise_Extend.Introduce),BrandModel.Introduce},
{ nameof(RB_Brand_Enterprise_Extend.ShopNum),BrandModel.ShopNum},
{ nameof(RB_Brand_Enterprise_Extend.AreaRequirement),BrandModel.ShopNum},
{ nameof(RB_Brand_Enterprise_Extend.CustomerType),BrandModel.CustomerType},
{ nameof(RB_Brand_Enterprise_Extend.BrandType),BrandModel.BrandType},
{ nameof(RB_Brand_Enterprise_Extend.Cooperation),BrandModel.Cooperation},
{ nameof(RB_Brand_Enterprise_Extend.PropertyDemand),BrandModel.PropertyDemand},
{ nameof(RB_Brand_Enterprise_Extend.Complementary),BrandModel.Complementary},
{ nameof(RB_Brand_Enterprise_Extend.ContactName),BrandModel.ContactName},
{ nameof(RB_Brand_Enterprise_Extend.ContactPhone),BrandModel.ContactPhone},
{ nameof(RB_Brand_Enterprise_Extend.BrandEnterpriseType),BrandModel.BrandEnterpriseType},
{ nameof(RB_Brand_Enterprise_Extend.FullBrandName),brandEnterpriseModel.FullBrandName},
{ nameof(RB_Brand_Enterprise_Extend.BrandName),brandEnterpriseModel.BrandName},
{ nameof(RB_Brand_Enterprise_Extend.VideoUrl),brandEnterpriseModel.VideoUrl},
{ nameof(RB_Brand_Enterprise_Extend.Logo),brandEnterpriseModel.Logo},
{ nameof(RB_Brand_Enterprise_Extend.Banner),brandEnterpriseModel.Banner},
{ nameof(RB_Brand_Enterprise_Extend.CategoryId),brandEnterpriseModel.BrandClassId},
{ nameof(RB_Brand_Enterprise_Extend.Introduce),brandEnterpriseModel.Introduce},
{ nameof(RB_Brand_Enterprise_Extend.ShopNum),brandEnterpriseModel.ShopNum},
{ nameof(RB_Brand_Enterprise_Extend.AreaRequirement),brandEnterpriseModel.ShopNum},
{ nameof(RB_Brand_Enterprise_Extend.CustomerType),brandEnterpriseModel.CustomerType},
{ nameof(RB_Brand_Enterprise_Extend.BrandType),brandEnterpriseModel.BrandType},
{ nameof(RB_Brand_Enterprise_Extend.Cooperation),brandEnterpriseModel.Cooperation},
{ nameof(RB_Brand_Enterprise_Extend.PropertyDemand),brandEnterpriseModel.PropertyDemand},
{ nameof(RB_Brand_Enterprise_Extend.Complementary),brandEnterpriseModel.Complementary},
{ nameof(RB_Brand_Enterprise_Extend.ContactName),brandEnterpriseModel.ContactName},
{ nameof(RB_Brand_Enterprise_Extend.ContactPhone),brandEnterpriseModel.ContactPhone},
{ nameof(RB_Brand_Enterprise_Extend.BrandEnterpriseType),brandEnterpriseModel.BrandEnterpriseType},
};
brand_EnterpriseRepository.Update(filedsBrand, new WhereHelper(nameof(RB_Brand_Enterprise_Extend.ID), BrandModel.ExistBrandId), trans);
}
else
{
var inserBModel = BrandModel.RefMapperTo<RB_Brand_Enterprise_Extend>();
inserBModel.ID = 0;
inserBModel.CategoryId = BrandModel.BrandClassId;
inserBModel.UserId = cmodel.CreateBy;
brand_EnterpriseRepository.Insert(inserBModel, trans);
brandEnterpriseModel.ID = 0;
brandEnterpriseModel.CategoryId = BrandModel.BrandClassId;
brandEnterpriseModel.UserId = cmodel.CreateBy;
brandEnterpriseModel.CreateDate = DateTime.Now;
brand_EnterpriseRepository.Insert(brandEnterpriseModel, trans);
}
}
}
//载体
else if (cmodel.FirstShopType == 2)
{
//载体
var carrierList = carrierEnterpriseApplyForRepository.GetCarrierEnterpriseList(new RB_CarrierEnterpriseApplyFor_Extend() { MallBaseId = cmodel.MallBaseId, CompanyId = cmodel.CompanyId });
if (carrierList != null && carrierList.Any())
{
......@@ -1498,7 +1514,6 @@ namespace Mall.Module.TradePavilion
else
{
#region 新增载体
buildingCarrierModel.ID = 0;
buildingCarrierModel.UserId = cmodel.CreateBy;
if (!string.IsNullOrWhiteSpace(CarrierModel.StartingInfo))
......@@ -1538,10 +1553,11 @@ namespace Mall.Module.TradePavilion
{ nameof(RB_EnterpriseServices_Extend.Banner),enterpriseModel.Banner},
{ nameof(RB_EnterpriseServices_Extend.Introduction),enterpriseModel.Introduction},
{ nameof(RB_EnterpriseServices_Extend.DevIntention),enterpriseModel.DevIntention},
{ nameof(RB_EnterpriseServices_Extend.CategoryId),enterpriseModel.CategoryId},
{ nameof(RB_EnterpriseServices_Extend.Address),enterpriseModel.Address},
{ nameof(RB_EnterpriseServices_Extend.LatAndLon),enterpriseModel.LatAndLon},
{ nameof(RB_EnterpriseServices_Extend.OperationTime),enterpriseModel.OperationTime},
{ nameof(RB_EnterpriseServices_Extend.CategoryId),enterpriseModel.CategoryId},
{ nameof(RB_EnterpriseServices_Extend.EType),enterpriseModel.EType},
{ nameof(RB_EnterpriseServices_Extend.Renovation),enterpriseModel.Renovation},
{ nameof(RB_EnterpriseServices_Extend.Payment),enterpriseModel.Payment},
{ nameof(RB_EnterpriseServices_Extend.HandoverDate),enterpriseModel.HandoverDate},
......
Mall.WebApi/Controllers/TradePavilion/AppletTradeController.cs
View file @ 9778b549
......@@ -3582,34 +3582,8 @@ namespace Mall.WebApi.Controllers.TradePavilion
query.TenantId = userInfo.TenantId;
query.Status = 0;
query.UpdateDate = System.DateTime.Now;
query.UpdateBy = userInfo.UserId;
#region 验证品牌名称是否已经存在了
if (query.ExistBrandId == 0)
{
//if (carrierModule.ValidateBrandName(query.BrandName, userInfo.MallBaseId))
//{
// //return ApiResult.Failed("该品牌名称已存在,请选择绑定已有品牌");
//}
//if (carrierModule.ValidateFullBrandName(query.FullBrandName, userInfo.MallBaseId))
//{
// //return ApiResult.Failed("该品牌全名已存在,请选择绑定已有品牌");
//}
}
//修改
#region 验证品牌是否已关联用户
if (query.ExistBrandId > 0)
{
//var bmodel = carrierModule.GetBrand(new RB_Brand_Extend { ID = query.ExistBrandId, MallBaseId = query.MallBaseId, TenantId = query.TenantId });
//if (bmodel.UserId > 0)
//{
// //return ApiResult.Failed("该品牌已被其他用户认证，请核实后再试");
//}
}
#endregion
#endregion
bool flag = buildingCarrierModule.SetCarrierEnterpriseApplyFor(query);
return flag ? ApiResult.Success() : ApiResult.Failed();
}
......
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