Parcourir la source

清除冗余redis代码

lichunlei il y a 2 ans
Parent
commit
ee4634182a

+ 2 - 2
AppStart/Helper/ConsumerOrdersStatService.cs

@@ -183,8 +183,8 @@ namespace MySystem
         {
             string DateString = order.UpdateDate.Value.ToString("yyyyMMdd");
             string MonthString = order.UpdateDate.Value.ToString("yyyyMM");
-            RedisDbconn.Instance.AddNumber("TradeStat:" + UserId + ":" + DateString, order.PayMoney);
-            RedisDbconn.Instance.AddNumber("TradeStat:" + UserId + ":" + MonthString, order.PayMoney);
+            // RedisDbconn.Instance.AddNumber("TradeStat:" + UserId + ":" + DateString, order.PayMoney);
+            // RedisDbconn.Instance.AddNumber("TradeStat:" + UserId + ":" + MonthString, order.PayMoney);
         }
     }
 }

+ 0 - 4
AppStart/Helper/Profit/ActiveService.cs

@@ -99,10 +99,6 @@ namespace MySystem
                         }).Entity;
                         db.SaveChanges();
 
-                        RedisDbconn.Instance.Set("UserAccount:" + account, sub.UserId);
-
-                        //我的-常用工具-收支明细
-                        RedisDbconn.Instance.AddList("UserAccountRecord:" + sub.UserId + ":1:" + TradeMonth, accountRecord);
                     }
                     
                     tran.Commit();

+ 0 - 4
AppStart/Helper/Profit/DiviService.cs

@@ -88,8 +88,6 @@ namespace MySystem
                         }
                         db.SaveChanges();
 
-                        RedisDbconn.Instance.Set("UserAccount:" + account, sub.UserId);
-
                         //首页-快联盟产品-主界面产品数据
                         UserMachineData MachineData = RedisDbconn.Instance.Get<UserMachineData>("UserMachineData:" + sub.UserId + ":" + sub.ProductType) ?? new UserMachineData();
                         MachineData.DividendsProfit += sub.ChangeAmount;
@@ -115,8 +113,6 @@ namespace MySystem
                         RedisDbconn.Instance.Clear("TradeProfit:Divi:" + sub.UserId + ":" + sub.ProductType);
                         RedisDbconn.Instance.AddList("TradeProfit:Divi:" + sub.UserId + ":" + sub.ProductType, DiviList.ToArray());
 
-                        //我的-常用工具-收支明细
-                        RedisDbconn.Instance.AddList("UserAccountRecord:" + sub.UserId + ":1:" + TradeMonth, edit);
                     }
                     
                     tran.Commit();

+ 0 - 5
AppStart/Helper/Profit/FluxService.cs

@@ -111,8 +111,6 @@ namespace MySystem
                             }).Entity;
                             db.SaveChanges();
 
-                            RedisDbconn.Instance.Set("UserAccount:" + account, sub.UserId);
-
                             //首页-快联盟产品-主界面产品数据
                             UserMachineData MachineData = RedisDbconn.Instance.Get<UserMachineData>("UserMachineData:" + sub.UserId + ":" + sub.BrandId);
                             if (MachineData != null)
@@ -122,9 +120,6 @@ namespace MySystem
                                 RedisDbconn.Instance.AddList("Pop:UserMachineData", MachineData); // TODO:同步mysql
                             }
 
-                            //我的-常用工具-收支明细
-                            RedisDbconn.Instance.AddList("UserAccountRecord:" + UserId + ":1:" + TradeMonth, accountRecord);
-
                             RedisDbconn.Instance.HAddNumber("TmpFluxProfit", sub.UserId + "_" + sub.BrandId + "_" + StatDate.ToString("yyyy年MM月") + "_" + StatDate.ToString("yyyyMM"), FluxProfitAmt);
                         }
                         else

+ 0 - 4
AppStart/Helper/Profit/OpenService.cs

@@ -99,10 +99,6 @@ namespace MySystem
                         }).Entity;
                         db.SaveChanges();
 
-                        RedisDbconn.Instance.Set("UserAccount:" + account, sub.UserId);
-
-                        //我的-常用工具-收支明细
-                        RedisDbconn.Instance.AddList("UserAccountRecord:" + sub.UserId + ":1:" + TradeMonth, accountRecord);
                     }
                     
                     tran.Commit();

+ 0 - 5
AppStart/Helper/Profit/ProfitService.cs

@@ -126,8 +126,6 @@ namespace MySystem
                             }).Entity;
                             db.SaveChanges();
 
-                            RedisDbconn.Instance.Set("UserAccount:" + account, sub.UserId);
-
                             //首页-快联盟产品-主界面产品数据
                             UserMachineData MachineData = RedisDbconn.Instance.Get<UserMachineData>("UserMachineData:" + sub.UserId + ":" + BrandId);
                             if (MachineData != null)
