Переглянути джерело

调整开店宝异步回调逻辑

lichunlei 3 роки тому
батько
коміт
8ddac94fbf

+ 2 - 2
AppStart/Helper/Profit/ProfitHelperV2.cs

@@ -547,7 +547,7 @@ namespace MySystem
                                                     // 分润补贴
                                                     // 分润补贴
                                                     if (level == 1)
                                                     if (level == 1)
                                                     {
                                                     {
-                                                        int SubsidyUserId = selfUser.ParentUserId; // TODO: 确定是否100%是上级
+                                                        int SubsidyUserId = selfUser.ParentUserId;
                                                         Users subuser = dbnew.Users.FirstOrDefault(m => m.Id == SubsidyUserId) ?? new Users();
                                                         Users subuser = dbnew.Users.FirstOrDefault(m => m.Id == SubsidyUserId) ?? new Users();
                                                         int subUserLevel = subuser.UserLevel;
                                                         int subUserLevel = subuser.UserLevel;
                                                         if (subUserLevel < 5)
                                                         if (subUserLevel < 5)
@@ -723,7 +723,7 @@ namespace MySystem
                                                             DirectFlag = selfUser.Id == user.Id ? 1 : 0,
                                                             DirectFlag = selfUser.Id == user.Id ? 1 : 0,
                                                             IsSubsidy = 0,
                                                             IsSubsidy = 0,
                                                             TradeAmount = ProfitDirectTradeAmt,
                                                             TradeAmount = ProfitDirectTradeAmt,
-                                                            HelpFlag = 0,
+                                                            HelpFlag = 2,
                                                         });
                                                         });
                                                     }
                                                     }
                                                 }
                                                 }

+ 1 - 1
AppStart/Helper/SetDepositPostService.cs

@@ -281,7 +281,7 @@ namespace MySystem
                                 SetRecordResult(db, RecordId, 1, "设置成功");
                                 SetRecordResult(db, RecordId, 1, "设置成功");
                                 db.SaveChanges();
                                 db.SaveChanges();
                             }
                             }
-                            else
+                            else if(obj["status"].ToString() == "HANDLE_STATUS_FAIL")
                             {
                             {
                                 edit.SeoDescription = "设置失败";
                                 edit.SeoDescription = "设置失败";
                                 SetRecordResult(db, RecordId, -1, "设置失败");
                                 SetRecordResult(db, RecordId, -1, "设置失败");

+ 28 - 28
Startup.cs

@@ -91,8 +91,8 @@ namespace MySystem
             // services.AddHostedService<SycnSpTimer>(); //同步SP数据
             // services.AddHostedService<SycnSpTimer>(); //同步SP数据
 
 
             // services.AddHostedService<TimerStatTimer>(); //实时统计创客、激活商户数
             // services.AddHostedService<TimerStatTimer>(); //实时统计创客、激活商户数
-            // services.AddHostedService<PosTradeStatTimer>(); // 统计头天的交易额、商户型创客、激活奖励、开机奖励
-            // services.AddHostedService<AlipayPayBack2Timer>(); //支付宝回调处理
+            services.AddHostedService<PosTradeStatTimer>(); // 统计头天的交易额、商户型创客、激活奖励、开机奖励
+            services.AddHostedService<AlipayPayBack2Timer>(); //支付宝回调处理
 
 
             //services.AddHttpContextAccessor();
             //services.AddHttpContextAccessor();
 
 
@@ -106,11 +106,11 @@ namespace MySystem
             MySystemLib.SystemPublicFuction.checkurl = checkurl;
             MySystemLib.SystemPublicFuction.checkurl = checkurl;
             MySystemLib.SystemPublicFuction.appcheck = "success";
             MySystemLib.SystemPublicFuction.appcheck = "success";
             Dictionary<string, Dictionary<string, string>> tables = new Dictionary<string, Dictionary<string, string>>();
             Dictionary<string, Dictionary<string, string>> tables = new Dictionary<string, Dictionary<string, string>>();
-            System.Data.DataTable tablecollection = Library.dbconn.dtable("select DISTINCT TABLE_NAME from information_schema.columns where table_schema = 'KxsMainServer2'");
+            System.Data.DataTable tablecollection = Library.dbconn.dtable("select DISTINCT TABLE_NAME from information_schema.columns where table_schema = 'KxsMainServer'");
             foreach (System.Data.DataRow subtable in tablecollection.Rows)
             foreach (System.Data.DataRow subtable in tablecollection.Rows)
             {
             {
                 Dictionary<string, string> Columns = new Dictionary<string, string>();
                 Dictionary<string, string> Columns = new Dictionary<string, string>();
-                System.Data.DataTable columncollection = Library.dbconn.dtable("select COLUMN_NAME,DATA_TYPE from information_schema.columns where table_schema = 'KxsMainServer2' and TABLE_NAME='" + subtable["TABLE_NAME"].ToString() + "'");
+                System.Data.DataTable columncollection = Library.dbconn.dtable("select COLUMN_NAME,DATA_TYPE from information_schema.columns where table_schema = 'KxsMainServer' and TABLE_NAME='" + subtable["TABLE_NAME"].ToString() + "'");
                 foreach (System.Data.DataRow column in columncollection.Rows)
                 foreach (System.Data.DataRow column in columncollection.Rows)
                 {
                 {
                     string datatype = column["DATA_TYPE"].ToString();
                     string datatype = column["DATA_TYPE"].ToString();
@@ -185,33 +185,33 @@ namespace MySystem
             });
             });
 
 
             //必须打开的
             //必须打开的
-            // ActiveRewardTimer.Instance.Start(); //实时处理激活记录
-            // ChangePosTimer.Instance.Start(); //售后换新执行机具数据转移
-            // 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();
+            ActiveRewardTimer.Instance.Start(); //实时处理激活记录
+            ChangePosTimer.Instance.Start(); //售后换新执行机具数据转移
+            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();
             // StatService.Instance.StatUserLevel(); //升级并分润
             // StatService.Instance.StatUserLevel(); //升级并分润
             //必须打开的
             //必须打开的
 
 
-            // HelpProfitHelper.Instance.Start();
-            // HelpProfitPreMerchantHelper.Instance.Start();
-            // SetDepositService.Instance.Start(); //调整费率(通知、标记)
-            // SetDepositPostService.Instance.Start(); //提交支付公司设置费率接口
-            // SetDepositPostService.Instance.StartKdb(); //监控开店宝费率设置结果
-            // SetFeeFlagService.Instance.Start(); //178天提前通知创客费率调升消息
+            HelpProfitHelper.Instance.Start();
+            HelpProfitPreMerchantHelper.Instance.Start();
+            SetDepositService.Instance.Start(); //调整费率(通知、标记)
+            SetDepositPostService.Instance.Start(); //提交支付公司设置费率接口
+            SetDepositPostService.Instance.StartKdb(); //监控开店宝费率设置结果
+            SetFeeFlagService.Instance.Start(); //178天提前通知创客费率调升消息
 
 
             // StatService.Instance.StartPosActNum(); //实时统计激活数
             // StatService.Instance.StartPosActNum(); //实时统计激活数
             // StatService.Instance.StartNewUserNum(); //实时统计新增创客数
             // StatService.Instance.StartNewUserNum(); //实时统计新增创客数