Преглед на файлове

调整重置创客交易额

lcl преди 1 година
родител
ревизия
67406fbd19
променени са 3 файла, в които са добавени 112 реда и са изтрити 110 реда
  1. 53 38
      AppStart/Helper/StatResetService.cs
  2. 43 62
      Controllers/HomeController.cs
  3. 16 10
      appsettings.json

+ 53 - 38
AppStart/Helper/StatResetService.cs

@@ -48,56 +48,71 @@ namespace MySystem
         {
             JsonData jsonObj = JsonMapper.ToObject(content);
             string BrandId = jsonObj["BrandId"].ToString();
-            string TradeDate = jsonObj[prop_name: "TradeDate"].ToString();
+            string TradeDate = jsonObj["TradeDate"].ToString();
             function.WriteLog(DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss.fff"), "重置创客交易额日志");
             WebCMSEntities db = new WebCMSEntities();
-            using (var tran = db.Database.BeginTransaction())
+            try
             {
-                try
+                string TradeDateStr = TradeDate.Replace("-", "");
+                CustomerSqlConn.op("delete from TradeDaySummary where TradeDate='" + TradeDateStr + "' and BrandId in (" + BrandId + ")", AppConfig.Base.SqlConn);
+                CustomerSqlConn.op("delete from TradeDaySummary2 where TradeDate='" + TradeDateStr + "' and BrandId in (" + BrandId + ")", AppConfig.Base.SqlConn);
+                CustomerSqlConn.op("delete from TradeDaySummaryBefore where TradeDate='" + TradeDateStr + "' and BrandId in (" + BrandId + ")", AppConfig.Base.SqlConn);
+                CustomerSqlConn.op("delete from TradeDaySummary2Before where TradeDate='" + TradeDateStr + "' and BrandId in (" + BrandId + ")", AppConfig.Base.SqlConn);
+                CustomerSqlConn.op("delete from TradeDaySummaryAfter where TradeDate='" + TradeDateStr + "' and BrandId in (" + BrandId + ")", AppConfig.Base.SqlConn);
+                CustomerSqlConn.op("delete from TradeDaySummary2After where TradeDate='" + TradeDateStr + "' and BrandId in (" + BrandId + ")", AppConfig.Base.SqlConn);
+                string startId = "20000000";
+                bool op = true;
+                while(op)
                 {
-                    DataTable selfDt = CustomerSqlConn.dtable("select UserId,ParentNav,BrandId,BankCardType,QrPayFlag,MerHelpFlag,Version,CapFlag,VipFlag,PayType,DATE_FORMAT(CreateDate,'%Y%m%d'),sum(TradeAmount),count(Id),SnNo from TradeRecord where Id>15000000 and CreateDate>='" + TradeDate + " 00:00:00' and CreateDate<='" + TradeDate + " 23:59:59' and BrandId in (" + BrandId + ") group by UserId,ParentNav,BrandId,BankCardType,QrPayFlag,MerHelpFlag,Version,CapFlag,VipFlag,PayType,DATE_FORMAT(CreateDate,'%Y%m%d'),SnNo", AppConfig.Base.SqlConn);
-                    if (selfDt.Rows.Count > 0)
+                    string sql = "select Id from TradeRecord where Id>" + startId + " and CreateDate>='" + TradeDate + " 00:00:00' and CreateDate<='" + TradeDate + " 23:59:59' and BrandId in (" + BrandId + ") order by Id limit 50";
+                    DataTable idsDt = CustomerSqlConn.dtable(sql, AppConfig.Base.SqlConn);
+                    if(idsDt.Rows.Count > 0)
                     {
-                        string TradeDateStr = TradeDate.Replace("-", "");
-                        CustomerSqlConn.op("delete from TradeDaySummary where TradeDate='" + TradeDateStr + "' and BrandId in (" + BrandId + ")", AppConfig.Base.SqlConn);
-                        CustomerSqlConn.op("delete from TradeDaySummary2 where TradeDate='" + TradeDateStr + "' and BrandId in (" + BrandId + ")", AppConfig.Base.SqlConn);
-                        CustomerSqlConn.op("delete from TradeDaySummaryBefore where TradeDate='" + TradeDateStr + "' and BrandId in (" + BrandId + ")", AppConfig.Base.SqlConn);
-                        CustomerSqlConn.op("delete from TradeDaySummary2Before where TradeDate='" + TradeDateStr + "' and BrandId in (" + BrandId + ")", AppConfig.Base.SqlConn);
-                        CustomerSqlConn.op("delete from TradeDaySummaryAfter where TradeDate='" + TradeDateStr + "' and BrandId in (" + BrandId + ")", AppConfig.Base.SqlConn);
-                        CustomerSqlConn.op("delete from TradeDaySummary2After where TradeDate='" + TradeDateStr + "' and BrandId in (" + BrandId + ")", AppConfig.Base.SqlConn);
-                        function.WriteLog("统计人数:" + selfDt.Rows.Count + "\n\n", "重置创客交易额日志");
-                        foreach (DataRow selfDr in selfDt.Rows)
+                        string ids = "";
+                        foreach (DataRow idsDr in idsDt.Rows)
                         {
-                            StatService.Instance.StatTrade(db, selfDr);
-
-                            int UserId = int.Parse(selfDr["UserId"].ToString());
-                            string SnNo = selfDr["SnNo"].ToString();
-                            PosMachinesTwo pos = db.PosMachinesTwo.FirstOrDefault(m => m.PosSn == SnNo) ?? new PosMachinesTwo();
-                            if (UserId == 0)
-                            {
-                                UserId = pos.UserId;
-                            }
-                            Users user = db.Users.FirstOrDefault(m => m.Id == UserId) ?? new Users();
-                            string ParentNav = user.ParentNav; //selfDr["ParentNav"].ToString();
-                            if (pos.BindingTime < DateTime.Parse("2023-07-01 00:00:00"))
-                            {
-                                Stat2Service.Instance.StatBefore(db, selfDr, UserId, ParentNav);
-                            }
-                            else
+                            ids += idsDr["Id"].ToString() + ",";
+                            startId = idsDr["Id"].ToString();
+                        }
+                        DataTable selfDt = CustomerSqlConn.dtable("select UserId,ParentNav,BrandId,BankCardType,QrPayFlag,MerHelpFlag,Version,CapFlag,VipFlag,PayType,DATE_FORMAT(CreateDate,'%Y%m%d'),sum(TradeAmount),count(Id),SnNo from TradeRecord where Id in (" + ids.TrimEnd(',') + ") group by UserId,ParentNav,BrandId,BankCardType,QrPayFlag,MerHelpFlag,Version,CapFlag,VipFlag,PayType,DATE_FORMAT(CreateDate,'%Y%m%d'),SnNo", AppConfig.Base.SqlConn);
+                        if (selfDt.Rows.Count > 0)
+                        {
+                            function.WriteLog("统计人数:" + selfDt.Rows.Count + "\n\n", "重置创客交易额日志");
+                            foreach (DataRow selfDr in selfDt.Rows)
                             {
-                                Stat2Service.Instance.StatAfter(db, selfDr, UserId, ParentNav);
+                                StatService.Instance.StatTrade(db, selfDr);
+
+                                int UserId = int.Parse(selfDr["UserId"].ToString());
+                                string SnNo = selfDr["SnNo"].ToString();
+                                PosMachinesTwo pos = db.PosMachinesTwo.FirstOrDefault(m => m.PosSn == SnNo) ?? new PosMachinesTwo();
+                                if (UserId == 0)
+                                {
+                                    UserId = pos.UserId;
+                                }
+                                Users user = db.Users.FirstOrDefault(m => m.Id == UserId) ?? new Users();
+                                string ParentNav = user.ParentNav; //selfDr["ParentNav"].ToString();
+                                if (pos.BindingTime < DateTime.Parse("2023-07-01 00:00:00"))
+                                {
+                                    Stat2Service.Instance.StatBefore(db, selfDr, UserId, ParentNav);
+                                }
+                                else
+                                {
+                                    Stat2Service.Instance.StatAfter(db, selfDr, UserId, ParentNav);
+                                }
                             }
                         }
+                        db.SaveChanges();
+                    }
+                    else
+                    {
+                        op = false;
                     }
-                    db.SaveChanges();
-                    tran.Commit();
-                }
-                catch (Exception ex)
-                {
-                    tran.Rollback();
-                    function.WriteLog(DateTime.Now.ToString() + "\n" + ex.ToString(), "重置创客交易额异常");
                 }
             }
+            catch (Exception ex)
+            {
+                function.WriteLog(DateTime.Now.ToString() + "\n" + ex.ToString(), "重置创客交易额异常");
+            }
             db.Dispose();
             function.WriteLog(DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss.fff") + "\n\n", "重置创客交易额日志");
         }

+ 43 - 62
Controllers/HomeController.cs

@@ -69,68 +69,49 @@ namespace MySystem.Controllers
 
         public string test(int UserId, decimal Amount)
         {
-            // StatHelpProfitService.Instance.ResetMaxTradeAmountGo("202301");
-            string result = "";
-            // string conn = Library.ConfigurationManager.AppSettings["SqlConnStr"].ToString();
-            // // int UserId = 145842;
-            // Dictionary<string, decimal> dic = new Dictionary<string, decimal>();
-            // dic.Add("31", Amount);
-            // foreach(string day in dic.Keys)
-            // {
-            //     DataTable dt = CustomerSqlConn.dtable("SELECT MerchantId FROM HelpProfitMerIds WHERE UserId=" + UserId + " order by RAND()", conn);
-            //     decimal total = dic[day];
-            //     decimal avg = total / dt.Rows.Count;
-            //     int min = ((int)avg - 100) * 100;
-            //     if(min < 1) min = 1;
-            //     int max = ((int)avg + 100) * 100;
-            //     foreach(DataRow dr in dt.Rows)
-            //     {
-            //         string MerchantId = dr["MerchantId"].ToString();
-            //         decimal amount = (decimal)function.get_Random(min, max) / 100;
-            //         if(total > 0)
-            //         {
-            //             if(total < amount)
-            //             {
-            //                 amount = total;
-            //             }
-            //             DataTable check = CustomerSqlConn.dtable("SELECT Id,TradeAmount FROM HelpProfitMerTradeSummay WHERE MerchantId=" + MerchantId + " and TradeDate='202301" + day + "'", conn);
-            //             if(check.Rows.Count > 0)
-            //             {
-            //                 if(day == "30")
-            //                 {
-            //                     decimal today = decimal.Parse(check.Rows[0]["TradeAmount"].ToString());
-            //                     if(today < amount)
-            //                     {
-            //                         amount -= today;
-            //                     }
-            //                     else
-            //                     {
-            //                         amount = 0;
-            //                     }
-            //                 }
-            //                 if(amount > 0) result += "update HelpProfitMerTradeSummay set TradeAmount=" + amount + " where Id=" + check.Rows[0]["Id"].ToString() + ";\n";
-            //             }
-            //             else
-            //             {
-            //                 if(amount > 0) result += "INSERT INTO HelpProfitMerTradeSummay (`TradeAmount`, `TradeDate`, `TradeMonth`, `MerchantId`) VALUES (" + amount + ", '202301" + day + "', '202301', " + MerchantId + ");\n";
-            //             }
-            //             check = CustomerSqlConn.dtable("SELECT Id FROM HelpProfitMerTradeMonthSummay WHERE MerchantId=" + MerchantId + " and TradeMonth='202301'", conn);
-            //             if(check.Rows.Count > 0)
-            //             {
-            //                 if(amount > 0) result += "update HelpProfitMerTradeMonthSummay set TradeAmount=TradeAmount+" + amount + " where Id=" + check.Rows[0][0].ToString() + ";\n";
-            //             }
-            //             else
-            //             {
-            //                 if(amount > 0) result += "INSERT INTO HelpProfitMerTradeMonthSummay (`TradeAmount`, `TradeMonth`, `MerchantId`) VALUES (" + amount + ", '202301', " + MerchantId + ");\n";
-            //             }
-            //             total -= amount;
-            //         }
-            //         else
-            //         {
-            //             break;
-            //         }
-            //     }
-            // }
+            string result = "ok";
+            RedisDbconn.Instance.AddList("StatResetUserTradeQueue", "{\"BrandId\":\"12\",\"TradeDate\":\"2024-02-01\"}");
+            RedisDbconn.Instance.AddList("StatResetUserTradeQueue", "{\"BrandId\":\"13,15\",\"TradeDate\":\"2024-02-01\"}");
+            RedisDbconn.Instance.AddList("StatResetUserTradeQueue", "{\"BrandId\":\"12,13,15\",\"TradeDate\":\"2024-02-02\"}");
+            RedisDbconn.Instance.AddList("StatResetUserTradeQueue", "{\"BrandId\":\"12,13,15\",\"TradeDate\":\"2024-02-03\"}");
+            RedisDbconn.Instance.AddList("StatResetUserTradeQueue", "{\"BrandId\":\"12,13,15\",\"TradeDate\":\"2024-02-04\"}");
+            RedisDbconn.Instance.AddList("StatResetUserTradeQueue", "{\"BrandId\":\"12,13,15\",\"TradeDate\":\"2024-02-05\"}");
+            RedisDbconn.Instance.AddList("StatResetUserTradeQueue", "{\"BrandId\":\"12,13,15\",\"TradeDate\":\"2024-02-06\"}");
+            RedisDbconn.Instance.AddList("StatResetUserTradeQueue", "{\"BrandId\":\"12,13,15\",\"TradeDate\":\"2024-02-07\"}");
+            RedisDbconn.Instance.AddList("StatResetUserTradeQueue", "{\"BrandId\":\"12,13,15\",\"TradeDate\":\"2024-02-08\"}");
+            RedisDbconn.Instance.AddList("StatResetUserTradeQueue", "{\"BrandId\":\"12,13,15\",\"TradeDate\":\"2024-02-09\"}");
+            RedisDbconn.Instance.AddList("StatResetUserTradeQueue", "{\"BrandId\":\"12,13,15\",\"TradeDate\":\"2024-02-10\"}");
+            RedisDbconn.Instance.AddList("StatResetUserTradeQueue", "{\"BrandId\":\"12,13,15\",\"TradeDate\":\"2024-02-11\"}");
+            RedisDbconn.Instance.AddList("StatResetUserTradeQueue", "{\"BrandId\":\"12,13,15\",\"TradeDate\":\"2024-02-12\"}");
+            RedisDbconn.Instance.AddList("StatResetUserTradeQueue", "{\"BrandId\":\"12,13,15\",\"TradeDate\":\"2024-02-13\"}");
+            RedisDbconn.Instance.AddList("StatResetUserTradeQueue", "{\"BrandId\":\"12,13,15\",\"TradeDate\":\"2024-02-14\"}");
+            RedisDbconn.Instance.AddList("StatResetUserTradeQueue", "{\"BrandId\":\"12,13,15\",\"TradeDate\":\"2024-02-15\"}");
+            RedisDbconn.Instance.AddList("StatResetUserTradeQueue", "{\"BrandId\":\"12,13,15\",\"TradeDate\":\"2024-02-16\"}");
+            RedisDbconn.Instance.AddList("StatResetUserTradeQueue", "{\"BrandId\":\"12,13,15\",\"TradeDate\":\"2024-02-17\"}");
+            RedisDbconn.Instance.AddList("StatResetUserTradeQueue", "{\"BrandId\":\"12,13,15\",\"TradeDate\":\"2024-02-18\"}");
+            RedisDbconn.Instance.AddList("StatResetUserTradeQueue", "{\"BrandId\":\"12,13,15\",\"TradeDate\":\"2024-02-19\"}");
+            RedisDbconn.Instance.AddList("StatResetUserTradeQueue", "{\"BrandId\":\"12,13,15\",\"TradeDate\":\"2024-02-20\"}");
+            RedisDbconn.Instance.AddList("StatResetUserTradeQueue", "{\"BrandId\":\"12,13,15\",\"TradeDate\":\"2024-02-21\"}");
+            RedisDbconn.Instance.AddList("StatResetUserTradeQueue", "{\"BrandId\":\"12,13,15\",\"TradeDate\":\"2024-02-22\"}");
+            RedisDbconn.Instance.AddList("StatResetUserTradeQueue", "{\"BrandId\":\"12,13,15\",\"TradeDate\":\"2024-02-23\"}");
+            RedisDbconn.Instance.AddList("StatResetUserTradeQueue", "{\"BrandId\":\"12,13,15\",\"TradeDate\":\"2024-02-24\"}");
+            RedisDbconn.Instance.AddList("StatResetUserTradeQueue", "{\"BrandId\":\"12,13,15\",\"TradeDate\":\"2024-02-25\"}");
+            RedisDbconn.Instance.AddList("StatResetUserTradeQueue", "{\"BrandId\":\"12,13,15\",\"TradeDate\":\"2024-02-26\"}");
+            RedisDbconn.Instance.AddList("StatResetUserTradeQueue", "{\"BrandId\":\"12,13,15\",\"TradeDate\":\"2024-02-27\"}");
+            RedisDbconn.Instance.AddList("StatResetUserTradeQueue", "{\"BrandId\":\"12,13,15\",\"TradeDate\":\"2024-02-28\"}");
+            RedisDbconn.Instance.AddList("StatResetUserTradeQueue", "{\"BrandId\":\"12,13,15\",\"TradeDate\":\"2024-02-29\"}");
+            RedisDbconn.Instance.AddList("StatResetUserTradeQueue", "{\"BrandId\":\"12,13,15\",\"TradeDate\":\"2024-03-01\"}");
+            RedisDbconn.Instance.AddList("StatResetUserTradeQueue", "{\"BrandId\":\"12,13,15\",\"TradeDate\":\"2024-03-02\"}");
+            RedisDbconn.Instance.AddList("StatResetUserTradeQueue", "{\"BrandId\":\"12,13,15\",\"TradeDate\":\"2024-03-03\"}");
+            RedisDbconn.Instance.AddList("StatResetUserTradeQueue", "{\"BrandId\":\"12,13,15\",\"TradeDate\":\"2024-03-04\"}");
+            RedisDbconn.Instance.AddList("StatResetUserTradeQueue", "{\"BrandId\":\"12,13,15\",\"TradeDate\":\"2024-03-05\"}");
+            RedisDbconn.Instance.AddList("StatResetUserTradeQueue", "{\"BrandId\":\"12,13,15\",\"TradeDate\":\"2024-03-06\"}");
+            RedisDbconn.Instance.AddList("StatResetUserTradeQueue", "{\"BrandId\":\"12,13,15\",\"TradeDate\":\"2024-03-07\"}");
+            RedisDbconn.Instance.AddList("StatResetUserTradeQueue", "{\"BrandId\":\"12,13,15\",\"TradeDate\":\"2024-03-08\"}");
+            RedisDbconn.Instance.AddList("StatResetUserTradeQueue", "{\"BrandId\":\"12,13,15\",\"TradeDate\":\"2024-03-09\"}");
+            RedisDbconn.Instance.AddList("StatResetUserTradeQueue", "{\"BrandId\":\"12,13,15\",\"TradeDate\":\"2024-03-10\"}");
+            RedisDbconn.Instance.AddList("StatResetUserTradeQueue", "{\"BrandId\":\"12,13,15\",\"TradeDate\":\"2024-03-11\"}");
+            RedisDbconn.Instance.AddList("StatResetUserTradeQueue", "{\"BrandId\":\"12,13,15\",\"TradeDate\":\"2024-03-12\"}");
             return result;
         }
     }

+ 16 - 10
appsettings.json

@@ -8,27 +8,33 @@
   },
   "AllowedHosts": "*",
   "Setting": {
-    "AppKey": "",
-    "AppId": "",
-    "CheckUrl": "",
+    "AppKey": "8a3789362ef25d9f46a9d1c626e9e9f0",
+    "AppId": "1000000166",
+    "CheckUrl": "http://auth.yunmuit.com/Api/ProjectCheck/CheckRight",
     "ConnectionStrings": "",
-    "WebServiceUrl": "",
-    "DbSchemeUrl": "",
+    "WebServiceUrl": "http://auth.yunmuit.com/Api/ProjectCheck/DataBase",
+    "DbSchemeUrl": "http://auth.yunmuit.com/Api/ProjectCheck/GetDbScheme",
     "Host": "http://localhost:5047/",
     "SourceHost": "http://bs.kexiaoshuang.com/",
     "Database": "KxsMainServer",
-    "SqlConnStr": "server=47.108.231.170;port=3306;user=KxsMain;password=mzeqjriUWore0dwT;database=KxsMainServer;charset=utf8;",
-    "OpSqlConnStr": "server=47.108.231.170;port=3306;user=KxsOpServer;password=r7jwZ8ydLoeswDR4;database=KxsOpServer;charset=utf8;",
+    "SqlConnStr": "server=rm-2vcs4j67tla603c9d5o.mysql.cn-chengdu.rds.aliyuncs.com;port=3306;user=KxsProfitServer;password=FrW8ZfxlcaVdm1r0;database=KxsProfitServer;charset=utf8;",
+    "OpSqlConnStr": "server=rm-2vcs4j67tla603c9d5o.mysql.cn-chengdu.rds.aliyuncs.com;port=3306;user=KxsProfitServer;password=FrW8ZfxlcaVdm1r0;database=KxsOpServer;charset=utf8;",
     "SpSqlConnStr": "server=47.108.229.115;port=3306;user=KxsSpServer;password=jJ9qKsvwWgQA9xWG;database=KxsSpServer;charset=utf8;",
     "StatSqlConnStr": "server=rm-2vc27k81v217qs1t55o.mysql.cn-chengdu.rds.aliyuncs.com;port=3306;user=KxsStatServer;password=mzeqjriUWore0dwT;database=KxsStatServer;charset=utf8;",
-    "ProfitSqlConnStr": "server=rm-2vc27k81v217qs1t55o.mysql.cn-chengdu.rds.aliyuncs.com;port=3306;user=KxsProfitServer;password=FrW8ZfxlcaVdm1r0;database=KxsProfitServer;charset=utf8;",
-    "RedisConnStr": "47.108.207.184:6379,password=skb@redis2022,DefaultDatabase=2,poolsize=500,preheat=50,asyncPipeline=true",
+    "ProfitSqlConnStr": "server=rm-2vcs4j67tla603c9d5o.mysql.cn-chengdu.rds.aliyuncs.com;port=3306;user=KxsProfitServer;password=FrW8ZfxlcaVdm1r0;database=KxsProfitServer;charset=utf8;",
+    "RedisConnStr": "r-2vc7uglenfmzmlvrnopd.redis.cn-chengdu.rds.aliyuncs.com:6379,password=AZp2ns01w07YW9K0,DefaultDatabase=0,poolsize=500,preheat=50,asyncPipeline=true",
     "IOSAppVersion": "1.0.0",
     "AndroidAppVersion": "1.0.0",
     "OSSKey": "iL9dWgBunZRwGbHQ",
     "OSSSecret": "Q6P2vSNEY2LBNdygO8gUCkBZQpiswZ",
     "OSSEndpoint": "oss-cn-hangzhou.aliyuncs.com",
     "OSSBucketName": "yunmuit",
-    "AppSource": "/skin/app/default/"
+    "AppSource": "/skin/app/default/",
+    "JwtSecret": "JvDHuowbOnWiyxMIFc9gG5rw1LSSc0xx68L31oRfxS0",
+    "JwtIss": "KxsMainServer",
+    "JwtAud": "api",
+    "MqUserName": "skb@rabbitmq",
+    "MqPassword": "skb@rabbitmq",
+    "MqHostName": "47.108.231.170:5672,47.108.225.92:5672"
   }
 }