@@ -137,9 +135,6 @@ namespace MySystem
                                 RedisDbconn.Instance.AddList("Pop:UserMachineData", MachineData); // TODO:同步mysql
                             }
 
-                            //我的-常用工具-收支明细
-                            RedisDbconn.Instance.AddList("UserAccountRecord:" + sub.UserId + ":1:" + TradeMonth, accountRecord);
-
                             RedisDbconn.Instance.HAddNumber("TmpTradeProfit", sub.UserId + "_" + BrandId + "_" + StatDate.ToString("yyyy年MM月") + "分润_" + StatDate.ToString("yyyyMM"), ProfitMoney);
                         }
                         else

+ 0 - 5
AppStart/Helper/Profit/StandardService.cs

@@ -106,11 +106,6 @@ namespace MySystem
                             AfterBalanceAmount = AfterBalanceAmount, //变更后余额
                         }).Entity;
                         db.SaveChanges();
-
-                        RedisDbconn.Instance.Set("UserAccount:" + account, user.Id);
-
-                        //我的-常用工具-收支明细
-                        RedisDbconn.Instance.AddList("UserAccountRecord:" + user.Id + ":1:" + TradeMonth, accountRecord);
                     }
                     
                     tran.Commit();

+ 2 - 2
AppStart/Helper/StatDataService.cs

@@ -169,8 +169,8 @@ namespace MySystem
         {
             string DateString = order.UpdateDate.Value.ToString("yyyyMMdd");
             string MonthString = order.UpdateDate.Value.ToString("yyyyMM");
-            RedisDbconn.Instance.AddNumber("TradeStat:" + UserId + ":" + DateString, order.PayMoney);
-            RedisDbconn.Instance.AddNumber("TradeStat:" + UserId + ":" + MonthString, order.PayMoney);
+            // RedisDbconn.Instance.AddNumber("TradeStat:" + UserId + ":" + DateString, order.PayMoney);
+            // RedisDbconn.Instance.AddNumber("TradeStat:" + UserId + ":" + MonthString, order.PayMoney);
         }
     }
 }

+ 0 - 89
AppStart/Helper/StatService.cs

@@ -461,7 +461,6 @@ namespace MySystem
                     AfterBalanceAmount = AfterBalanceAmount, //变更后余额
                 }).Entity;
                 db.SaveChanges();
-                RedisDbconn.Instance.Set("UserAccount:" + GetUserId, account);
 
                 string dateString = pos.ActivationTime.Value.ToString("yyyyMMdd");
                 string monthString = pos.ActivationTime.Value.ToString("yyyyMM");
@@ -489,8 +488,6 @@ namespace MySystem
                 RedisDbconn.Instance.AddNumber("ActiveRewardAmt:mer:" + pos.BindMerchantId + ":" + pos.BrandId + ":" + dateString, ActPrize);
 
                 //收支明细
-                RedisDbconn.Instance.AddList("UserAccountRecord:" + GetUserId + ":1:" + monthString, userAccountRecord);
-                RedisDbconn.Instance.AddNumber("UserAccount:" + GetUserId + ":1:" + monthString, ActPrize);
                 RedisDbconn.Instance.Clear("UserAccount:Income:" + GetUserId + ":" + monthString);
             }
         }
@@ -626,7 +623,6 @@ namespace MySystem
                                 AfterBalanceAmount = AfterBalanceAmount, //变更后余额
                             }).Entity;
                             db.SaveChanges();
-                            RedisDbconn.Instance.Set("UserAccount:" + GetUserId, account);
 
                             string dateString = pos.ActivationTime.Value.ToString("yyyyMMdd");
                             string monthString = pos.ActivationTime.Value.ToString("yyyyMM");
@@ -652,10 +648,6 @@ namespace MySystem
                                 RedisDbconn.Instance.AddList("ActiveRewardDetail:" + GetUserId + ":" + pos.BrandId + ":" + dateString, pos.BindMerchantId);
                             }
                             RedisDbconn.Instance.AddNumber("ActiveRewardAmt:mer:" + pos.BindMerchantId + ":" + pos.BrandId + ":" + dateString, ActPrize);
-
-                            //收支明细
-                            RedisDbconn.Instance.AddList("UserAccountRecord:" + GetUserId + ":1:" + monthString, userAccountRecord);
-                            RedisDbconn.Instance.AddNumber("UserAccount:" + GetUserId + ":1:" + monthString, ActPrize);
                         }
                     }
                 }
@@ -807,7 +799,6 @@ namespace MySystem
                                                     AfterBalanceAmount = AfterBalanceAmount, //变更后余额
                                                 }).Entity;
                                                 db.SaveChanges();
-                                                RedisDbconn.Instance.Set("UserAccount:" + puser.Id, account);
 
                                                 string dateString = yesterday.ToString("yyyyMMdd");
                                                 string monthString = yesterday.ToString("yyyyMM");
