更新数据模型，增加统计激活，新增创客队列

AppStart/Helper/StatService.cs

@@ -28,7 +28,8 @@ namespace MySystem
                     // dosomething1(doDate);
                     // dosomething11(doDate);
                     // dosomething2(doDate);
-                    StartEverDayV2(doDate);
+                    StartEverDay(doDate);
+                    // StartEverDayV2(doDate);
                     dosomething4(doDate);
                     ListenFluxRecord(doDate);
                 }
@@ -1171,10 +1172,6 @@ namespace MySystem
         public void StartEverDayV2(string date)
         {
             OtherMySqlConn.connstr = Library.ConfigurationManager.AppSettings["Pxc1SqlConnStr"].ToString();            
-            // if(DateTime.Now.Day == 2)
-            // {
-            //     OtherMySqlConn.op("update Users set ThisMonthTrade=0 where ThisMonthTrade>0");
-            // }
             // Thread th = new Thread(StatTradeAmountEverDay);
             // th.IsBackground = true;
             // th.Start(date);
@@ -1369,6 +1366,174 @@ namespace MySystem
             db.Dispose();
             function.WriteLog(DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss.fff") + "\n\n", "执行昨天交易额日志");
 
+        }
+
+
+        // 每天统计头一天的交易额
+        public void StartEverDay(string date)
+        {
+            OtherMySqlConn.connstr = Library.ConfigurationManager.AppSettings["Pxc1SqlConnStr"].ToString();
+            // DateTime end = DateTime.Parse("2022-04-19 00:00:00");
+            // DateTime check = DateTime.Parse("2022-03-11");
+            // while (check <= end)
+            // {
+            //     Thread th = new Thread(StatTradeAmountEverDay);
+            //     th.IsBackground = true;
+            //     th.Start(check.ToString("yyyy-MM-dd"));
+            //     check = check.AddDays(1);
+            // }
+            if(DateTime.Now.Day == 2)
+            {
+                OtherMySqlConn.op("update Users set ThisMonthTrade=0 where ThisMonthTrade>0");
+                DataTable list = OtherMySqlConn.dtable("select UserId,sum(NonDirectTradeAmt) from UserTradeDaySummary where TradeMonth='" + DateTime.Now.ToString("yyyyMM") + "' GROUP BY UserId");
+                foreach(DataRow dr in list.Rows)
+                {
+                    string UserId = dr["UserId"].ToString();
+                    string ThisMonthTrade = dr[1].ToString();
+                    OtherMySqlConn.op("update Users set ThisMonthTrade=" + ThisMonthTrade + " where Id=" + UserId);
+                }
+            }
+            Thread th = new Thread(StatTradeAmountEverDay);
+            th.IsBackground = true;
+            th.Start(date);
+        }
+        public void StatTradeAmountEverDay(object sender)
+        {
+            string date = sender.ToString();
+            function.WriteLog(DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss.fff"), "执行昨天交易额日志");
+            WebCMSEntities db = new WebCMSEntities();
+            try
+            {
+                string TradeDate = date.Replace("-", "");
+                string TradeMonth = TradeDate.Substring(0, 6);
+                string start = date + " 00:00:00";
+                string end = DateTime.Parse(date).AddDays(1).ToString("yyyy-MM-dd") + " 00:00:00";
+                string startId = "0", endId = "9999999999";
+                List<string> uids = new List<string>();
+                DataTable startDt = OtherMySqlConn.dtable("select min(Id) from TradeRecord where CreateDate>='" + start + "'");
+                if (startDt.Rows.Count > 0)
+                {
+                    startId = startDt.Rows[0][0].ToString();
+                }
+                function.WriteLog(startId + "\n\n", "执行昨天交易额日志");
+                // DataTable endDt = OtherMySqlConn.dtable("select max(Id) from TradeRecord where CreateDate<'" + end + "'");
+                // if (endDt.Rows.Count > 0)
+                // {
+                //     endId = endDt.Rows[0][0].ToString();
+                // }
+                DataTable userDt = OtherMySqlConn.dtable("select Id,ParentNav from Users where Id in (select DISTINCT UserId from TradeRecord where Id>=" + startId + " and Id<=" + endId + " and CreateDate>='" + start + "' and CreateDate<'" + end + "')");
+                function.WriteLog("交易人数:" + userDt.Rows.Count + "\n\n", "执行昨天交易额日志");
+                foreach (DataRow userDr in userDt.Rows)
+                {
+                    int UserId = int.Parse(userDr["Id"].ToString());
+                    string ParentNav = userDr["ParentNav"].ToString();
+                    function.WriteLog(UserId + ":" + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss.fff") + "\n\n", "执行昨天交易额日志");
+                    DataTable selfdt = OtherMySqlConn.dtable("select BrandId,BankCardType,QrPayFlag,sum(TradeAmount) from TradeRecord where Id>=" + startId + " and Id<=" + endId + " and CreateDate>='" + start + "' and CreateDate<'" + end + "' and UserId=" + UserId + " group by BrandId,BankCardType,QrPayFlag");
+                    function.WriteLog(UserId + ":" + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss.fff") + "\n\n", "执行昨天交易额日志");
+                    foreach (DataRow selfDr in selfdt.Rows)
+                    {
+                        int BrandId = int.Parse(selfDr["BrandId"].ToString());
+                        int BankCardType = int.Parse(selfDr["BankCardType"].ToString());
+                        int QrPayFlag = int.Parse(selfDr["QrPayFlag"].ToString());
+                        decimal TradeAmount = decimal.Parse(selfDr[3].ToString());
+                        UserTradeDaySummary selfStat = db.UserTradeDaySummary.FirstOrDefault(m => m.UserId == UserId && m.TradeMonth == TradeMonth && m.TradeDate == TradeDate && m.BrandId == BrandId && m.QueryCount == QrPayFlag && m.SeoTitle == "self");
+                        if (selfStat == null)
+                        {
+                            selfStat = db.UserTradeDaySummary.Add(new UserTradeDaySummary()
+                            {
+                                UserId = UserId,
+                                TradeMonth = TradeMonth,
+                                TradeDate = TradeDate,
+                                BrandId = BrandId,
+                                QueryCount = QrPayFlag,
+                                SeoTitle = "self",
+                            }).Entity;
+                            db.SaveChanges();
+                        }
+                        if (BankCardType == 0)
+                        {
+                            selfStat.DirectDebitTradeAmt += TradeAmount;
+                        }
+                        else if (BankCardType != 0)
+                        {
+                            selfStat.DirectTradeAmt += TradeAmount;
+                        }
+                        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 + ",";
+                        string[] ParentNavList = ParentNav.Trim(',').Replace(",,", ",").Split(',');
+                        foreach (string NavUserIdString in ParentNavList)
+                        {
+                            if (!uids.Contains(NavUserIdString + start))
+                            {
+                                uids.Add(NavUserIdString + start);
+                                int NavUserId = int.Parse(NavUserIdString);
+                                function.WriteLog(NavUserId + ":team:" + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss.fff") + "\n\n", "执行昨天交易额日志");
+                                DataTable teamDt = OtherMySqlConn.dtable("select BrandId,BankCardType,QrPayFlag,sum(TradeAmount) from TradeRecord where Id>=" + startId + " and Id<=" + endId + " and CreateDate>='" + start + "' and CreateDate<'" + end + "' and UserId in (select Id from Users where ParentNav like '%," + NavUserId + ",%' or Id=" + NavUserId + ") group by BrandId,BankCardType,QrPayFlag");
+                                function.WriteLog(NavUserId + ":team:" + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss.fff") + "\n\n", "执行昨天交易额日志");
+                                foreach (DataRow teamDr in teamDt.Rows)
+                                {
+                                    int BrandId = int.Parse(teamDr["BrandId"].ToString());
+                                    int BankCardType = int.Parse(teamDr["BankCardType"].ToString());
+                                    int QrPayFlag = int.Parse(teamDr["QrPayFlag"].ToString());
+                                    decimal TradeAmount = decimal.Parse(teamDr[3].ToString());
+                                    UserTradeDaySummary teamStat = db.UserTradeDaySummary.FirstOrDefault(m => m.UserId == NavUserId && m.TradeMonth == TradeMonth && m.TradeDate == TradeDate && m.BrandId == BrandId && m.QueryCount == QrPayFlag && m.SeoTitle == "team");
+                                    if (teamStat == null)
+                                    {
+                                        teamStat = db.UserTradeDaySummary.Add(new UserTradeDaySummary()
+                                        {
+                                            UserId = NavUserId,
+                                            TradeMonth = TradeMonth,
+                                            TradeDate = TradeDate,
+                                            BrandId = BrandId,
+                                            QueryCount = QrPayFlag,
+                                            SeoTitle = "team",
+                                        }).Entity;
+                                        db.SaveChanges();
+                                    }
+                                    if (BankCardType == 0)
+                                    {
+                                        teamStat.NonDirectDebitTradeAmt += TradeAmount;
+                                    }
+                                    else if (BankCardType != 0)
+                                    {
+                                        teamStat.NonDirectTradeAmt += TradeAmount;
+                                    }
+                                    db.SaveChanges();
+                                    OtherMySqlConn.op("update Users set ThisMonthTrade=ThisMonthTrade+"+TradeAmount+" where Id=" + NavUserId);
+                                }
+                                // 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);
+                            }
+                        }
+                    }
+                }
+            }
+            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", "执行昨天交易额日志");
+
             StatMerchantTrade(date);
         }
 
@@ -1635,6 +1800,13 @@ namespace MySystem
             // function.WritePage("/html/", "1.html", html);
         }
 
+        
+
+
+
+
+
+
 
         //统计商户交易额
         private void StatMerchantTrade(string date)

Models/PreSendStockDetail.cs

@@ -9,8 +9,6 @@ namespace MySystem.Models
         public int Sort { get; set; }
         public int QueryCount { get; set; }
         public int Status { get; set; }
-        public int ReceivingStatus { get; set; }
-        public int IsUsed { get; set; }
         public DateTime? CreateDate { get; set; }
         public DateTime? UpdateDate { get; set; }
         public string SeoTitle { get; set; }

Models/StoreMachineApply.cs

@@ -18,17 +18,17 @@ namespace MySystem.Models
         public string SeoKeyword { get; set; }
         public string SeoDescription { get; set; }
         public DateTime? ApplyTime { get; set; }
-        public uint? BrandId { get; set; }
+        public int? BrandId { get; set; }
         public string ApplyNo { get; set; }
-        public uint? ApplyNum { get; set; }
-        public uint? SendNum { get; set; }
-        public uint? BoxNum { get; set; }
-        public uint? LastApply { get; set; }
-        public uint? MaxApply { get; set; }
-        public uint? ActualApply { get; set; }
-        public uint? UserId { get; set; }
-        public uint? StoreId { get; set; }
-        public uint? OrderId { get; set; }
+        public int? ApplyNum { get; set; }
+        public int? SendNum { get; set; }
+        public int? BoxNum { get; set; }
+        public int? LastApply { get; set; }
+        public int? MaxApply { get; set; }
+        public int? ActualApply { get; set; }
+        public int? UserId { get; set; }
+        public int? StoreId { get; set; }
+        public int? OrderId { get; set; }
         public string SwapSnExpand { get; set; }
     }
 }

Models/WebCMSEntities.cs

@@ -630,56 +630,7 @@ namespace MySystem.Models
 
                 entity.Property(e => e.Version).HasColumnType("int(11)");
             });
-            modelBuilder.Entity<ActivityRedPackageJoinss>(entity =>
-            {
-                entity.Property(e => e.Id).HasColumnType("int(11)");
-
-                entity.Property(e => e.ActivityDate)
-                    .HasColumnType("varchar(8)")
-                    .HasCharSet("utf8")
-                    .HasCollation("utf8_general_ci");
-
-                entity.Property(e => e.CreateDate).HasColumnType("datetime");
-
-                entity.Property(e => e.CreateMan)
-                    .HasColumnType("varchar(50)")
-                    .HasCharSet("utf8")
-                    .HasCollation("utf8_general_ci");
-
-                entity.Property(e => e.PrizeAmt).HasColumnType("decimal(18,2)");
-
-                entity.Property(e => e.QueryCount).HasColumnType("int(11)");
-
-                entity.Property(e => e.SeoDescription)
-                    .HasColumnType("varchar(500)")
-                    .HasCharSet("utf8")
-                    .HasCollation("utf8_general_ci");
-
-                entity.Property(e => e.SeoKeyword)
-                    .HasColumnType("varchar(200)")
-                    .HasCharSet("utf8")
-                    .HasCollation("utf8_general_ci");
 
-                entity.Property(e => e.SeoTitle)
-                    .HasColumnType("varchar(100)")
-                    .HasCharSet("utf8")
-                    .HasCollation("utf8_general_ci");
-
-                entity.Property(e => e.Sort).HasColumnType("int(11)");
-
-                entity.Property(e => e.Status).HasColumnType("int(11)");
-
-                entity.Property(e => e.UpdateDate).HasColumnType("datetime");
-
-                entity.Property(e => e.UpdateMan)
-                    .HasColumnType("varchar(50)")
-                    .HasCharSet("utf8")
-                    .HasCollation("utf8_general_ci");
-
-                entity.Property(e => e.UserId).HasColumnType("int(11)");
-
-                entity.Property(e => e.Version).HasColumnType("int(11)");
-            });
             modelBuilder.Entity<ActivityRedPackageStock>(entity =>
             {
                 entity.Property(e => e.Id).HasColumnType("int(11)");
@@ -730,56 +681,6 @@ namespace MySystem.Models
 
                 entity.Property(e => e.Version).HasColumnType("int(11)");
             });
-            modelBuilder.Entity<ActivityRedPackageStocks>(entity =>
-            {
-                entity.Property(e => e.Id).HasColumnType("int(11)");
-
-                entity.Property(e => e.ActivityDate)
-                    .HasColumnType("varchar(8)")
-                    .HasCharSet("utf8")
-                    .HasCollation("utf8_general_ci");
-
-                entity.Property(e => e.CreateDate).HasColumnType("datetime");
-
-                entity.Property(e => e.CreateMan)
-                    .HasColumnType("varchar(50)")
-                    .HasCharSet("utf8")
-                    .HasCollation("utf8_general_ci");
-
-                entity.Property(e => e.PrizeAmt).HasColumnType("decimal(18,2)");
-
-                entity.Property(e => e.QueryCount).HasColumnType("int(11)");
-
-                entity.Property(e => e.SeoDescription)
-                    .HasColumnType("varchar(500)")
-                    .HasCharSet("utf8")
-                    .HasCollation("utf8_general_ci");
-
-                entity.Property(e => e.SeoKeyword)
-                    .HasColumnType("varchar(200)")
-                    .HasCharSet("utf8")
-                    .HasCollation("utf8_general_ci");
-
-                entity.Property(e => e.SeoTitle)
-                    .HasColumnType("varchar(100)")
-                    .HasCharSet("utf8")
-                    .HasCollation("utf8_general_ci");
-
-                entity.Property(e => e.Sort).HasColumnType("int(11)");
-
-                entity.Property(e => e.Status).HasColumnType("int(11)");
-
-                entity.Property(e => e.UpdateDate).HasColumnType("datetime");
-
-                entity.Property(e => e.UpdateMan)
-                    .HasColumnType("varchar(50)")
-                    .HasCharSet("utf8")
-                    .HasCollation("utf8_general_ci");
-
-                entity.Property(e => e.UserId).HasColumnType("int(11)");
-
-                entity.Property(e => e.Version).HasColumnType("int(11)");
-            });
 
             modelBuilder.Entity<ActivityRedPackageTop10>(entity =>
             {
@@ -831,56 +732,6 @@ namespace MySystem.Models
                 entity.Property(e => e.Version).HasColumnType("int(11)");
             });
 
-            modelBuilder.Entity<ActivityRedPackageTop10s>(entity =>
-            {
-                entity.Property(e => e.Id).HasColumnType("int(11)");
-
-                entity.Property(e => e.CreateDate).HasColumnType("datetime");
-
-                entity.Property(e => e.CreateMan)
-                    .HasColumnType("varchar(50)")
-                    .HasCharSet("utf8")
-                    .HasCollation("utf8_general_ci");
-
-                entity.Property(e => e.Kind).HasColumnType("int(11)");
-
-                entity.Property(e => e.PrizeAmt).HasColumnType("decimal(18,2)");
-
-                entity.Property(e => e.QueryCount).HasColumnType("int(11)");
-
-                entity.Property(e => e.SeoDescription)
-                    .HasColumnType("varchar(500)")
-                    .HasCharSet("utf8")
-                    .HasCollation("utf8_general_ci");
-
-                entity.Property(e => e.SeoKeyword)
-                    .HasColumnType("varchar(200)")
-                    .HasCharSet("utf8")
-                    .HasCollation("utf8_general_ci");
-
-                entity.Property(e => e.SeoTitle)
-                    .HasColumnType("varchar(100)")
-                    .HasCharSet("utf8")
-                    .HasCollation("utf8_general_ci");
-
-                entity.Property(e => e.Sort).HasColumnType("int(11)");
-
-                entity.Property(e => e.Status).HasColumnType("int(11)");
-
-                entity.Property(e => e.TimeNum).HasColumnType("int(11)");
-
-                entity.Property(e => e.UpdateDate).HasColumnType("datetime");
-
-                entity.Property(e => e.UpdateMan)
-                    .HasColumnType("varchar(50)")
-                    .HasCharSet("utf8")
-                    .HasCollation("utf8_general_ci");
-
-                entity.Property(e => e.UserId).HasColumnType("int(11)");
-
-                entity.Property(e => e.Version).HasColumnType("int(11)");
-            });
-
             modelBuilder.Entity<Advertisment>(entity =>
             {
                 entity.Property(e => e.Id).HasColumnType("int(11)");
@@ -4296,52 +4147,6 @@ namespace MySystem.Models
                 entity.Property(e => e.UserId).HasColumnType("int(11)");
             });
 
-            modelBuilder.Entity<MerchantDepositReturns>(entity =>
-            {
-                entity.Property(e => e.Id).HasColumnType("int(11)");
-
-                entity.Property(e => e.AlipayAccountNo)
-                    .HasColumnType("varchar(50)")
-                    .HasCharSet("utf8")
-                    .HasCollation("utf8_general_ci");
-
-                entity.Property(e => e.CreateDate).HasColumnType("datetime");
-
-                entity.Property(e => e.MerchantId).HasColumnType("int(11)");
-
-                entity.Property(e => e.OperateMan)
-                    .HasColumnType("varchar(50)")
-                    .HasCharSet("utf8")
-                    .HasCollation("utf8_general_ci");
-
-                entity.Property(e => e.QueryCount).HasColumnType("int(11)");
-
-                entity.Property(e => e.ReturnAmount).HasColumnType("decimal(18,2)");
-
-                entity.Property(e => e.SeoDescription)
-                    .HasColumnType("varchar(500)")
-                    .HasCharSet("utf8")
-                    .HasCollation("utf8_general_ci");
-
-                entity.Property(e => e.SeoKeyword)
-                    .HasColumnType("varchar(200)")
-                    .HasCharSet("utf8")
-                    .HasCollation("utf8_general_ci");
-
-                entity.Property(e => e.SeoTitle)
-                    .HasColumnType("varchar(100)")
-                    .HasCharSet("utf8")
-                    .HasCollation("utf8_general_ci");
-
-                entity.Property(e => e.Sort).HasColumnType("int(11)");
-
-                entity.Property(e => e.Status).HasColumnType("int(11)");
-
-                entity.Property(e => e.UpdateDate).HasColumnType("datetime");
-
-                entity.Property(e => e.UserId).HasColumnType("int(11)");
-            });
-
             modelBuilder.Entity<MerchantForCode>(entity =>
             {
                 entity.HasKey(e => e.Code)
@@ -6800,187 +6605,6 @@ namespace MySystem.Models
                 entity.Property(e => e.UserId).HasColumnType("int(11)");
             });
 
-            modelBuilder.Entity<PosMachines>(entity =>
-            {
-                entity.Property(e => e.Id).HasColumnType("int(11)");
-
-                entity.Property(e => e.CreateDate).HasColumnType("datetime");
-
-                entity.Property(e => e.OutNum).HasColumnType("int(11)");
-
-                entity.Property(e => e.QueryCount).HasColumnType("int(11)");
-
-                entity.Property(e => e.SeoDescription)
-                    .HasColumnType("varchar(500)")
-                    .HasCharSet("utf8")
-                    .HasCollation("utf8_general_ci");
-
-                entity.Property(e => e.SeoKeyword)
-                    .HasColumnType("varchar(200)")
-                    .HasCharSet("utf8")
-                    .HasCollation("utf8_general_ci");
-
-                entity.Property(e => e.SeoTitle)
-                    .HasColumnType("varchar(100)")
-                    .HasCharSet("utf8")
-                    .HasCollation("utf8_general_ci");
-
-                entity.Property(e => e.Sort).HasColumnType("int(11)");
-
-                entity.Property(e => e.Status).HasColumnType("int(11)");
-
-                entity.Property(e => e.StockNum).HasColumnType("int(11)");
-
-                entity.Property(e => e.TotalNum).HasColumnType("int(11)");
-
-                entity.Property(e => e.UpdateDate).HasColumnType("datetime");
-            });
-
-            modelBuilder.Entity<PosCouponOrders>(entity =>
-            {
-                entity.Property(e => e.Id).HasColumnType("int(11)");
-
-                entity.Property(e => e.AfterOut).HasColumnType("int(11)");
-
-                entity.Property(e => e.AfterStock).HasColumnType("int(11)");
-
-                entity.Property(e => e.AfterTotal).HasColumnType("int(11)");
-
-                entity.Property(e => e.BeforeOut).HasColumnType("int(11)");
-
-                entity.Property(e => e.BeforeStock).HasColumnType("int(11)");
-
-                entity.Property(e => e.BeforeTotal).HasColumnType("int(11)");
-
-                entity.Property(e => e.ChangeCount).HasColumnType("int(11)");
-
-                entity.Property(e => e.ChangeKind).HasColumnType("int(11)");
-
-                entity.Property(e => e.CreateDate).HasColumnType("datetime");
-
-                entity.Property(e => e.FromUserId).HasColumnType("int(11)");
-
-                entity.Property(e => e.OrderNo)
-                    .HasColumnType("varchar(50)")
-                    .HasCharSet("utf8")
-                    .HasCollation("utf8_general_ci");
-
-                entity.Property(e => e.QueryCount).HasColumnType("int(11)");
-
-                entity.Property(e => e.SeoDescription)
-                    .HasColumnType("varchar(500)")
-                    .HasCharSet("utf8")
-                    .HasCollation("utf8_general_ci");
-
-                entity.Property(e => e.SeoKeyword)
-                    .HasColumnType("varchar(200)")
-                    .HasCharSet("utf8")
-                    .HasCollation("utf8_general_ci");
-
-                entity.Property(e => e.SeoTitle)
-                    .HasColumnType("varchar(100)")
-                    .HasCharSet("utf8")
-                    .HasCollation("utf8_general_ci");
-
-                entity.Property(e => e.Sort).HasColumnType("int(11)");
-
-                entity.Property(e => e.Status).HasColumnType("int(11)");
-
-                entity.Property(e => e.ToUserId).HasColumnType("int(11)");
-
-                entity.Property(e => e.UpdateDate).HasColumnType("datetime");
-            });
-
-            modelBuilder.Entity<PosCouponRecord>(entity =>
-            {
-                entity.Property(e => e.Id).HasColumnType("int(11)");
-
-                entity.Property(e => e.ChangeKind).HasColumnType("int(11)");
-
-                entity.Property(e => e.CreateDate).HasColumnType("datetime");
-
-                entity.Property(e => e.FromUserId).HasColumnType("int(11)");
-
-                entity.Property(e => e.OrderNo)
-                    .HasColumnType("varchar(50)")
-                    .HasCharSet("utf8")
-                    .HasCollation("utf8_general_ci");
-
-                entity.Property(e => e.PosCouponId).HasColumnType("int(11)");
-
-                entity.Property(e => e.QueryCount).HasColumnType("int(11)");
-
-                entity.Property(e => e.SeoDescription)
-                    .HasColumnType("varchar(500)")
-                    .HasCharSet("utf8")
-                    .HasCollation("utf8_general_ci");
-
-                entity.Property(e => e.SeoKeyword)
-                    .HasColumnType("varchar(200)")
-                    .HasCharSet("utf8")
-                    .HasCollation("utf8_general_ci");
-
-                entity.Property(e => e.SeoTitle)
-                    .HasColumnType("varchar(100)")
-                    .HasCharSet("utf8")
-                    .HasCollation("utf8_general_ci");
-
-                entity.Property(e => e.Sort).HasColumnType("int(11)");
-
-                entity.Property(e => e.Status).HasColumnType("int(11)");
-
-                entity.Property(e => e.ToUserId).HasColumnType("int(11)");
-
-                entity.Property(e => e.UpdateDate).HasColumnType("datetime");
-            });
-
-            modelBuilder.Entity<PosCoupons>(entity =>
-            {
-                entity.Property(e => e.Id).HasColumnType("int(11)");
-
-                entity.Property(e => e.CreateDate).HasColumnType("datetime");
-
-                entity.Property(e => e.ExchangeCode)
-                    .HasColumnType("varchar(10)")
-                    .HasCharSet("utf8")
-                    .HasCollation("utf8_general_ci");
-
-                entity.Property(e => e.IsLock)
-                    .HasColumnType("bit(1)")
-                    .HasDefaultValueSql("b'0'");
-
-                entity.Property(e => e.IsUse)
-                    .HasColumnType("bit(1)")
-                    .HasDefaultValueSql("b'0'");
-
-                entity.Property(e => e.QueryCount).HasColumnType("int(11)");
-
-                entity.Property(e => e.SeoDescription)
-                    .HasColumnType("varchar(500)")
-                    .HasCharSet("utf8")
-                    .HasCollation("utf8_general_ci");
-
-                entity.Property(e => e.SeoKeyword)
-                    .HasColumnType("varchar(200)")
-                    .HasCharSet("utf8")
-                    .HasCollation("utf8_general_ci");
-
-                entity.Property(e => e.SeoTitle)
-                    .HasColumnType("varchar(100)")
-                    .HasCharSet("utf8")
-                    .HasCollation("utf8_general_ci");
-
-                entity.Property(e => e.Sort).HasColumnType("int(11)");
-
-                entity.Property(e => e.Status).HasColumnType("int(11)");
-
-                entity.Property(e => e.UpdateDate).HasColumnType("datetime");
-
-                entity.Property(e => e.UseDate).HasColumnType("datetime");
-
-                entity.Property(e => e.UserId).HasColumnType("int(11)");
-            });
-
             modelBuilder.Entity<PosMachines>(entity =>
             {
                 entity.Property(e => e.Id).HasColumnType("int(11)");
@@ -7463,12 +7087,8 @@ namespace MySystem.Models
 
                 entity.Property(e => e.FromUserId).HasColumnType("int(11)");
 
-                entity.Property(e => e.IsUsed).HasColumnType("int(11)");
-
                 entity.Property(e => e.QueryCount).HasColumnType("int(11)");
 
-                entity.Property(e => e.ReceivingStatus).HasColumnType("int(11)");
-
                 entity.Property(e => e.SeoDescription)
                     .HasColumnType("varchar(500)")
                     .HasCharSet("utf8")
@@ -10021,75 +9641,6 @@ namespace MySystem.Models
                 entity.Property(e => e.UserId).HasColumnType("int(11)");
             });
 
-            modelBuilder.Entity<SetMerchantTypeRecord>(entity =>
-            {
-                entity.Property(e => e.Id).HasColumnType("int(11)");
-
-                entity.Property(e => e.ActDate).HasColumnType("datetime");
-
-                entity.Property(e => e.ActStatus)
-                    .HasColumnType("bit(1)")
-                    .HasDefaultValueSql("b'0'");
-
-                entity.Property(e => e.BindDate).HasColumnType("datetime");
-
-                entity.Property(e => e.BindStatus)
-                    .HasColumnType("bit(1)")
-                    .HasDefaultValueSql("b'0'");
-
-                entity.Property(e => e.CreateDate).HasColumnType("datetime");
-
-                entity.Property(e => e.CreditAmount).HasColumnType("decimal(18,2)");
-
-                entity.Property(e => e.FromUserId).HasColumnType("int(11)");
-
-                entity.Property(e => e.IsRecyc)
-                    .HasColumnType("bit(1)")
-                    .HasDefaultValueSql("b'0'");
-
-                entity.Property(e => e.MerNo)
-                    .HasColumnType("varchar(50)")
-                    .HasCharSet("utf8")
-                    .HasCollation("utf8_general_ci");
-
-                entity.Property(e => e.Note)
-                    .HasColumnType("varchar(50)")
-                    .HasCharSet("utf8")
-                    .HasCollation("utf8_general_ci");
-
-                entity.Property(e => e.PosSn)
-                    .HasColumnType("varchar(50)")
-                    .HasCharSet("utf8")
-                    .HasCollation("utf8_general_ci");
-
-                entity.Property(e => e.PosSnType).HasColumnType("int(11)");
-
-                entity.Property(e => e.QueryCount).HasColumnType("int(11)");
-
-                entity.Property(e => e.SeoDescription)
-                    .HasColumnType("varchar(500)")
-                    .HasCharSet("utf8")
-                    .HasCollation("utf8_general_ci");
-
-                entity.Property(e => e.SeoKeyword)
-                    .HasColumnType("varchar(200)")
-                    .HasCharSet("utf8")
-                    .HasCollation("utf8_general_ci");
-
-                entity.Property(e => e.SeoTitle)
-                    .HasColumnType("varchar(100)")
-                    .HasCharSet("utf8")
-                    .HasCollation("utf8_general_ci");
-
-                entity.Property(e => e.Sort).HasColumnType("int(11)");
-
-                entity.Property(e => e.Status).HasColumnType("int(11)");
-
-                entity.Property(e => e.ToUserId).HasColumnType("int(11)");
-
-                entity.Property(e => e.UpdateDate).HasColumnType("datetime");
-            });
-
             modelBuilder.Entity<StoreBalance>(entity =>
             {
                 entity.Property(e => e.Id).HasColumnType("int(11)");
@@ -10416,7 +9967,7 @@ namespace MySystem.Models
                 entity.Property(e => e.Id).HasColumnType("int(11)");
 
                 entity.Property(e => e.ActualApply)
-                    .HasColumnType("int(11) unsigned zerofill")
+                    .HasColumnType("int(11)")
                     .HasComment("实际申请台数");
 
                 entity.Property(e => e.ApplyNo)
@@ -10426,17 +9977,17 @@ namespace MySystem.Models
                     .HasCollation("latin1_swedish_ci");
 
                 entity.Property(e => e.ApplyNum)
-                    .HasColumnType("int(11) unsigned zerofill")
+                    .HasColumnType("int(11)")
                     .HasComment("申请箱数");
 
                 entity.Property(e => e.ApplyTime).HasColumnType("datetime");
 
                 entity.Property(e => e.BoxNum)
-                    .HasColumnType("int(11) unsigned zerofill")
+                    .HasColumnType("int(11)")
                     .HasComment("每箱台数");
 
                 entity.Property(e => e.BrandId)
-                    .HasColumnType("int(11) unsigned zerofill")
+                    .HasColumnType("int(11)")
                     .HasComment("产品Id");
 
                 entity.Property(e => e.CreateDate).HasColumnType("datetime");
@@ -10447,21 +9998,21 @@ namespace MySystem.Models
                     .HasCollation("utf8_general_ci");
 
                 entity.Property(e => e.LastApply)
-                    .HasColumnType("int(11) unsigned zerofill")
+                    .HasColumnType("int(11)")
                     .HasComment("上月申请台数");
 
                 entity.Property(e => e.MaxApply)
-                    .HasColumnType("int(11) unsigned zerofill")
+                    .HasColumnType("int(11)")
                     .HasComment("最多申请台数");
 
                 entity.Property(e => e.OrderId)
-                    .HasColumnType("int(11) unsigned zerofill")
+                    .HasColumnType("int(11)")
                     .HasComment("订单Id");
 
                 entity.Property(e => e.QueryCount).HasColumnType("int(11)");
 
                 entity.Property(e => e.SendNum)
-                    .HasColumnType("int(11) unsigned zerofill")
+                    .HasColumnType("int(11)")
                     .HasComment("发货箱数");
 
                 entity.Property(e => e.SeoDescription)
@@ -10484,7 +10035,7 @@ namespace MySystem.Models
                 entity.Property(e => e.Status).HasColumnType("int(11)");
 
                 entity.Property(e => e.StoreId)
-                    .HasColumnType("int(11) unsigned zerofill")
+                    .HasColumnType("int(11)")
                     .HasComment("仓库Id");
 
                 entity.Property(e => e.SwapSnExpand)
@@ -10501,7 +10052,7 @@ namespace MySystem.Models
                     .HasCollation("utf8_general_ci");
 
                 entity.Property(e => e.UserId)
-                    .HasColumnType("int(11) unsigned zerofill")
+                    .HasColumnType("int(11)")
                     .HasComment("创客Id");
 
                 entity.Property(e => e.Version).HasColumnType("int(11)");

PxcModels/PreSendStockDetail.cs

@@ -9,8 +9,6 @@ namespace MySystem.PxcModels
         public int Sort { get; set; }
         public int QueryCount { get; set; }
         public int Status { get; set; }
-        public int ReceivingStatus { get; set; }
-        public int IsUsed { get; set; }
         public DateTime? CreateDate { get; set; }
         public DateTime? UpdateDate { get; set; }
         public string SeoTitle { get; set; }

PxcModels/StoreMachineApply.cs

@@ -18,17 +18,17 @@ namespace MySystem.PxcModels
         public string SeoKeyword { get; set; }
         public string SeoDescription { get; set; }
         public DateTime? ApplyTime { get; set; }
-        public uint? BrandId { get; set; }
+        public int? BrandId { get; set; }
         public string ApplyNo { get; set; }
-        public uint? ApplyNum { get; set; }
-        public uint? SendNum { get; set; }
-        public uint? BoxNum { get; set; }
-        public uint? LastApply { get; set; }
-        public uint? MaxApply { get; set; }
-        public uint? ActualApply { get; set; }
-        public uint? UserId { get; set; }
-        public uint? StoreId { get; set; }
-        public uint? OrderId { get; set; }
+        public int? ApplyNum { get; set; }
+        public int? SendNum { get; set; }
+        public int? BoxNum { get; set; }
+        public int? LastApply { get; set; }
+        public int? MaxApply { get; set; }
+        public int? ActualApply { get; set; }
+        public int? UserId { get; set; }
+        public int? StoreId { get; set; }
+        public int? OrderId { get; set; }
         public string SwapSnExpand { get; set; }
     }
 }

PxcModels/WebCMSEntities.cs

@@ -630,6 +630,7 @@ namespace MySystem.PxcModels
 
                 entity.Property(e => e.Version).HasColumnType("int(11)");
             });
