Skip to content

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

11

parents 63a0a8df e0c61598
Hide whitespace changes
Inline Side-by-side
Showing with 273 additions and 43 deletions
Mall.Common/Config.cs
View file @ f0c3d655
......@@ -802,7 +802,17 @@ namespace Mall.Common
}
}
/// <summary>
/// 0-表示不显示全部/宜宾/成都 ，1-显示
/// </summary>
public static string IsCPSWJSelectAll
{
get
{
return ReadConfigKey("IsCPSWJSelectAll");
}
}
/// <summary>
/// 汇付天下回调进阶思维接口地址
/// </summary>
......
Mall.Repository/TradePavilion/RB_Brand_EnterpriseRepository.cs
View file @ f0c3d655
......@@ -68,7 +68,7 @@ WHERE 1=1 ");
/// <param name="rowsCount"></param>
/// <param name="query"></param>
/// <returns></returns>
public List<RB_Brand_Enterprise_Extend> GetBrandEnterpriseBriefRepository(RB_Brand_Enterprise_Extend query)
public List<RB_Brand_Enterprise_Extend> GetBrandEnterpriseBriefRepository(RB_Brand_Enterprise_Extend query,string startTime="",string endTime = "")
{
DynamicParameters parameters = new DynamicParameters();
StringBuilder builder = new StringBuilder();
......@@ -97,6 +97,15 @@ WHERE 1=1 ");
builder.AppendFormat(" AND A.{0} LIKE @BrandName ", nameof(RB_Brand_Enterprise_Extend.BrandName));
parameters.Add("@BrandName", "%" + query.BrandName + "%");
}
}
if (!string.IsNullOrWhiteSpace(startTime))
{
builder.Append($" and DATE_FORMAT(A.{nameof(RB_Brand_Enterprise_Extend.CreateDate)},'%Y-%m-%d' )>=DATE_FORMAT('{startTime}','%Y-%m-%d' ) ");
}
if (!string.IsNullOrWhiteSpace(endTime))
{
builder.Append($" and DATE_FORMAT(A.{nameof(RB_Brand_Enterprise_Extend.CreateDate)},'%Y-%m-%d' )<= DATE_FORMAT('{endTime}','%Y-%m-%d' ) ");
}
return Get<RB_Brand_Enterprise_Extend>(builder.ToString(), parameters).ToList();
}
......
Mall.Repository/TradePavilion/RB_BuildingRepository.cs
View file @ f0c3d655
......@@ -115,5 +115,64 @@ WHERE 1=1
builder.AppendFormat(" ORDER BY A.{0} DESC ", nameof(RB_Building_Extend.BuildId));
return Get<RB_Building_Extend>( builder.ToString(), parameters).ToList();
}
/// <summary>
/// 获取活力楼宇统计专用
/// </summary>
/// <param name="pageIndex"></param>
/// <param name="pageSize"></param>
/// <param name="rowsCount"></param>
/// <param name="query"></param>
/// <returns></returns>
public List<RB_Building_Extend> GetBuildingBriefRepository(RB_Building_Extend query, string startTime = "", string endTime = "")
{
DynamicParameters parameters = new DynamicParameters();
StringBuilder builder = new StringBuilder();
builder.AppendFormat(@" SELECT A.BuildId,A.CreateDate FROM RB_Building AS A WHERE 1=1 ");
builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_Building_Extend.Status), (int)DateStateEnum.Normal);
if (query != null)
{
if (query.TenantId > 0)
{
builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_Building_Extend.TenantId), query.TenantId);
}
if (query.MallBaseId > 0)
{
builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_Building_Extend.MallBaseId), query.MallBaseId);
}
if (!string.IsNullOrWhiteSpace(query.QIds))
{
builder.AppendFormat(" AND A.{0} in ({1}) ", nameof(RB_Building_Extend.BuildId), query.QIds);
}
if (query.CategoryId > 0)
{
builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_Building_Extend.CategoryId), query.CategoryId);
}
if (query.UserId > 0)
{
builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_Building_Extend.UserId), query.UserId);
}
if (!string.IsNullOrEmpty(query.Name))
{
builder.AppendFormat(" AND A.{0} LIKE @Name ", nameof(RB_Building_Extend.Name));
parameters.Add("@Name", "%" + query.Name.Trim() + "%");
}
if (!string.IsNullOrEmpty(query.Address))
{
builder.AppendFormat(" AND A.{0} LIKE @Address ", nameof(RB_Building_Extend.Address));
parameters.Add("@Address", "%" + query.Address.Trim() + "%");
}
}
if (!string.IsNullOrWhiteSpace(startTime))
{
builder.Append($" and DATE_FORMAT(A.{nameof(RB_Building_Extend.CreateDate)},'%Y-%m-%d' )>=DATE_FORMAT('{startTime}','%Y-%m-%d' ) ");
}
if (!string.IsNullOrWhiteSpace(endTime))
{
builder.Append($" and DATE_FORMAT(A.{nameof(RB_Building_Extend.CreateDate)},'%Y-%m-%d' )<= DATE_FORMAT('{endTime}','%Y-%m-%d' ) ");
}
return Get<RB_Building_Extend>(builder.ToString(), parameters).ToList();
}
}
}
Mall.Repository/TradePavilion/RB_Building_CarrierRepository.cs
View file @ f0c3d655
......@@ -197,7 +197,7 @@ WHERE 1=1
/// </summary>
/// <param name="query"></param>
/// <returns></returns>
public List<RB_Building_Carrier_Extend> GetBuildingCarrierBriefListRepository(RB_Building_Carrier_Extend query)
public List<RB_Building_Carrier_Extend> GetBuildingCarrierBriefListRepository(RB_Building_Carrier_Extend query, string startTime = "", string endTime = "")
{
DynamicParameters parameters = new DynamicParameters();
StringBuilder builder = new StringBuilder();
......@@ -223,6 +223,14 @@ WHERE 1=1
builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_Building_Carrier_Extend.CategoryId), query.CategoryId);
}
}
if (!string.IsNullOrWhiteSpace(startTime))
{
builder.Append($" and DATE_FORMAT(A.{nameof(RB_Building_Carrier_Extend.CreateDate)},'%Y-%m-%d' )>=DATE_FORMAT('{startTime}','%Y-%m-%d' ) ");
}
if (!string.IsNullOrWhiteSpace(endTime))
{
builder.Append($" and DATE_FORMAT(A.{nameof(RB_Building_Carrier_Extend.CreateDate)},'%Y-%m-%d' )<= DATE_FORMAT('{endTime}','%Y-%m-%d' ) ");
}
return Get<RB_Building_Carrier_Extend>(builder.ToString(), parameters).ToList();
}
......
Mall.Repository/TradePavilion/RB_EnterpriseServicesRepository.cs
View file @ f0c3d655
......@@ -107,6 +107,60 @@ WHERE 1=1
builder.AppendFormat(" ORDER BY A.{0} DESC ", nameof(RB_EnterpriseServices_Extend.ServiceId));
return Get<RB_EnterpriseServices_Extend>(builder.ToString(), parameters).ToList();
}
/// <summary>
/// 【商载通】获取企业统计列表
/// </summary>
/// <param name="query"></param>
/// <returns></returns>
public List<RB_EnterpriseServices_Extend> GetEnterpriseServicesBriefListRepository(RB_EnterpriseServices_Extend query, string startTime = "", string endTime = "")
{
DynamicParameters parameters = new DynamicParameters();
StringBuilder builder = new StringBuilder();
builder.AppendFormat(@"
SELECT A.ServiceId,A.CreateDate
FROM rb_enterpriseservices AS A
WHERE 1=1
");
builder.AppendFormat(@" AND A.{0}={1} ", nameof(RB_EnterpriseServices_Extend.Status), (int)DateStateEnum.Normal);
if (query != null)
{
if (query.TenantId > 0)
{
builder.AppendFormat(@" AND A.{0}={1} ", nameof(RB_EnterpriseServices_Extend.TenantId), query.TenantId);
}
if (query.MallBaseId > 0)
{
builder.AppendFormat(@" AND A.{0}={1} ", nameof(RB_EnterpriseServices_Extend.MallBaseId), query.MallBaseId);
}
if (!string.IsNullOrWhiteSpace(query.SelectIds))
{
builder.AppendFormat(@" AND A.{0} in ({1}) ", nameof(RB_EnterpriseServices_Extend.ServiceId), query.SelectIds);
}
if (query.CategoryId > 0)
{
builder.AppendFormat(@" AND A.{0}={1} ", nameof(RB_EnterpriseServices_Extend.CategoryId), query.CategoryId);
}
if (query.UserId > 0)
{
builder.AppendFormat(@" AND A.{0}={1} ", nameof(RB_EnterpriseServices_Extend.UserId), query.UserId);
}
if (!string.IsNullOrEmpty(query.Name))
{
builder.AppendFormat(@" AND A.{0} LIKE @Name ", nameof(RB_EnterpriseServices_Extend.Name));
parameters.Add("@Name", "%" + query.Name + "%");
}
}
if (!string.IsNullOrWhiteSpace(startTime))
{
builder.Append($" and DATE_FORMAT(A.{nameof(RB_EnterpriseServices_Extend.CreateDate)},'%Y-%m-%d' )>=DATE_FORMAT('{startTime}','%Y-%m-%d' ) ");
}
if (!string.IsNullOrWhiteSpace(endTime))
{
builder.Append($" and DATE_FORMAT(A.{nameof(RB_EnterpriseServices_Extend.CreateDate)},'%Y-%m-%d' )<= DATE_FORMAT('{endTime}','%Y-%m-%d' ) ");
}
builder.AppendFormat(" ORDER BY A.{0} DESC ", nameof(RB_EnterpriseServices_Extend.ServiceId));
return Get<RB_EnterpriseServices_Extend>(builder.ToString(), parameters).ToList();
}
}
}
Mall.WebApi/Controllers/Mall/MallController.cs
View file @ f0c3d655
......@@ -485,6 +485,7 @@ namespace Mall.WebApi.Controllers.MallBase
auth_page,//授权页面
liveConfig,
bar_title = miniPageList?.Select(qitem => new { name = qitem.PageName, value = qitem.PageUrl, new_name = qitem.SelfPageName }),//导航标题
iscpswjselectall=Config.IsCPSWJSelectAll
};
return ApiResult.Success(data: objResult);
}
......
Mall.WebApi/Controllers/TradePavilion/TradeController.cs
View file @ f0c3d655
......@@ -4178,26 +4178,26 @@ namespace Mall.WebApi.Controllers.TradePavilion
BuildingCarrierNum = list?.Sum(x => x.BuildingCarrierNum) ?? 0,
BrandNum = list?.Sum(x => x.BrandNum) ?? 0,
EnterpriseNum = list?.Sum(x => x.EnterpriseNum) ?? 0,
CarrierTotalNum = list?.Sum(x => x.CarrierTotalNum) ?? 0,
BuildingCarrierTotalNum = list?.Sum(x => x.BuildingCarrierTotalNum) ?? 0,
BrandTotalNum = list?.Sum(x => x.BrandTotalNum) ?? 0,
EnterpriseTotalNum = list?.Sum(x => x.EnterpriseTotalNum) ?? 0,
CarrierVisitNum = list?.Sum(x => x.CarrierVisitNum) ?? 0,
BuildingCarrierVisitNum = list?.Sum(x => x.BuildingCarrierVisitNum) ?? 0,
BrandVisitNum = list?.Sum(x => x.BrandVisitNum) ?? 0,
EnterpriseVisitNum = list?.Sum(x => x.EnterpriseVisitNum) ?? 0,
CarrierTotalNum = list?.Max(x => x.CarrierTotalNum) ?? 0,
BuildingCarrierTotalNum = list?.Max(x => x.BuildingCarrierTotalNum) ?? 0,
BrandTotalNum = list?.Max(x => x.BrandTotalNum) ?? 0,
EnterpriseTotalNum = list?.Max(x => x.EnterpriseTotalNum) ?? 0,
CarrierVisitNum = list?.Max(x => x.CarrierVisitNum) ?? 0,
BuildingCarrierVisitNum = list?.Max(x => x.BuildingCarrierVisitNum) ?? 0,
BrandVisitNum = list?.Max(x => x.BrandVisitNum) ?? 0,
EnterpriseVisitNum = list?.Max(x => x.EnterpriseVisitNum) ?? 0,
NewVisitUV = list?.Sum(x => x.NewVisitUV) ?? 0,
VisitUV = list?.Sum(x => x.VisitUV) ?? 0,
Visit_Total = list?.Sum(x => x.Visit_Total) ?? 0,
Visit_Total = list?.Max(x => x.Visit_Total) ?? 0,
Share_PV = list?.Sum(x => x.Share_PV) ?? 0,
Share_UV = list?.Sum(x => x.Share_UV) ?? 0,
Session_CNT = list?.Sum(x => x.Session_CNT) ?? 0,
Visit_PV = list?.Sum(x => x.Visit_PV) ?? 0,
Visit_UV = list?.Sum(x => x.Visit_UV) ?? 0,
Visit_UV_New = list?.Sum(x => x.Visit_UV_New) ?? 0,
Stay_Time_UV = list?.Sum(x => x.Stay_Time_UV) ?? 0,
Stay_Time_Session = list?.Sum(x => x.Stay_Time_Session) ?? 0,
Visit_Depth = list?.Sum(x => x.Visit_Depth) ?? 0,
Stay_Time_UV = list?.Max(x => x.Stay_Time_UV) ?? 0,
Stay_Time_Session = list?.Min(x => x.Stay_Time_Session) ?? 0,
Visit_Depth = list?.Min(x => x.Visit_Depth) ?? 0,
};
return ApiResult.Success(data: result);
}
......
Mall.WebApi/Controllers/User/AppletLoginController.cs
View file @ f0c3d655
......@@ -23,6 +23,9 @@ using Dnc.Api.Throttle;
using Microsoft.AspNetCore.Authorization;
using Mall.WebApi.Helper;
using Mall.Module.BaseSetUp;
using Mall.CacheManager.AppletWeChat;
using NPOI.SS.Formula.Functions;
using Mall.WeChat.Common;
namespace Mall.WebApi.Controllers.User
{
......@@ -291,7 +294,7 @@ namespace Mall.WebApi.Controllers.User
TenantId = demodel.TenantId,
Name = demodel.Name,
OpenId = demodel.OpenId,
Unoinid=demodel.Unoinid,
Unoinid = demodel.Unoinid,
Photo = demodel.Photo,
MemberGradeId = demodel.MemberGrade ?? 0,
Source = demodel.Source,
......@@ -306,10 +309,11 @@ namespace Mall.WebApi.Controllers.User
IsAddBaseInfo = 0,
IsOpenMiAi = mmodel.IsOpenMiAi,
IsAdmin = 0,
UserGroupIds=demodel.BelongGroupIds,
UserGroupIds = demodel.BelongGroupIds,
};
UserReidsCache.AppletUserInfoSet(UserModuleCacheKeyConfig.Applet_Login_Info + UserId, appletUserInfo, Config.JwtExpirTime);
if (EduId > 0 && demodel.MallBaseId == 5) {
if (EduId > 0 && demodel.MallBaseId == 5)
{
try
{
//教育 甲小鹤跳转至甲鹤小程序 自动绑定账号信息
......@@ -384,7 +388,7 @@ namespace Mall.WebApi.Controllers.User
TokenUserInfo userInfo = new TokenUserInfo { uid = umodel.Id.ToString(), requestFrom = ApiRequestFromEnum.MiniProgram };
#region 生成Token
string token =ApiTokenHelper.CreateToken(userInfo);
string token = ApiTokenHelper.CreateToken(userInfo);
#endregion
var mmodel = programModule.GetMiniProgramModule(new RB_MiniProgram_Extend() { MallBaseId = umodel.MallBaseId });
//2020-08-12 Add By:W
......@@ -399,7 +403,7 @@ namespace Mall.WebApi.Controllers.User
TenantId = umodel.TenantId,
Name = umodel.Name,
OpenId = umodel.OpenId,
Unoinid=!string.IsNullOrEmpty(umodel.Unoinid)?umodel.Unoinid:demodel.Unoinid,
Unoinid = !string.IsNullOrEmpty(umodel.Unoinid) ? umodel.Unoinid : demodel.Unoinid,
Photo = umodel.Photo,
MemberGradeId = umodel.MemberGrade ?? 0,
Source = demodel.Source,
......@@ -414,15 +418,15 @@ namespace Mall.WebApi.Controllers.User
IsAddBaseInfo = 0,
IsOpenMiAi = mmodel.IsOpenMiAi,
IsAdmin = umodel.IsAdmin,
AdminId=umodel.AdminId,
AdminId = umodel.AdminId,
UserGroupIds = umodel.BelongGroupIds,
};
if (umodel.AdminId > 0)
{
appletUserInfo.AdminToken = ApiTokenHelper.CreateToken(new TokenUserInfo()
{
requestFrom= ApiRequestFromEnum.Web,
uid= umodel.TenantId.ToString(),
requestFrom = ApiRequestFromEnum.Web,
uid = umodel.TenantId.ToString(),
});
}
if (mmodel.IsOpenMiAi == 1)
......@@ -572,7 +576,7 @@ namespace Mall.WebApi.Controllers.User
UserPageType = (Common.Enum.Goods.GoodsPageTypeEnum)parms.GetInt("UserPageType", 0),
CounponPassword = parms.GetInt("CounponPassword", 3),
KeyWord = parms.GetStringValue("KeyWord"),
IsShow=parms.GetInt("IsShow"),
IsShow = parms.GetInt("IsShow"),
LookTimes = parms.GetInt("LookTimes"),
};
List<int> groupIds = new List<int>();
......@@ -622,7 +626,7 @@ namespace Mall.WebApi.Controllers.User
{
return ApiResult.Failed("请选择身高");
}
if (!baseInfo.EducationType.HasValue || (int)baseInfo.EducationType == 0)
{
return ApiResult.Failed("请选择学历");
......@@ -664,7 +668,7 @@ namespace Mall.WebApi.Controllers.User
//验证是否新用户
if (!userModule.ValidateUserOpenId(demodel.OpenId, demodel.Source, requestParm.TenantId, requestParm.MallBaseId))
{
//注册新用户
if (string.IsNullOrEmpty(demodel.Name))
{
......@@ -806,7 +810,7 @@ namespace Mall.WebApi.Controllers.User
}
return ApiResult.CouponFailed(ResultCode.Fail, 1, "");
}
else
{
......@@ -815,7 +819,7 @@ namespace Mall.WebApi.Controllers.User
if (umodel == null)
{
return ApiResult.CouponFailed(ResultCode.Fail, 1, "");
;
;
}
if (umodel.Blacklist == 1)
{
......@@ -835,7 +839,7 @@ namespace Mall.WebApi.Controllers.User
TokenUserInfo userInfo = new TokenUserInfo { uid = umodel.Id.ToString(), requestFrom = ApiRequestFromEnum.MiniProgram };
#region JWT
string token = ApiTokenHelper.CreateToken(userInfo);
#endregion
var mmodel = programModule.GetMiniProgramModule(new RB_MiniProgram_Extend() { MallBaseId = umodel.MallBaseId });
......@@ -952,6 +956,72 @@ namespace Mall.WebApi.Controllers.User
}
return ApiResult.Success("", _telPhone);
}
/// <summary>
/// 获取手机号
/// </summary>
/// <param name="requestMsg"></param>
/// <returns></returns>
[HttpPost]
[RateValve(Policy = Policy.Ip, Limit = 20, Duration = 60)]
public ApiResult GetUserPhoneNumber(object requestMsg)
{
var requestParm = JsonConvert.DeserializeObject<RequestParm>(requestMsg.ToString());
JObject parms = JObject.Parse(requestParm.msg.ToString());
if (requestParm.TenantId <= 0)
{
return ApiResult.ParamIsNull("请传递商户号");
}
if (requestParm.MallBaseId <= 0)
{
return ApiResult.ParamIsNull("请传递小程序id");
}
var mmodel = programModule.GetMiniProgramModule(new RB_MiniProgram_Extend() { MallBaseId = requestParm.MallBaseId });
if ((mmodel?.MallBaseId ?? 0) == 0)
{
return ApiResult.Failed("小程序基本信息获取失败");
}
string code = parms.GetStringValue("Code");
if (string.IsNullOrWhiteSpace(code))
{
return ApiResult.ParamIsNull("请传递手机号获取凭证");
}
string token = WeiXinReidsCache.Get(mmodel.MiniAppId);
if (string.IsNullOrEmpty(token))
{
token = Mall.Common.Pay.WeChatPat.TokenHelper.GetLXYToken(token, mmodel.MiniAppId, mmodel.MiniAppSecret);
System.Threading.Tasks.Task.Run(() => WeiXinReidsCache.Set(mmodel.MiniAppId, token));
}
if (string.IsNullOrEmpty(token))
{
return ApiResult.Failed("获取Token失败");
}
string url = "https://api.weixin.qq.com/wxa/business/getuserphonenumber?access_token=" + token;
var obj = new
{
code =code,
};
string result = Common.Plugin.HttpHelper.HttpPostStr(url, JsonHelper.Serialize(obj));
if (!string.IsNullOrWhiteSpace(result))
{
JObject jObj = JObject.Parse(result);
string errcode = jObj["errcode"].ToString();
if (errcode == "0")
{
string phone_info = jObj["phone_info"].ToString();
JObject phoneInfo = JObject.Parse(phone_info);
string phoneNumber = phoneInfo["phoneNumber"].ToString();
string purePhoneNumber = phoneInfo["purePhoneNumber"].ToString();
string countryCode = phoneInfo["countryCode"].ToString();
return ApiResult.Success("", new { phoneNumber, purePhoneNumber, countryCode });
}
}
return ApiResult.Failed("获取手机号失败");
}
#endregion
}
}
\ No newline at end of file
Mall.WebApi/appsettings.json
View file @ f0c3d655
......@@ -82,6 +82,7 @@
"IsNormalServer": 2,
"IsFirtsShopAutoExamine": 1, //首店企业认证是否自动审核，1-是
"IsCPSWJAutoExamine": 0, //翠屏商务局（商载通）企业认证是否自动审核，1-是
"IsCPSWJSelectAll": "1", //0-表示不显示全部/宜宾/成都 ，1-显示
"FinanceSetting": {
"TenantId": 1,
"MallBaseId": 1,
......
Mall.WindowsService/Module/CuiPingModule.cs
View file @ f0c3d655
......@@ -43,14 +43,24 @@ namespace Mall.WindowsService.Module
/// </summary>
private static RB_Visit_LogRepository _VisitLogRepository = new RB_Visit_LogRepository();
/// <summary>
/// 【商载通】 品牌、企业服务仓储层
/// 【商载通】 品牌服务仓储层
/// </summary>
private static RB_Brand_EnterpriseRepository brand_EnterpriseRepository = new RB_Brand_EnterpriseRepository();
/// <summary>
/// 【商载通】【商载通】楼宇、载体服务仓储层
/// 【商载通】【商载通】载体服务仓储层
/// </summary>
private static RB_Building_CarrierRepository building_CarrierRepository = new RB_Building_CarrierRepository();
/// <summary>
/// 【商载通】 企业服务仓储层
/// </summary>
private static RB_EnterpriseServicesRepository enterpriseServicesRepository = new RB_EnterpriseServicesRepository();
/// <summary>
/// 【商载通】楼宇服务仓储层
/// </summary>
private static RB_BuildingRepository buildingRepository = new RB_BuildingRepository();
/// <summary>
/// 同步小程序统计信息
/// </summary>
......@@ -205,24 +215,32 @@ namespace Mall.WindowsService.Module
#region 新增/总数统计
//品牌 Or 企业
var brandEnterpriseList = brand_EnterpriseRepository.GetBrandEnterpriseBriefRepository(new RB_Brand_Enterprise_Extend { MallBaseId = miniProgramModel.MallBaseId, TenantId = miniProgramModel.TenantId ?? 0 });
var brandEnterpriseList = brand_EnterpriseRepository.GetBrandEnterpriseBriefRepository(new RB_Brand_Enterprise_Extend { MallBaseId = miniProgramModel.MallBaseId, TenantId = miniProgramModel.TenantId ?? 0 },endTime: selectDateStr);
if (brandEnterpriseList != null && brandEnterpriseList.Any())
{
model.BrandNum = brandEnterpriseList?.Where(x => x.CreateDate.ToString("yyyy-MM-dd") == dateTime.ToString("yyyy-MM-dd") && x.BrandEnterpriseType == 1)?.Count() ?? 0;
model.BrandTotalNum = brandEnterpriseList?.Where(x => x.BrandEnterpriseType == 1)?.Count() ?? 0;
model.EnterpriseNum = brandEnterpriseList?.Where(x => x.CreateDate.ToString("yyyy-MM-dd") == dateTime.ToString("yyyy-MM-dd") && x.BrandEnterpriseType == 2)?.Count() ?? 0;
model.EnterpriseTotalNum = brandEnterpriseList?.Where(x => x.BrandEnterpriseType == 2)?.Count() ?? 0;
model.BrandNum = brandEnterpriseList?.Where(x => x.CreateDate.ToString("yyyy-MM-dd") == dateTime.ToString("yyyy-MM-dd") )?.Count() ?? 0;
model.BrandTotalNum = brandEnterpriseList?.Count() ?? 0;
}
var enterpriseList = enterpriseServicesRepository.GetEnterpriseServicesBriefListRepository(new RB_EnterpriseServices_Extend { MallBaseId = miniProgramModel.MallBaseId, TenantId = miniProgramModel.TenantId ?? 0 }, endTime: selectDateStr);
if (enterpriseList != null && enterpriseList.Any())
{
model.EnterpriseNum = enterpriseList?.Where(x => x.CreateDate.ToString("yyyy-MM-dd") == dateTime.ToString("yyyy-MM-dd") )?.Count() ?? 0;
model.EnterpriseTotalNum = enterpriseList?.Count() ?? 0;
}
//楼宇 Or 载体信息
var buildingCarrierList = building_CarrierRepository.GetBuildingCarrierBriefListRepository(new RB_Building_Carrier_Extend { MallBaseId = miniProgramModel.MallBaseId, TenantId = miniProgramModel.TenantId ?? 0 });
var buildingCarrierList = building_CarrierRepository.GetBuildingCarrierBriefListRepository(new RB_Building_Carrier_Extend { MallBaseId = miniProgramModel.MallBaseId, TenantId = miniProgramModel.TenantId ?? 0 }, endTime: selectDateStr);
if (buildingCarrierList != null && buildingCarrierList.Any())
{
model.CarrierNum = buildingCarrierList?.Where(x => x.CreateDate.ToString("yyyy-MM-dd") == dateTime.ToString("yyyy-MM-dd") && x.BuildingCarrierType == 1)?.Count() ?? 0;
model.CarrierTotalNum = buildingCarrierList?.Where(x => x.BuildingCarrierType == 1)?.Count() ?? 0;
model.BuildingCarrierNum = buildingCarrierList?.Where(x => x.CreateDate.ToString("yyyy-MM-dd") == dateTime.ToString("yyyy-MM-dd") && x.BuildingCarrierType == 2)?.Count() ?? 0;
model.BuildingCarrierTotalNum = buildingCarrierList?.Where(x => x.BuildingCarrierType == 2)?.Count() ?? 0;
model.CarrierNum = buildingCarrierList?.Where(x => x.CreateDate.ToString("yyyy-MM-dd") == dateTime.ToString("yyyy-MM-dd") )?.Count() ?? 0;
model.CarrierTotalNum = buildingCarrierList?.Count() ?? 0;
}
var buildingList = buildingRepository.GetBuildingBriefRepository(new RB_Building_Extend { MallBaseId = miniProgramModel.MallBaseId, TenantId = miniProgramModel.TenantId ?? 0 }, endTime: selectDateStr);
if (buildingList != null && buildingList.Any())
{
model.BuildingCarrierNum = buildingList?.Where(x => x.CreateDate.ToString("yyyy-MM-dd") == dateTime.ToString("yyyy-MM-dd") )?.Count() ?? 0;
model.BuildingCarrierTotalNum = buildingList?.Count() ?? 0;
}
#endregion
......
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