@@ -829,10 +820,6 @@ namespace MySystem
                                                 // 开机奖励详情
                                                 RedisDbconn.Instance.AddList("OpenRewardDetail:" + puser.Id + ":" + pos.BrandId + ":" + dateString, detail);
 
-                                                //收支明细
-                                                RedisDbconn.Instance.AddList("UserAccountRecord:" + puser.Id + ":1:" + monthString, userAccountRecord);
-                                                RedisDbconn.Instance.AddNumber("UserAccount:" + puser.Id + ":1:" + monthString, Prize);
-
                                                 Prize -= 10;
                                             }
                                         }
@@ -985,7 +972,6 @@ namespace MySystem
                                                 AfterBalanceAmount = AfterBalanceAmount, //变更后余额
                                             }).Entity;
                                             db.SaveChanges();
-                                            RedisDbconn.Instance.Set("UserAccount:" + puser.Id, account);
 
                                             string dateString = yesterday.ToString("yyyyMMdd");
                                             string monthString = yesterday.ToString("yyyyMM");
@@ -1007,10 +993,6 @@ namespace MySystem
                                             // 开机奖励详情
                                             RedisDbconn.Instance.AddList("OpenRewardDetail:" + puser.Id + ":" + pos.BrandId + ":" + dateString, detail);
 
-                                            //收支明细
-                                            RedisDbconn.Instance.AddList("UserAccountRecord:" + puser.Id + ":1:" + monthString, userAccountRecord);
-                                            RedisDbconn.Instance.AddNumber("UserAccount:" + puser.Id + ":1:" + monthString, Prize);
-
                                             Prize -= 10;
                                         }
                                     }
@@ -1181,7 +1163,6 @@ namespace MySystem
                                     AfterBalanceAmount = AfterBalanceAmount, //变更后余额
                                 }).Entity;
                                 db.SaveChanges();
-                                RedisDbconn.Instance.Clear("UserAccount:" + GetUserId);
                             }
                             SpModels.TradeFluxRecord edit = spdb.TradeFluxRecord.FirstOrDefault(m => m.Id == trade.Id);
                             if (edit != null)
@@ -1600,76 +1581,6 @@ namespace MySystem
 
             StatMerchantTrade(date);
         }
-        public void StatTradeAmountEverDaySum()
-        {
-            // WebCMSEntities db = new WebCMSEntities();
-            // OtherMySqlConn.connstr = Library.ConfigurationManager.AppSettings["Pxc1SqlConnStr"].ToString();
-            // DataTable dt = OtherMySqlConn.dtable("select UserId,BrandId,QueryCount,TradeDate,TradeMonth,sum(DirectDebitTradeAmt) as DirectDebitTradeAmt,sum(DirectTradeAmt) as DirectTradeAmt,sum(NonDirectDebitTradeAmt) as NonDirectDebitTradeAmt,sum(NonDirectTradeAmt) as NonDirectTradeAmt from UserTradeDaySummary group by UserId,BrandId,QueryCount,TradeDate,TradeMonth order by UserId,BrandId,QueryCount");
-            // string html = "<table>";
-            // foreach (DataRow dr in dt.Rows)
-            // {
-            //     html += "<tr>";
-            //     string TradeDate = dr["TradeDate"].ToString();
-            //     string TradeMonth = dr["TradeMonth"].ToString();
-            //     int UserId = int.Parse(dr["UserId"].ToString());
-            //     int BrandId = int.Parse(dr["BrandId"].ToString());
-            //     int QrPayFlag = int.Parse(dr["QueryCount"].ToString());
-            //     decimal DirectDebitTradeAmt = decimal.Parse(dr["DirectDebitTradeAmt"].ToString());
-            //     decimal DirectTradeAmt = decimal.Parse(dr["DirectTradeAmt"].ToString());
-            //     decimal NonDirectDebitTradeAmt = decimal.Parse(dr["NonDirectDebitTradeAmt"].ToString());
-            //     decimal NonDirectTradeAmt = decimal.Parse(dr["NonDirectTradeAmt"].ToString());
-            //     decimal CurAmount = 0, CurTotalAmount = 0, CurMonthAmount = 0, CurDayAmount = 0;
-
-            //     CurTotalAmount = RedisDbconn.Instance.Get<decimal>("TotalAmount:" + UserId); //总交易
-            //     CurMonthAmount = RedisDbconn.Instance.Get<decimal>("TotalAmount:" + UserId + ":" + TradeDate); //总交易
-            //     CurDayAmount = RedisDbconn.Instance.Get<decimal>("TotalAmount:" + UserId + ":" + TradeMonth); //总交易
-            //     CurAmount = RedisDbconn.Instance.Get<decimal>("TotalAmount:" + UserId + ":" + BrandId + ":" + TradeDate); //总交易
-            //     decimal TotalPosAmount = 0;
-            //     decimal TotalCloudPayAmount = 0;
-            //     decimal TeamTotalPosAmount = 0;
-            //     decimal TeamTotalCloudPayAmount = 0;
-            //     if (QrPayFlag == 1)
-            //     {
-            //         TotalCloudPayAmount = RedisDbconn.Instance.Get<decimal>("TotalCloudPayAmount:" + UserId + ":" + TradeDate); //云闪付小额交易额
-            //         TeamTotalCloudPayAmount = RedisDbconn.Instance.Get<decimal>("TeamTotalCloudPayAmount:" + UserId + ":" + TradeDate); //POS机刷卡交易额
-            //     }
-            //     else
-            //     {
-            //         TotalPosAmount = RedisDbconn.Instance.Get<decimal>("TotalPosAmount:" + UserId + ":" + TradeDate); //POS机刷卡交易额
-            //         TeamTotalPosAmount = RedisDbconn.Instance.Get<decimal>("TeamTotalPosAmount:" + UserId + ":" + TradeDate); //云闪付小额交易额
-            //     }
-            //     Users user = db.Users.FirstOrDefault(m => m.Id == UserId) ?? new Users();
-            //     html += "<td>应得</td>";
-            //     html += "<td>" + user.MakerCode + "</td>";
-            //     html += "<td>" + user.RealName + "</td>";
-            //     html += "<td>" + user.Mobile + "</td>";
-            //     html += "<td>" + BrandId + "</td>";
-            //     html += "<td>" + QrPayFlag + "</td>";
-            //     html += "<td>" + DirectDebitTradeAmt + "</td>";
-            //     html += "<td>" + DirectTradeAmt + "</td>";
-            //     html += "<td>" + NonDirectDebitTradeAmt + "</td>";
-            //     html += "<td>" + NonDirectTradeAmt + "</td>";
-            //     html += "</tr>";
-
-            //     html += "<tr>";
-            //     html += "<td>当前</td>";
-            //     html += "<td></td>";
-            //     html += "<td></td>";
-            //     html += "<td>当天品牌:" + CurAmount + "</td>";
-            //     html += "<td>总交易:" + CurTotalAmount + "</td>";
-            //     html += "<td>当月:" + CurMonthAmount + "</td>";
-            //     html += "<td>当天:" + CurDayAmount + "</td>";
-            //     html += "<td>" + TotalPosAmount + "</td>";
-            //     html += "<td>" + TotalCloudPayAmount + "</td>";
-            //     html += "<td>" + TeamTotalPosAmount + "</td>";
-            //     html += "<td>" + TeamTotalCloudPayAmount + "</td>";
-            //     html += "</tr>";
-            // }
-            // html += "</table>";
-            // db.Dispose();
-            // // OtherMySqlConn.connstr = ;
-            // function.WritePage("/html/", "1.html", html);
-        }
 
 
 