+
             modelBuilder.Entity<ActivityRedPackageStock>(entity =>
             {
                 entity.Property(e => e.Id).HasColumnType("int(11)");
@@ -7086,12 +7087,8 @@ namespace MySystem.PxcModels
 
                 entity.Property(e => e.FromUserId).HasColumnType("int(11)");
 
-                entity.Property(e => e.IsUsed).HasColumnType("int(11)");
-
                 entity.Property(e => e.QueryCount).HasColumnType("int(11)");
 
-                entity.Property(e => e.ReceivingStatus).HasColumnType("int(11)");
-
                 entity.Property(e => e.SeoDescription)
                     .HasColumnType("varchar(500)")
                     .HasCharSet("utf8")
@@ -9970,7 +9967,7 @@ namespace MySystem.PxcModels
                 entity.Property(e => e.Id).HasColumnType("int(11)");
 
                 entity.Property(e => e.ActualApply)
-                    .HasColumnType("int(11) unsigned zerofill")
+                    .HasColumnType("int(11)")
                     .HasComment("实际申请台数");
 
                 entity.Property(e => e.ApplyNo)
@@ -9980,17 +9977,17 @@ namespace MySystem.PxcModels
                     .HasCollation("latin1_swedish_ci");
 
                 entity.Property(e => e.ApplyNum)
-                    .HasColumnType("int(11) unsigned zerofill")
+                    .HasColumnType("int(11)")
                     .HasComment("申请箱数");
 
                 entity.Property(e => e.ApplyTime).HasColumnType("datetime");
 
                 entity.Property(e => e.BoxNum)
-                    .HasColumnType("int(11) unsigned zerofill")
+                    .HasColumnType("int(11)")
                     .HasComment("每箱台数");
 
                 entity.Property(e => e.BrandId)
-                    .HasColumnType("int(11) unsigned zerofill")
+                    .HasColumnType("int(11)")
                     .HasComment("产品Id");
 
                 entity.Property(e => e.CreateDate).HasColumnType("datetime");
@@ -10001,21 +9998,21 @@ namespace MySystem.PxcModels
                     .HasCollation("utf8_general_ci");
 
                 entity.Property(e => e.LastApply)
-                    .HasColumnType("int(11) unsigned zerofill")
+                    .HasColumnType("int(11)")
                     .HasComment("上月申请台数");
 
                 entity.Property(e => e.MaxApply)
-                    .HasColumnType("int(11) unsigned zerofill")
+                    .HasColumnType("int(11)")
                     .HasComment("最多申请台数");
 
                 entity.Property(e => e.OrderId)
-                    .HasColumnType("int(11) unsigned zerofill")
+                    .HasColumnType("int(11)")
                     .HasComment("订单Id");
 
                 entity.Property(e => e.QueryCount).HasColumnType("int(11)");
 
                 entity.Property(e => e.SendNum)
-                    .HasColumnType("int(11) unsigned zerofill")
+                    .HasColumnType("int(11)")
                     .HasComment("发货箱数");
 
                 entity.Property(e => e.SeoDescription)
@@ -10038,7 +10035,7 @@ namespace MySystem.PxcModels
                 entity.Property(e => e.Status).HasColumnType("int(11)");
 
                 entity.Property(e => e.StoreId)
-                    .HasColumnType("int(11) unsigned zerofill")
+                    .HasColumnType("int(11)")
                     .HasComment("仓库Id");
 
                 entity.Property(e => e.SwapSnExpand)
@@ -10055,7 +10052,7 @@ namespace MySystem.PxcModels
                     .HasCollation("utf8_general_ci");
 
                 entity.Property(e => e.UserId)
-                    .HasColumnType("int(11) unsigned zerofill")
+                    .HasColumnType("int(11)")
                     .HasComment("创客Id");
 
                 entity.Property(e => e.Version).HasColumnType("int(11)");

Startup.cs

@@ -90,9 +90,9 @@ namespace MySystem
             // services.AddHostedService<PopService>();
             // services.AddHostedService<SycnSpTimer>(); //同步SP数据
 
-            // services.AddHostedService<TimerStatTimer>(); //实时统计创客、激活商户数
-            // services.AddHostedService<PosTradeStatTimer>(); // 统计头天的交易额、商户型创客、激活奖励、开机奖励
-            // services.AddHostedService<AlipayPayBack2Timer>(); //支付宝回调处理
+            services.AddHostedService<TimerStatTimer>(); //实时统计创客、激活商户数
+            services.AddHostedService<PosTradeStatTimer>(); // 统计头天的交易额、商户型创客、激活奖励、开机奖励
+            services.AddHostedService<AlipayPayBack2Timer>(); //支付宝回调处理
 
             //services.AddHttpContextAccessor();