1

Mall.Module.TradePavilion/BuildingCarrierModule_V2.cs

@@ -145,7 +145,7 @@ namespace Mall.Module.TradePavilion
                 keyValues.Add(nameof(RB_CompanyEnterprise_Extend.CompanyStatus), 0);
                 keyValues.Add(nameof(RB_CompanyEnterprise_Extend.RejectRemark), "");
             }
-           
+
             List<WhereHelper> wheres = new List<WhereHelper>()
             {
                 new WhereHelper()
@@ -217,7 +217,7 @@ namespace Mall.Module.TradePavilion
                 {
                     if (Config.IsCPSWJAutoExamine == "1")//自动审核
                     {
-                      
+
                         try
                         {
                             var BrandModel = oldList?.FirstOrDefault();
@@ -819,7 +819,7 @@ namespace Mall.Module.TradePavilion
         public RB_CompanyEnterprise_Extend GetCompanyByUserIdModule(int userId)
         {
             var model = companyEnterpriseRepository.GetCompanyRepository(new RB_CompanyEnterprise_Extend() { CreateBy = userId });
-            
+
             if (model != null && model.CompanyId > 0)
             {
                 model.RejectRemark = model?.RejectRemark ?? "";
@@ -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)
                     {
@@ -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)
                     {
@@ -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)
                     {
@@ -1123,6 +1150,14 @@ namespace Mall.Module.TradePavilion
                                 };
                             }
                         }
+                        else
+                        {
+                            model.BrandModel = new RB_BrandEnterpriseApplyFor_Extend
+                            {
+                                BannerList = new List<string>(),
+                                CustomerTypeInfo = new List<string>()
+                            };
+                        }
                     }
                 }
             }

Mall.WebApi/Controllers/TradePavilion/TradeController.cs

@@ -4195,9 +4195,9 @@ namespace Mall.WebApi.Controllers.TradePavilion
                 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?.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,
+                Stay_Time_UV = list?.Average(x => x.Stay_Time_UV) ?? 0,
+                Stay_Time_Session = list?.Average(x => x.Stay_Time_Session) ?? 0,
+                Visit_Depth = list?.Average(x => x.Visit_Depth) ?? 0,
             };
             return ApiResult.Success(data: result);
         }

Mall.WindowsService/Mall.WindowsService.csproj.user

 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <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>
   <ItemGroup>
     <Compile Update="WindowsService.cs">

Mall.WindowsService/Module/CuiPingModule.cs

@@ -81,7 +81,7 @@ namespace Mall.WindowsService.Module
                             var miniProgramModel = miniProgramRepository.GetEntity(Convert.ToInt32(item));
                             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();
                                 model.TenantId = miniProgramModel.TenantId ?? 0;
                                 model.MallBaseId = miniProgramModel.MallBaseId;
@@ -102,14 +102,12 @@ namespace Mall.WindowsService.Module
                                     end_date = refDate,
                                 };
                                 string token = WeiXinReidsCache.Get(miniProgramModel.MiniAppId);
+                                LogHelper.WriteInfo("token:" + token);
                                 if (string.IsNullOrEmpty(token))
                                 {
                                     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));
-                                }
-                                if (string.IsNullOrEmpty(token))
-                                {
-                                    return false;
+                                    LogHelper.WriteInfo("token1:" + token);
                                 }
                                 if (!string.IsNullOrEmpty(token))
                                 {
@@ -215,11 +213,11 @@ namespace Mall.WindowsService.Module
 
                                 #region 新增/总数统计
                                 //品牌 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())
                                 {
-                                    model.BrandNum = brandEnterpriseList?.Where(x => x.CreateDate.ToString("yyyy-MM-dd") ==  selectDateStr)?.Count() ?? 0;
+                                    model.BrandNum = brandEnterpriseList?.Where(x => x.CreateDate.ToString("yyyy-MM-dd") == selectDateStr)?.Count() ?? 0;
                                     model.BrandTotalNum = brandEnterpriseList?.Count() ?? 0;
                                 }
                                 var enterpriseList = enterpriseServicesRepository.GetEnterpriseServicesBriefListRepository(new RB_EnterpriseServices_Extend { MallBaseId = miniProgramModel.MallBaseId, TenantId = miniProgramModel.TenantId ?? 0 }, endTime: selectDateStr);

Mall.WindowsService/Program.cs

@@ -7,9 +7,9 @@ namespace Mall.WindowsService
     {
         static void Main(string[] args)
         {
-            //Module.CuiPingModule.AddWechatStatistics();
-            ServiceBase[] services = new ServiceBase[] { new WindowsService() };
-            ServiceBase.Run(services);
+          // Module.CuiPingModule.AddWechatStatistics();
+             ServiceBase[] services = new ServiceBase[] { new WindowsService() };
+             ServiceBase.Run(services);
         }
     }
 }