+ 2 - 3
AppStart/Helper/SycnSpServer/SycnSpActiveService.cs

@@ -32,9 +32,8 @@ namespace MySystem
                     string Month = DateTime.Now.ToString("yyyyMM");
                     string Date = DateTime.Now.ToString("yyyyMMdd");
                     DateTime start = DateTime.Now.AddDays(-5);
-                    IQueryable<ActivateRecord> acts = spdb.ActivateRecord;
-                    acts = acts.Where(m => m.ActivateDate >= start && m.Status == 1);
-                    acts = acts.OrderByDescending(m => m.Id);
+                    int StartId = int.Parse(function.CheckInt(function.ReadInstance("/SycnSp/ActivateRecordId.txt")));
+                    IQueryable<ActivateRecord> acts = spdb.ActivateRecord.Where(m => m.Id >= StartId && m.ActivateDate >= start && m.Status == 1).OrderByDescending(m => m.Id);
                     foreach (ActivateRecord act in acts.ToList())
                     {
                         bool op = false;

+ 2 - 1
AppStart/Helper/SycnSpServer/SycnSpBindService.cs

@@ -30,7 +30,8 @@ namespace MySystem
                     WebCMSEntities spdb = new WebCMSEntities();
                     PxcModels.WebCMSEntities db = new PxcModels.WebCMSEntities();
                     DateTime start = DateTime.Now.AddDays(-5);
-                    var Binds = spdb.BindRecord.Select(m => new { m.Id, m.CreateTime, m.Status, m.MerNo, m.MerSnNo, m.ProductType, m.Field1 }).Where(m => m.CreateTime >= start && m.Status == 1).OrderByDescending(m => m.Id).ToList();
+                    int StartId = int.Parse(function.CheckInt(function.ReadInstance("/SycnSp/BindRecordId.txt")));
+                    var Binds = spdb.BindRecord.Select(m => new { m.Id, m.CreateTime, m.Status, m.MerNo, m.MerSnNo, m.ProductType, m.Field1 }).Where(m => m.Id >= StartId && m.CreateTime >= start && m.Status == 1).OrderByDescending(m => m.Id).ToList();
                     foreach (var Bind in Binds)
                     {
                         var tran = db.Database.BeginTransaction();

+ 2 - 1
AppStart/Helper/SycnSpServer/SycnSpMerchantService.cs

@@ -30,7 +30,8 @@ namespace MySystem
                     WebCMSEntities spdb = new WebCMSEntities();
                     PxcModels.WebCMSEntities db = new PxcModels.WebCMSEntities();
                     DateTime start = DateTime.Now.AddDays(-5);
-                    var Mers = spdb.Merchants.Where(m => m.CreateTime >= start && m.Status == 1).OrderByDescending(m => m.Id).ToList();
+                    int StartId = int.Parse(function.CheckInt(function.ReadInstance("/SycnSp/MerchantsId.txt")));
+                    var Mers = spdb.Merchants.Where(m => m.Id >= StartId && m.CreateTime >= start && m.Status == 1).OrderByDescending(m => m.Id).ToList();
                     foreach (var Mer in Mers)
                     {
                         var tran = db.Database.BeginTransaction();

+ 2 - 3
AppStart/Helper/SycnSpServer/SycnSpTradeService.cs

@@ -30,9 +30,8 @@ namespace MySystem
                     WebCMSEntities spdb = new WebCMSEntities();
                     PxcModels.WebCMSEntities db = new PxcModels.WebCMSEntities();
                     DateTime start = DateTime.Now.AddDays(-10);
-                    IQueryable<TradeRecord> trades = spdb.TradeRecord;
-                    trades = trades.Where(m => m.CreateDate >= start && m.Status == 1);
-                    trades = trades.OrderBy(m => m.CreateDate);
+                    int StartId = int.Parse(function.CheckInt(function.ReadInstance("/SycnSp/TradeRecordId.txt")));
+                    IQueryable<TradeRecord> trades = spdb.TradeRecord.Where(m => m.Id >= StartId && m.CreateDate >= start && m.Status == 1).OrderBy(m => m.CreateDate);
                     foreach (TradeRecord trade in trades.ToList())
                     {
                         bool op = true;

+ 0 - 56
AppStart/Helper/TestService.cs

@@ -22,44 +22,6 @@ namespace MySystem
             th.Start();
         }
 
-        public void dosomething()
-        {
-            string check = function.ReadInstance("/tmp/flag.txt");
-            if (!string.IsNullOrEmpty(check))
-            {
-                return;
-            }
-            function.WritePage("/tmp/", "flag.txt", DateTime.Now.ToString());
-            string TradeMonth = "202205";
-            string TradeDate = "20220511";
-            List<int> uids = new List<int>();
-            uids = uids.OrderByDescending(m => m).ToList();
-            foreach (int uid in uids)
-            {
-                RedisDbconn.Instance.Clear("TotalAmount:" + uid);
-                RedisDbconn.Instance.Clear("TotalAmount:" + uid + ":" + TradeMonth);
-                RedisDbconn.Instance.Clear("TotalCloudPayAmount:" + uid + ":" + TradeMonth);
-                RedisDbconn.Instance.Clear("TotalPosAmount:" + uid + ":" + TradeMonth);
-                RedisDbconn.Instance.Clear("TotalAmount:" + uid + ":*:" + TradeMonth);
-                RedisDbconn.Instance.Clear("TotalAmount:" + uid + ":" + TradeDate);
-                RedisDbconn.Instance.Clear("TotalCloudPayAmount:" + uid + ":" + TradeDate);
-                RedisDbconn.Instance.Clear("TotalPosAmount:" + uid + ":" + TradeDate);
-                RedisDbconn.Instance.Clear("TotalAmount:" + uid + ":*:" + TradeDate);
-
-                RedisDbconn.Instance.Clear("TeamTotalAmount:" + uid);
-                RedisDbconn.Instance.Clear("TeamTotalAmount:" + uid + ":" + TradeMonth);
-                RedisDbconn.Instance.Clear("TeamTotalCloudPayAmount:" + uid + ":" + TradeMonth);
-                RedisDbconn.Instance.Clear("TeamTotalPosAmount:" + uid + ":" + TradeMonth);
-                RedisDbconn.Instance.Clear("TeamTotalAmount:" + uid + ":*:" + TradeMonth);
-                RedisDbconn.Instance.Clear("TeamTotalAmount:" + uid + ":" + TradeDate);
-                RedisDbconn.Instance.Clear("TeamTotalCloudPayAmount:" + uid + ":" + TradeDate);
-                RedisDbconn.Instance.Clear("TeamTotalPosAmount:" + uid + ":" + TradeDate);
-                RedisDbconn.Instance.Clear("TeamTotalAmount:" + uid + ":*:" + TradeDate);
-                function.WriteLog(uid.ToString(), "清除redis");
-                Thread.Sleep(200);
-            }
-        }
-
         public void ResetTradeRecordUserId()
         {
             WebCMSEntities db = new WebCMSEntities();
@@ -156,15 +118,6 @@ namespace MySystem
                                     }
                                     db.SaveChanges();
                                 }
-                                // RedisDbconn.Instance.Clear("TotalAmount:" + UserId);
-                                // RedisDbconn.Instance.Clear("TotalAmount:" + UserId + ":" + TradeMonth);
-                                // RedisDbconn.Instance.Clear("TotalCloudPayAmount:" + UserId + ":" + TradeMonth);
-                                // RedisDbconn.Instance.Clear("TotalPosAmount:" + UserId + ":" + TradeMonth);
-                                // RedisDbconn.Instance.Clear("TotalAmount:" + UserId + ":*:" + TradeMonth);
-                                // RedisDbconn.Instance.Clear("TotalAmount:" + UserId + ":" + TradeDate);
-                                // RedisDbconn.Instance.Clear("TotalCloudPayAmount:" + UserId + ":" + TradeDate);
-                                // RedisDbconn.Instance.Clear("TotalPosAmount:" + UserId + ":" + TradeDate);
-                                // RedisDbconn.Instance.Clear("TotalAmount:" + UserId + ":*:" + TradeDate);
                                 if (!string.IsNullOrEmpty(ParentNav))
                                 {
                                     ParentNav += "," + UserId + ",";
@@ -208,15 +161,6 @@ namespace MySystem
                                                 }
                                                 db.SaveChanges();
                                             }
-                                            // RedisDbconn.Instance.Clear("TeamTotalAmount:" + NavUserId);
-                                            // RedisDbconn.Instance.Clear("TeamTotalAmount:" + NavUserId + ":" + TradeMonth);
-                                            // RedisDbconn.Instance.Clear("TeamTotalCloudPayAmount:" + NavUserId + ":" + TradeMonth);
-                                            // RedisDbconn.Instance.Clear("TeamTotalPosAmount:" + NavUserId + ":" + TradeMonth);
-                                            // RedisDbconn.Instance.Clear("TeamTotalAmount:" + NavUserId + ":*:" + TradeMonth);
-                                            // RedisDbconn.Instance.Clear("TeamTotalAmount:" + NavUserId + ":" + TradeDate);
-                                            // RedisDbconn.Instance.Clear("TeamTotalCloudPayAmount:" + NavUserId + ":" + TradeDate);
-                                            // RedisDbconn.Instance.Clear("TeamTotalPosAmount:" + NavUserId + ":" + TradeDate);
-                                            // RedisDbconn.Instance.Clear("TeamTotalAmount:" + NavUserId + ":*:" + TradeDate);
                                         }
                                     }
                                 }

