Commit 053dfbc0 authored by 吴春's avatar 吴春

1

parent 50470507
...@@ -1013,6 +1013,15 @@ namespace Mall.Module.TradePavilion ...@@ -1013,6 +1013,15 @@ namespace Mall.Module.TradePavilion
}; };
} }
} }
else
{
model.BrandModel = new RB_BrandEnterpriseApplyFor_Extend
{
BannerList = new List<string>(),
CustomerTypeInfo = new List<string>(),
PropertyDemandList = new List<string>(),
};
}
} }
else if (model.FirstShopType == 2) else if (model.FirstShopType == 2)
{ {
...@@ -1053,6 +1062,16 @@ namespace Mall.Module.TradePavilion ...@@ -1053,6 +1062,16 @@ namespace Mall.Module.TradePavilion
} }
else
{
model.CarrierModel = new RB_CarrierEnterpriseApplyFor_Extend
{
CarrierMetroList = new List<RB_CarrierEnterpriseMetroApplyFor_Extend>(),
BannerList = new List<string>(),
HonorList = new List<string>(),
FirstShopNumList = new List<FirstShopNumModel>(),
};
}
} }
else if (model.FirstShopType == 3) else if (model.FirstShopType == 3)
{ {
...@@ -1088,6 +1107,14 @@ namespace Mall.Module.TradePavilion ...@@ -1088,6 +1107,14 @@ namespace Mall.Module.TradePavilion
}; };
} }
} }
else
{
model.BrandModel = new RB_BrandEnterpriseApplyFor_Extend
{
BannerList = new List<string>(),
CustomerTypeInfo = new List<string>()
};
}
} }
else if (model.FirstShopType == 4) else if (model.FirstShopType == 4)
{ {
...@@ -1123,6 +1150,14 @@ namespace Mall.Module.TradePavilion ...@@ -1123,6 +1150,14 @@ namespace Mall.Module.TradePavilion
}; };
} }
} }
else
{
model.BrandModel = new RB_BrandEnterpriseApplyFor_Extend
{
BannerList = new List<string>(),
CustomerTypeInfo = new List<string>()
};
}
} }
} }
} }
......
...@@ -4195,9 +4195,9 @@ namespace Mall.WebApi.Controllers.TradePavilion ...@@ -4195,9 +4195,9 @@ namespace Mall.WebApi.Controllers.TradePavilion
Visit_PV = list?.Sum(x => x.Visit_PV) ?? 0, Visit_PV = list?.Sum(x => x.Visit_PV) ?? 0,
Visit_UV = list?.Sum(x => x.Visit_UV) ?? 0, Visit_UV = list?.Sum(x => x.Visit_UV) ?? 0,
Visit_UV_New = list?.Sum(x => x.Visit_UV_New) ?? 0, Visit_UV_New = list?.Sum(x => x.Visit_UV_New) ?? 0,
Stay_Time_UV = list?.Max(x => x.Stay_Time_UV) ?? 0, Stay_Time_UV = list?.Average(x => x.Stay_Time_UV) ?? 0,
Stay_Time_Session = list?.Min(x => x.Stay_Time_Session) ?? 0, Stay_Time_Session = list?.Average(x => x.Stay_Time_Session) ?? 0,
Visit_Depth = list?.Min(x => x.Visit_Depth) ?? 0, Visit_Depth = list?.Average(x => x.Visit_Depth) ?? 0,
}; };
return ApiResult.Success(data: result); return ApiResult.Success(data: result);
} }
......
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Project ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup> <PropertyGroup>
<_LastSelectedProfileId>D:\project\GitProject\Mall\oldMall\Mall.WindowsService\Properties\PublishProfiles\FolderProfile.pubxml</_LastSelectedProfileId> <_LastSelectedProfileId>E:\working\mallapi\Mall.WindowsService\Properties\PublishProfiles\FolderProfile.pubxml</_LastSelectedProfileId>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<Compile Update="WindowsService.cs"> <Compile Update="WindowsService.cs">
......
...@@ -81,7 +81,7 @@ namespace Mall.WindowsService.Module ...@@ -81,7 +81,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);//Convert.ToDateTime("2024-12-09");// DateTime dateTime =DateTime.Now.AddDays(-1);// Convert.ToDateTime("2024-12-25");//
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;
...@@ -102,14 +102,12 @@ namespace Mall.WindowsService.Module ...@@ -102,14 +102,12 @@ namespace Mall.WindowsService.Module
end_date = refDate, end_date = refDate,
}; };
string token = WeiXinReidsCache.Get(miniProgramModel.MiniAppId); string token = WeiXinReidsCache.Get(miniProgramModel.MiniAppId);
LogHelper.WriteInfo("token:" + token);
if (string.IsNullOrEmpty(token)) if (string.IsNullOrEmpty(token))
{ {
token = Mall.Common.Pay.WeChatPat.TokenHelper.GetLXYToken(token, miniProgramModel.MiniAppId, miniProgramModel.MiniAppSecret); token = Mall.Common.Pay.WeChatPat.TokenHelper.GetLXYToken(token, miniProgramModel.MiniAppId, miniProgramModel.MiniAppSecret);
System.Threading.Tasks.Task.Run(() => WeiXinReidsCache.Set(DataConstant.DATA_WeiXinToken + miniProgramModel.MiniAppId, token)); System.Threading.Tasks.Task.Run(() => WeiXinReidsCache.Set(DataConstant.DATA_WeiXinToken + miniProgramModel.MiniAppId, token));
} LogHelper.WriteInfo("token1:" + token);
if (string.IsNullOrEmpty(token))
{
return false;
} }
if (!string.IsNullOrEmpty(token)) if (!string.IsNullOrEmpty(token))
{ {
...@@ -215,7 +213,7 @@ namespace Mall.WindowsService.Module ...@@ -215,7 +213,7 @@ namespace Mall.WindowsService.Module
#region 新增/总数统计 #region 新增/总数统计
//品牌 Or 企业 //品牌 Or 企业
var brandEnterpriseList = brand_EnterpriseRepository.GetBrandEnterpriseBriefRepository(new RB_Brand_Enterprise_Extend { MallBaseId = miniProgramModel.MallBaseId, TenantId = miniProgramModel.TenantId ?? 0 },endTime: selectDateStr); var brandEnterpriseList = brand_EnterpriseRepository.GetBrandEnterpriseBriefRepository(new RB_Brand_Enterprise_Extend { MallBaseId = miniProgramModel.MallBaseId, TenantId = miniProgramModel.TenantId ?? 0 }, endTime: selectDateStr);
if (brandEnterpriseList != null && brandEnterpriseList.Any()) if (brandEnterpriseList != null && brandEnterpriseList.Any())
{ {
......
...@@ -7,7 +7,7 @@ namespace Mall.WindowsService ...@@ -7,7 +7,7 @@ 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