恢复代码

AppStart/Helper/Profit/ProfitHelper.cs

@@ -1772,7 +1772,7 @@ namespace MySystem
             }
             function.WritePage("/ProfitStat/", Month + ".txt", DateTime.Now.ToString());
             WebCMSEntities db = new WebCMSEntities();
-            for (int i = 7; i <= 7; i++) //品牌
+            for (int i = 1; i <= 7; i++) //品牌
             {
                 for (int j = 0; j <= 1; j++) //卡类型
                 {
@@ -2088,13 +2088,13 @@ namespace MySystem
                     select SubsidyUserId,MerchantId,BrandId,SubsidyType,
                     sum(CreditTradeAmt) as CreditTradeAmt,
                     sum(SubsidyProfitRate) as SubsidyProfit
-                    from ProfitSubsidyDetail 
+                    from ProfitSubsidyDetail where TradeMonth='202208' 
                     GROUP BY SubsidyUserId,MerchantId,BrandId,SubsidyType
                     ) tb 
                     left join Users u on tb.SubsidyUserId=u.Id 
                     LEFT JOIN KqProducts k ON k.Id=tb.BrandId 
                     left join PosMerchantInfo m on tb.MerchantId=m.Id 
-                    left join UserRankWhite r on u.Id=r.Id 
+                    left join UserRankWhite r on u.Id=r.Id and r.CreateDate<'2022-09-01 00:00:00'
 
                     // TODO:做到后台查询，换绑机器遗漏交易额补差
                     select UserId,sum(TradeAmount) from TradeRecord where SnNo in (

AppStart/Helper/Profit/ProfitHelperV2.cs

@@ -56,7 +56,7 @@ namespace MySystem
             }
             function.WritePage("/ProfitStat/", Date + ".txt", DateTime.Now.ToString());
             WebCMSEntities db = new WebCMSEntities();
-            for (int i = 7; i <= 7; i++) //品牌
+            for (int i = 1; i <= 7; i++) //品牌
             {
                 for (int j = 0; j <= 1; j++) //卡类型
                 {
@@ -368,12 +368,12 @@ namespace MySystem
                     sum(NotHelpCreditTradeProfit) as NotHelpCreditTradeProfit,
                     sum(DebitNonCapTradeAmt+DebitCapTradeAmt) as DebitTradeAmt,
                     sum(DebitNonTradeCapProfit+DebitTradeCapProfit) as DebitTradeProfit 
-                    from ProfitRewardRecord where TradeMonth='202206' 
+                    from ProfitRewardRecord where TradeMonth='202208' 
                     GROUP BY UserId,ProfitType,BrandId
                     ) tb 
                     left join Users u on tb.UserId=u.Id 
                     LEFT JOIN KqProducts k ON k.Id=tb.BrandId 
-                    left join UserRankWhite r on u.Id=r.Id 
+                    left join UserRankWhite r on u.Id=r.Id and r.CreateDate<'2022-09-01 00:00:00' 
                     ORDER BY u.MakerCode
 
                     //查补贴

Startup.cs

@@ -91,8 +91,8 @@ namespace MySystem
             // services.AddHostedService<SycnSpTimer>(); //同步SP数据
 
             // services.AddHostedService<TimerStatTimer>(); //实时统计创客、激活商户数
-            // services.AddHostedService<PosTradeStatTimer>(); // 统计头天的交易额、商户型创客、激活奖励、开机奖励
-            // services.AddHostedService<AlipayPayBack2Timer>(); //支付宝回调处理
+            services.AddHostedService<PosTradeStatTimer>(); // 统计头天的交易额、商户型创客、激活奖励、开机奖励
+            services.AddHostedService<AlipayPayBack2Timer>(); //支付宝回调处理
 
             //services.AddHttpContextAccessor();
 
@@ -190,28 +190,28 @@ namespace MySystem
             // TradeStatTimer2.Instance.Start(); //交易统计
 
             //必须打开的
-            // ActiveRewardTimer.Instance.Start(); //实时处理激活记录
-            // TradeStatTimer.Instance.Start(); //交易统计
-            // ChangePosTimer.Instance.Start(); //售后换新执行机具数据转移
-            // MakeReferenceQrCodeService.Instance.StartListen(); //生成创客邀请二维码
-            // SycnSpBindService.Instance.Start(); //同步SP绑定数据
-            // SycnSpMerchantService.Instance.Start(); //同步SP商户数据
-            // SycnSpActiveService.Instance.Start(); //同步SP激活数据
-            // SycnSpTradeService.Instance.Start(); //同步SP交易数据
-            // SycnSpChangeBindService.Instance.Start(); //同步SP换绑数据
-            // SycnSpUnBindService.Instance.Start(); //同步SP解绑数据
-            // RedPackageV2Helper.Instance.Start(); //每天生成红包
-            // RedPackageV2Helper.Instance.StartStatTop10(); //红包活动统计排行
-            // RedPackageV2Helper.Instance.StartSendPrize(); //红包活动发奖
-            // BalancePayBackService.Instance.Start(); //余额支付队列
-            // ReservePayBackService.Instance.Start(); //储备金支付队列
-            // LeaderPrizeService.Instance.Start(); //大盟主奖励发奖
-            // MessageCenterService.Instance.Start(); // 消息队列
-            // RecommendActStatService.Instance.Start(); //推荐王奖励数据统计
+            ActiveRewardTimer.Instance.Start(); //实时处理激活记录
+            TradeStatTimer.Instance.Start(); //交易统计
+            ChangePosTimer.Instance.Start(); //售后换新执行机具数据转移
+            MakeReferenceQrCodeService.Instance.StartListen(); //生成创客邀请二维码
+            SycnSpBindService.Instance.Start(); //同步SP绑定数据
+            SycnSpMerchantService.Instance.Start(); //同步SP商户数据
+            SycnSpActiveService.Instance.Start(); //同步SP激活数据
+            SycnSpTradeService.Instance.Start(); //同步SP交易数据
+            SycnSpChangeBindService.Instance.Start(); //同步SP换绑数据
+            SycnSpUnBindService.Instance.Start(); //同步SP解绑数据
+            RedPackageV2Helper.Instance.Start(); //每天生成红包
+            RedPackageV2Helper.Instance.StartStatTop10(); //红包活动统计排行
+            RedPackageV2Helper.Instance.StartSendPrize(); //红包活动发奖
+            BalancePayBackService.Instance.Start(); //余额支付队列
+            ReservePayBackService.Instance.Start(); //储备金支付队列
+            LeaderPrizeService.Instance.Start(); //大盟主奖励发奖
+            MessageCenterService.Instance.Start(); // 消息队列
+            RecommendActStatService.Instance.Start(); //推荐王奖励数据统计
             //必须打开的
 
-            // StoreApplyHelper.Instance.Start(); // 每月1号重置仓库额度
-            // StoreApplyHelper.Instance.StartEverTime();
+            StoreApplyHelper.Instance.Start(); // 每月1号重置仓库额度
+            StoreApplyHelper.Instance.StartEverTime();
             // StatService.Instance.StartPosActNum(); //实时统计激活数
             // StatService.Instance.StartNewUserNum(); //实时统计新增创客数
             // StatService.Instance.StatProfit(); //实时统计创客收益
@@ -219,8 +219,8 @@ namespace MySystem
             // StatService.Instance.StartEverDay("");
             // StatService.Instance.StartEverDayV2();
             // RedPackageHelper.Instance.Start();
-            // StatService.Instance.StatUserLevel();
-            ProfitHelperV2.Instance.StatProfit(); //统计分润
+            StatService.Instance.StatUserLevel();
+            // ProfitHelperV2.Instance.StatProfit(); //统计分润
             // StatService.Instance.ListenFluxRecord();
             // StatService.Instance.StartEverDay2();
             // TestHelper.Instance.Start();