+ 0 - 1
AppStart/Timer/StoreApplyHelper.cs

@@ -434,7 +434,6 @@ public class StoreApplyHelper
         ids.Add(459);
         ids.Add(97952);
         ids.Add(10719);
-        ids.Add(134503);
         ids.Add(16453);
         ids.Add(1337);
         ids.Add(110198);

+ 0 - 3
AppStart/Timer/TestHelper.cs

@@ -292,9 +292,6 @@ public class TestHelper
                 }
                 merStat.TradeAmount += TradeAmount;
                 db.SaveChanges();
-                RedisDbconn.Instance.Clear("MerTotalAmount:" + MerchantId);
-                RedisDbconn.Instance.Clear("MerTotalAmount:" + MerchantId + ":" + TradeMonth); //商户当月交易
-                RedisDbconn.Instance.Clear("MerTotalAmount:" + MerchantId + ":" + TradeDate); //商户当日交易
             }
         }
         catch (Exception ex)

+ 0 - 72
AppStart/Timer/TradeStatTimer.cs

@@ -56,54 +56,16 @@ public class TradeStatTimer
                             UserId = MerchantTypeUserId;
                         }
                     }
-                    RedisDbconn.Instance.AddNumber("MerTotalAmount:" + MerchantId, TradeAmount);
-                    RedisDbconn.Instance.AddNumber("MerTotalAmount:" + MerchantId + ":" + TradeMonth, TradeAmount); //商户当月交易
-                    RedisDbconn.Instance.AddNumber("MerTotalAmount:" + MerchantId + ":" + TradeDate, TradeAmount); //商户当日交易
-
                     Users user = db.Users.FirstOrDefault(m => m.Id == UserId);
                     if (user != null)
                     {
                         if (user.AuthFlag == 1)
                         {
-                            // UserTradeDaySummary selfStat = db.UserTradeDaySummary.FirstOrDefault(m => m.UserId == UserId && m.TradeMonth == TradeMonth && m.TradeDate == TradeDate && m.BrandId == BrandId && m.QueryCount == QrPayFlag && m.Sort == MerchantId && m.SeoTitle == "self");
-                            // if (selfStat == null)
-                            // {
-                            //     selfStat = db.UserTradeDaySummary.Add(new UserTradeDaySummary()
-                            //     {
-                            //         UserId = UserId,
-                            //         TradeMonth = TradeMonth,
-                            //         TradeDate = TradeDate,
-                            //         BrandId = BrandId,
-                            //         QueryCount = QrPayFlag,
-                            //         Sort = MerchantId,
-                            //         SeoTitle = "self",
-                            //     }).Entity;
-                            //     db.SaveChanges();
-                            // }
-                            // if (BankCardType == 0)
-                            // { 
-                            //     selfStat.DirectDebitTradeAmt += TradeAmount;
-                            // }
-                            // else if (BankCardType == 1)
-                            // {
-                            //     selfStat.DirectTradeAmt += TradeAmount;
-                            // }
-                            // db.SaveChanges();
-
-                            RedisDbconn.Instance.AddNumber("TotalAmount:" + UserId, TradeAmount); //总交易
-                            RedisDbconn.Instance.AddNumber("TotalAmount:" + UserId + ":" + TradeDate, TradeAmount); //总交易
-                            RedisDbconn.Instance.AddNumber("TotalAmount:" + UserId + ":" + TradeMonth, TradeAmount); //总交易
-                            RedisDbconn.Instance.AddNumber("TotalAmount:" + UserId + ":" + BrandId + ":" + TradeDate, TradeAmount); //总交易
-                            RedisDbconn.Instance.AddNumber("TotalAmount:" + UserId + ":" + BrandId + ":" + TradeMonth, TradeAmount); //总交易
                             if (QrPayFlag == 1)
                             {
-                                RedisDbconn.Instance.AddNumber("TotalCloudPayAmount:" + UserId + ":" + TradeDate, TradeAmount); //云闪付小额交易额
-                                RedisDbconn.Instance.AddNumber("TotalCloudPayAmount:" + UserId + ":" + TradeMonth, TradeAmount); //云闪付小额交易额
                             }
                             else
                             {
-                                RedisDbconn.Instance.AddNumber("TotalPosAmount:" + UserId + ":" + TradeDate, TradeAmount); //POS机刷卡交易额
-                                RedisDbconn.Instance.AddNumber("TotalPosAmount:" + UserId + ":" + TradeMonth, TradeAmount); //POS机刷卡交易额
                             }
 
                             string ParentNav = user.ParentNav;
@@ -123,45 +85,11 @@ public class TradeStatTimer
                                 foreach (string UserIdString in ParentNavList)
                                 {
                                     int ParentUserId = int.Parse(UserIdString);
-                                    // UserTradeDaySummary teamStat = db.UserTradeDaySummary.FirstOrDefault(m => m.UserId == ParentUserId && m.TradeMonth == TradeMonth && m.TradeDate == TradeDate && m.BrandId == BrandId && m.QueryCount == QrPayFlag && m.Sort == MerchantId && m.SeoTitle == "team");
-                                    // if (teamStat == null)
-                                    // {
-                                    //     teamStat = db.UserTradeDaySummary.Add(new UserTradeDaySummary()
-                                    //     {
-                                    //         UserId = ParentUserId,
-                                    //         TradeMonth = TradeMonth,
-                                    //         TradeDate = TradeDate,
-                                    //         BrandId = BrandId,
-                                    //         QueryCount = QrPayFlag,
-                                    //         Sort = MerchantId,
-                                    //         SeoTitle = "team",
-                                    //     }).Entity;
-                                    //     db.SaveChanges();
-                                    // }
-                                    // if (BankCardType == 0)
-                                    // { 
-                                    //     teamStat.NonDirectDebitTradeAmt += TradeAmount;
-                                    // }
-                                    // else if (BankCardType == 1)
-                                    // {
-                                    //     teamStat.NonDirectTradeAmt += TradeAmount;
-                                    // }
-                                    // db.SaveChanges();
-
-                                    RedisDbconn.Instance.AddNumber("TeamTotalAmount:" + ParentUserId, TradeAmount); //总交易
-                                    RedisDbconn.Instance.AddNumber("TeamTotalAmount:" + ParentUserId + ":" + TradeDate, TradeAmount); //总交易
-                                    RedisDbconn.Instance.AddNumber("TeamTotalAmount:" + ParentUserId + ":" + TradeMonth, TradeAmount); //总交易
-                                    RedisDbconn.Instance.AddNumber("TeamTotalAmount:" + ParentUserId + ":" + BrandId + ":" + TradeDate, TradeAmount); //总交易
-                                    RedisDbconn.Instance.AddNumber("TeamTotalAmount:" + ParentUserId + ":" + BrandId + ":" + TradeMonth, TradeAmount); //总交易
                                     if (QrPayFlag == 1)
                                     {
-                                        RedisDbconn.Instance.AddNumber("TeamTotalCloudPayAmount:" + ParentUserId + ":" + TradeDate, TradeAmount); //云闪付小额交易额
-                                        RedisDbconn.Instance.AddNumber("TeamTotalCloudPayAmount:" + ParentUserId + ":" + TradeMonth, TradeAmount); //云闪付小额交易额
                                     }
                                     else
                                     {
-                                        RedisDbconn.Instance.AddNumber("TeamTotalPosAmount:" + ParentUserId + ":" + TradeDate, TradeAmount); //POS机刷卡交易额
-                                        RedisDbconn.Instance.AddNumber("TeamTotalPosAmount:" + ParentUserId + ":" + TradeMonth, TradeAmount); //POS机刷卡交易额
                                     }
                                 }
                             }

+ 1 - 57
Controllers/HomeController.cs

@@ -473,7 +473,6 @@ namespace MySystem.Controllers
         //                 AfterBalanceAmount = AfterBalanceAmount, //变更后余额
         //             }).Entity;
         //             db.SaveChanges();
-        //             RedisDbconn.Instance.Set("UserAccount:" + ParentUserId, account);
 
         //             //推荐下单上级获得30天的机具循环天数
         //             var posList = db.PosMachinesTwo.Select(m => new { m.Id, m.UserId, m.BindingState, m.RecycEndDate }).Where(m => m.UserId == ParentUserId && m.BindingState == 0 && m.RecycEndDate != null).ToList();
@@ -538,62 +537,7 @@ namespace MySystem.Controllers
             ViewBag.list = list;
             return View();
         }
-
-        public string resetall(int k = 0, int b = 1)
-        {
-            DataTable dt = dbconn.dtable("select Id from Users where AuthFlag=1");
-            foreach (DataRow dr in dt.Rows)
-            {
-                if (k == 1)
-                {
-                    reset(int.Parse(dr["Id"].ToString()));
-                }
-                else if (k == 2)
-                {
-                    resetpos(int.Parse(dr["Id"].ToString()), b);
-                }
-            }
-            return "ok";
-        }
-        public string reset(int uid)
-        {
-            WebCMSEntities db = new WebCMSEntities();
-            List<Users> users = db.Users.Where(m => m.ParentUserId == uid).OrderByDescending(m => m.AuthDate).ToList();
-            RedisDbconn.Instance.Clear("MyMakerList:" + uid);
-            RedisDbconn.Instance.Clear("MyMakerForNotAuth:" + uid);
-            RedisDbconn.Instance.Clear("TotalUser:" + uid + "*");
-            RedisDbconn.Instance.Clear("TotalUser:Auth:" + uid);
-            foreach (Users user in users)
-            {
-                RedisDbconn.Instance.AddInt("TotalUser:" + uid);
-                RedisDbconn.Instance.AddInt("TotalUser:" + uid + ":" + user.CreateDate.Value.ToString("yyyyMM"));
-                RedisDbconn.Instance.AddInt("TotalUser:" + uid + ":" + user.CreateDate.Value.ToString("yyyyMMdd"));
-                if (user.AuthFlag == 1)
-                {
-                    RedisDbconn.Instance.AddList("MyMakerList:" + uid, new MyMakerItem()
-                    {
-                        UserId = user.Id,
-                        RealName = user.RealName,
-                        UserLevel = user.UserLevel,
-                    });
-                    RedisDbconn.Instance.AddInt("TotalUser:Auth:" + uid);
-                }
-                else
-                {
-                    RedisDbconn.Instance.AddList("MyMakerForNotAuth:" + uid, new MyMakerItem()
-                    {
-                        UserId = user.Id,
-                        RealName = user.RealName,
-                        UserLevel = user.UserLevel,
-                    });
-                    RedisDbconn.Instance.AddInt("TotalUser:NoAuth:" + uid);
-                }
-                RedisDbconn.Instance.Set("Users:" + user.Id, user);
-            }
-            db.Dispose();
-            return "finish";
-        }
-
+        
         public string resetpos(int uid, int kind)
         {
             WebCMSEntities db = new WebCMSEntities();

+ 0 - 16
Startup.cs

@@ -184,15 +184,9 @@ namespace MySystem
                     pattern: "{controller=Home}/{action=Index}/{Id?}");
             });
 
-            // app.UseMiddleware<GraphQLMiddleware>();
-
-            // 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激活数据
@@ -231,16 +225,6 @@ namespace MySystem
             // TestHelper.Instance.Start();
             // TestService.Instance.Start();
             // StatService.Instance.StartEverDay();
-            // RabbitMQClient.Instance.StartReceive("MerchantConfirmList");
-            // RabbitMQClient.Instance.StartReceive("CheckWeChatSign");
-            // RabbitMQClient.Instance.StartReceive("CheckAlipaySign");
-            // RabbitMQClient.Instance.StartReceive("DeleteMySqlData");
-            // RabbitMQClient.Instance.StartReceive("WeChatPayBack");
-            // RabbitMQClient.Instance.StartReceive("AlipayPayBack");
-            // RabbitMQClient.Instance.StartReceive("ConsumerOrdersReturnDo");
-            // RabbitMQClient.Instance.StartReceive("ConsumerOrdersReturnStat");
-            // RabbitMQClient.Instance.StartReceive("ConsumerOrdersStat");
-            // RabbitMQClient.Instance.StartReceive("PublicMainServer");
 
 
             // 备用,暂时不放开的