合并统计

AppStart/Helper/Profit/ProfitHelper.cs

@@ -2199,7 +2199,13 @@ namespace MySystem
                                                 UserLevel = rank.Rank;
                                             }
                                         }
-                                        if (UserLevel == maxLevel && UserLevel == curLevel) //判断当前创客是否有直推的激活机具，并且在活动时间内
+                                        if(level == 1)
+                                        {
+                                            function.WriteLog(user.MakerCode, "分润补贴日志");
+                                            function.WriteLog(user.UserLevel.ToString(), "分润补贴日志");
+                                            function.WriteLog(pos.PosSn, "分润补贴日志");
+                                        }
+                                        if (curLevel == maxLevel) //判断当前创客是否有直推的激活机具，并且在活动时间内
                                         {
                                             break;
                                         }
@@ -2210,6 +2216,7 @@ namespace MySystem
                                             {
                                                 HelpTime = 1;
                                             }
+                                            function.WriteLog("HelpTime:" + HelpTime, "分润补贴日志");
                                             int LevelKindId = GetLevelKindId(BrandId, HelpTime, 1);
                                             ProfitObjectLevels objlevel = RedisDbconn.Instance.Get<ProfitObjectLevels>("pobjlv" + LevelKindId + ":" + UserLevel); //获取当前等级参数
                                             if (objlevel != null)
@@ -2251,32 +2258,55 @@ namespace MySystem
                                                     });
                                                 }
 
-                                                //分润补贴
+                                                // 分润补贴
                                                 if (HelpTime == 1 && level == 1)
                                                 {
+                                                    function.WriteLog("满足条件", "分润补贴日志");
                                                     int SubsidyUserId = pos.BuyUserId;
                                                     Users subuser = dbnew.Users.FirstOrDefault(m => m.Id == SubsidyUserId) ?? new Users();
-                                                    decimal otherPercent = 0.001M - objlevel.Percents;
-                                                    decimal otherMoney = TradeAmt * otherPercent;
-                                                    if (otherMoney >= obj.MinProfitVal)
+                                                    int subUserLevel = subuser.UserLevel;
+                                                    if(subUserLevel < 5)
                                                     {
-                                                        result.Add(new ProfitResult()
+                                                        function.WriteLog("1:" + subUserLevel, "分润补贴日志");
+                                                        UserRankWhite subrank = dbnew.UserRankWhite.FirstOrDefault(m => m.Id == subuser.Id && m.UpdateDate > now);
+                                                        if (subrank != null)
+                                                        {
+                                                            if (subrank.Rank > subUserLevel)
+                                                            {
+                                                                subUserLevel = subrank.Rank;
+                                                            }
+                                                        }
+                                                        if(subUserLevel < 5)
                                                         {
-                                                            UserId = subuser.Id,
-                                                            UserNav = subuser.ParentNav,
-                                                            Money = PublicFunction.NumberFormat(otherMoney),
-                                                            ProfitRate = otherPercent,
-                                                            Message = "分润补贴",
-                                                            BankCardType = BankCardType,
-                                                            QrPayFlag = QrPayFlag,
-                                                            DirectFlag = 1,
-                                                            BrandId = pos.BrandId,
-                                                            IsSubsidy = 1,
-                                                            MerchantId = pos.BindMerchantId,
-                                                            TradeAmount = TradeAmt,
-                                                            HelpFlag = HelpTime,
-                                                            PosSn = pos.PosSn,
-                                                        });
+                                                            function.WriteLog("2:" + subUserLevel, "分润补贴日志");
+                                                            ProfitObjectLevels sublevel = RedisDbconn.Instance.Get<ProfitObjectLevels>("pobjlv" + LevelKindId + ":" + subUserLevel); //获取当前等级参数
+                                                            if (sublevel != null)
+                                                            {
+                                                                function.WriteLog("3:" + sublevel.Percents, "分润补贴日志");
+                                                                decimal otherPercent = 0.001M - sublevel.Percents;
+                                                                decimal otherMoney = TradeAmt * otherPercent;
+                                                                if (otherMoney >= obj.MinProfitVal)
+                                                                {
+                                                                    result.Add(new ProfitResult()
+                                                                    {
+                                                                        UserId = subuser.Id,
+                                                                        UserNav = subuser.ParentNav,
+                                                                        Money = PublicFunction.NumberFormat(otherMoney),
+                                                                        ProfitRate = otherPercent,
+                                                                        Message = "分润补贴",
+                                                                        BankCardType = BankCardType,
+                                                                        QrPayFlag = QrPayFlag,
+                                                                        DirectFlag = 1,
+                                                                        BrandId = pos.BrandId,
+                                                                        IsSubsidy = 1,
+                                                                        MerchantId = pos.BindMerchantId,
+                                                                        TradeAmount = TradeAmt,
+                                                                        HelpFlag = HelpTime,
+                                                                        PosSn = pos.PosSn,
+                                                                    });
+                                                                }
+                                                            }
+                                                        }
                                                     }
                                                 }
                                             }

AppStart/Helper/StatService.cs

@@ -28,7 +28,7 @@ namespace MySystem
                     // dosomething1(doDate);
                     // dosomething11(doDate);
                     // dosomething2(doDate);
-                    StartEverDay(doDate);
+                    StartEverDayV2(doDate);
                     dosomething4(doDate);
                     ListenFluxRecord(doDate);
                 }
@@ -1168,34 +1168,32 @@ namespace MySystem
 
 
         // 每天统计头一天的交易额
-        public void StartEverDay(string date)
+        public void StartEverDayV2(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)
+            OtherMySqlConn.connstr = Library.ConfigurationManager.AppSettings["Pxc1SqlConnStr"].ToString();            
+            // if(DateTime.Now.Day == 2)
             // {
-            //     Thread th = new Thread(StatTradeAmountEverDay);
-            //     th.IsBackground = true;
-            //     th.Start(check.ToString("yyyy-MM-dd"));
-            //     check = check.AddDays(1);
+            //     OtherMySqlConn.op("update Users set ThisMonthTrade=0 where ThisMonthTrade>0");
             // }
-            if(DateTime.Now.Day == 2)
+            // Thread th = new Thread(StatTradeAmountEverDay);
+            // th.IsBackground = true;
+            // th.Start(date);
+            Thread th = new Thread(StartEverDayV2Do);
+            th.IsBackground = true;
+            th.Start();
+        }
+        public void StartEverDayV2Do()
+        {
+            DateTime end = DateTime.Parse("2022-06-13 00:00:00");
+            DateTime check = DateTime.Parse("2022-06-01");
+            while (check <= end)
             {
-                OtherMySqlConn.op("update Users set ThisMonthTrade=0 where ThisMonthTrade>0");
-                DataTable dt = OtherMySqlConn.dtable("select UserId,sum(NonDirectTradeAmt) from UserTradeDaySummary where TradeMonth='" + DateTime.Now.ToString("yyyyMM") + "' and SeoTitle='team' group by UserId");
-                foreach(DataRow dr in dt.Rows)
-                {
-                    string UserId = dr["UserId"].ToString();
-                    string ThisMonthTrade = dr[1].ToString();
-                    OtherMySqlConn.op("update Users set ThisMonthTrade=" + ThisMonthTrade + " where Id=" + UserId);
-                }
+                StatTradeAmountEverDayV2(check.ToString("yyyy-MM-dd"));
+                Thread.Sleep(1000);
+                check = check.AddDays(1);
             }
-            Thread th = new Thread(StatTradeAmountEverDay);
-            th.IsBackground = true;
-            th.Start(date);
         }
-        public void StatTradeAmountEverDay(object sender)
+        public void StatTradeAmountEverDayV2(object sender)
         {
             string date = sender.ToString();
             function.WriteLog(DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss.fff"), "执行昨天交易额日志");
@@ -1206,7 +1204,7 @@ namespace MySystem
                 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";
+                string startId = "0";
                 List<string> uids = new List<string>();
                 DataTable startDt = OtherMySqlConn.dtable("select min(Id) from TradeRecord where CreateDate>='" + start + "'");
                 if (startDt.Rows.Count > 0)
@@ -1214,59 +1212,76 @@ namespace MySystem
                     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 + "')");
+                DataTable userDt = OtherMySqlConn.dtable("select Id,ParentNav from Users where Id in (select DISTINCT UserId from TradeRecord where Id>=" + startId + " 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");
+                    DataTable selfdt = OtherMySqlConn.dtable("select BrandId,BankCardType,QrPayFlag,MerHelpFlag,CapFlag,VipFlag,PayType,sum(TradeAmount),count(Id) from TradeRecord where Id>=" + startId + " and CreateDate>='" + start + "' and CreateDate<'" + end + "' and UserId=" + UserId + " group by BrandId,BankCardType,QrPayFlag,MerHelpFlag,CapFlag,VipFlag,PayType");
                     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");
+                        int MerHelpFlag = int.Parse(selfDr["MerHelpFlag"].ToString());
+                        int CapFlag = int.Parse(selfDr["CapFlag"].ToString());
+                        int VipFlag = int.Parse(selfDr["VipFlag"].ToString());
+                        int PayType = int.Parse(selfDr["PayType"].ToString());
+                        decimal TradeAmount = decimal.Parse(selfDr[7].ToString());
+                        int TradeCount = int.Parse(selfDr[8].ToString());
+                        TradeDaySummary selfStat = db.TradeDaySummary.FirstOrDefault(m => m.UserId == UserId && m.TradeMonth == TradeMonth && m.TradeDate == TradeDate && m.BrandId == BrandId && m.QueryCount == QrPayFlag && m.VipFlag == VipFlag && m.PayType == PayType && m.SeoTitle == "self");
                         if (selfStat == null)
                         {
-                            selfStat = db.UserTradeDaySummary.Add(new UserTradeDaySummary()
+                            selfStat = db.TradeDaySummary.Add(new TradeDaySummary()
                             {
                                 UserId = UserId,
                                 TradeMonth = TradeMonth,
                                 TradeDate = TradeDate,
                                 BrandId = BrandId,
                                 QueryCount = QrPayFlag,
+                                VipFlag = VipFlag,
+                                PayType = PayType,
                                 SeoTitle = "self",
                             }).Entity;
                             db.SaveChanges();
                         }
                         if (BankCardType == 0)
                         {
-                            selfStat.DirectDebitTradeAmt += TradeAmount;
+                            if(MerHelpFlag == 1)
+                            {
+                                selfStat.HelpDirectDebitTradeAmt += TradeAmount;
+                                if(CapFlag == 1)
+                                {
+                                    selfStat.HelpDirectDebitCapTradeAmt += TradeAmount;
+                                    selfStat.HelpDirectDebitCapNum += TradeCount;
+                                }
+                            }
+                            else
+                            {
+                                selfStat.NotHelpDirectDebitTradeAmt += TradeAmount;
+                                if(CapFlag == 1)
+                                {
+                                    selfStat.NotHelpDirectDebitCapTradeAmt += TradeAmount;
+                                    selfStat.NotHelpDirectDebitCapNum += TradeCount;
+                                }
+                            }
                         }
                         else if (BankCardType != 0)
                         {
-                            selfStat.DirectTradeAmt += TradeAmount;
+                            if(MerHelpFlag == 1)
+                            {
+                                selfStat.HelpDirectTradeAmt += TradeAmount;
+                            }
+                            else
+                            {
+                                selfStat.NotHelpDirectTradeAmt += 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 + ",";
@@ -1278,48 +1293,70 @@ namespace MySystem
                                 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");
+                                DataTable teamDt = OtherMySqlConn.dtable("select BrandId,BankCardType,QrPayFlag,MerHelpFlag,CapFlag,VipFlag,PayType,sum(TradeAmount),count(Id) from TradeRecord where Id>=" + startId + " 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,MerHelpFlag,CapFlag,VipFlag,PayType");
                                 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");
+                                    int MerHelpFlag = int.Parse(teamDr["MerHelpFlag"].ToString());
+                                    int CapFlag = int.Parse(teamDr["CapFlag"].ToString());
+                                    int VipFlag = int.Parse(teamDr["VipFlag"].ToString());
+                                    int PayType = int.Parse(teamDr["PayType"].ToString());
+                                    decimal TradeAmount = decimal.Parse(teamDr[7].ToString());
+                                    int TradeCount = int.Parse(teamDr[8].ToString());
+                                    TradeDaySummary teamStat = db.TradeDaySummary.FirstOrDefault(m => m.UserId == NavUserId && m.TradeMonth == TradeMonth && m.TradeDate == TradeDate && m.BrandId == BrandId && m.QueryCount == QrPayFlag && m.VipFlag == VipFlag && m.PayType == PayType && m.SeoTitle == "team");
                                     if (teamStat == null)
                                     {
-                                        teamStat = db.UserTradeDaySummary.Add(new UserTradeDaySummary()
+                                        teamStat = db.TradeDaySummary.Add(new TradeDaySummary()
                                         {
                                             UserId = NavUserId,
                                             TradeMonth = TradeMonth,
                                             TradeDate = TradeDate,
                                             BrandId = BrandId,
                                             QueryCount = QrPayFlag,
+                                            VipFlag = VipFlag,
+                                            PayType = PayType,
                                             SeoTitle = "team",
                                         }).Entity;
                                         db.SaveChanges();
                                     }
                                     if (BankCardType == 0)
                                     {
-                                        teamStat.NonDirectDebitTradeAmt += TradeAmount;
+                                        if(MerHelpFlag == 1)
+                                        {
+                                            teamStat.HelpNonDirectDebitTradeAmt += TradeAmount;
+                                            if(CapFlag == 1)
+                                            {
+                                                teamStat.HelpDirectDebitCapTradeAmt += TradeAmount;
+                                                teamStat.HelpDirectDebitCapNum += TradeCount;
+                                            }
+                                        }
+                                        else
+                                        {
+                                            teamStat.NotHelpNonDirectDebitTradeAmt += TradeAmount;
+                                            if(CapFlag == 1)
+                                            {
+                                                teamStat.NotHelpDirectDebitCapTradeAmt += TradeAmount;
+                                                teamStat.NotHelpDirectDebitCapNum += TradeCount;
+                                            }
+                                        }
                                     }
                                     else if (BankCardType != 0)
                                     {
-                                        teamStat.NonDirectTradeAmt += TradeAmount;
+                                        if(MerHelpFlag == 1)
+                                        {
+                                            teamStat.HelpNonDirectTradeAmt += TradeAmount;
+                                        }
+                                        else
+                                        {
+                                            teamStat.NotHelpNonDirectTradeAmt += 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);
                             }
                         }
                     }
@@ -1725,8 +1762,8 @@ namespace MySystem
         }
         public void StartPosActNumFor()
         {
-            DateTime end = DateTime.Parse("2022-05-26 00:00:00");
-            DateTime check = DateTime.Parse("2022-03-11");
+            DateTime end = DateTime.Parse("2022-06-13 00:00:00");
+            DateTime check = DateTime.Parse("2022-06-01");
             while (check <= end)
             {
                 StartPosActNumDo(check.ToString("yyyy-MM-dd"));
@@ -1836,8 +1873,8 @@ namespace MySystem
         }
         public void StartNewUserNumFor()
         {
-            DateTime end = DateTime.Parse("2022-05-26 00:00:00");
-            DateTime check = DateTime.Parse("2022-02-20");
+            DateTime end = DateTime.Parse("2022-06-13 00:00:00");
+            DateTime check = DateTime.Parse("2022-06-01");
             while (check <= end)
             {
                 StartNewUserNumDo(check.ToString("yyyy-MM-dd"));
@@ -1932,6 +1969,124 @@ namespace MySystem
 
 
 
+        // 每天统计头一天的收益
+        public void StatProfit(string date)
+        {
+            OtherMySqlConn.connstr = Library.ConfigurationManager.AppSettings["Pxc1SqlConnStr"].ToString();
+            Thread th = new Thread(StatProfitDo);
+            th.IsBackground = true;
+            th.Start();
+        }
+        public void StatProfitDo()
+        {
+            DateTime end = DateTime.Parse("2022-06-13 00:00:00");
+            DateTime check = DateTime.Parse("2022-06-01");
+            while (check <= end)
+            {
+                StatProfitEverDay(check.ToString("yyyy-MM-dd"));
+                Thread.Sleep(1000);
+                check = check.AddDays(1);
+            }
+        }
+        public void StatProfitEverDay(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";
+                List<string> uids = new List<string>();
+                DataTable startDt = OtherMySqlConn.dtable("select min(Id) from UserAccountRecord where CreateDate>='" + start + "'");
+                if (startDt.Rows.Count > 0)
+                {
+                    startId = startDt.Rows[0][0].ToString();
+                }
+                function.WriteLog(startId + "\n\n", "执行昨天收益日志");
+                DataTable userDt = OtherMySqlConn.dtable("select Id,ParentNav from Users where Id in (select DISTINCT UserId from UserAccountRecord where Id>=" + startId + " 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 ChangeType,ProductType,sum(ChangeAmount) from UserAccountRecord where Id>=" + startId + " and CreateDate>='" + start + "' and CreateDate<'" + end + "' and UserId=" + UserId + " group by ChangeType,ProductType");
+                    function.WriteLog(UserId + ":" + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss.fff") + "\n\n", "执行昨天收益日志");
+                    foreach (DataRow selfDr in selfdt.Rows)
+                    {
+                        int ChangeType = int.Parse(selfDr["ChangeType"].ToString());
+                        int ProductType = int.Parse(selfDr["ProductType"].ToString());
+                        decimal ProfitAmount = decimal.Parse(selfDr[2].ToString());
+                        UserRebateDetail selfStat = db.UserRebateDetail.FirstOrDefault(m => m.UserId == UserId && m.TradeMonth == TradeMonth && m.TradeDate == TradeDate && m.RebateType == ChangeType && m.ProductType == ProductType && m.SeoTitle == "self");
+                        if (selfStat == null)
+                        {
+                            selfStat = db.UserRebateDetail.Add(new UserRebateDetail()
+                            {
+                                UserId = UserId,
+                                TradeMonth = TradeMonth,
+                                TradeDate = TradeDate,
+                                RebateType = ChangeType,
+                                ProductType = ProductType,
+                                SeoTitle = "self",
+                            }).Entity;
+                            db.SaveChanges();
+                        }
+                        selfStat.CreditRewardAmount += ProfitAmount;
+                        db.SaveChanges();
+                    }
+                    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 ChangeType,ProductType,sum(ChangeAmount) from UserAccountRecord where Id>=" + startId + " and CreateDate>='" + start + "' and CreateDate<'" + end + "' and UserId in (select Id from Users where ParentNav like '%," + NavUserId + ",%' or Id=" + NavUserId + ") group by ChangeType,ProductType");
+                                function.WriteLog(NavUserId + ":team:" + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss.fff") + "\n\n", "执行昨天收益日志");
+                                foreach (DataRow teamDr in teamDt.Rows)
+                                {
+                                    int ChangeType = int.Parse(teamDr["ChangeType"].ToString());
+                                    int ProductType = int.Parse(teamDr["ProductType"].ToString());
+                                    decimal ProfitAmount = decimal.Parse(teamDr[2].ToString());
+                                    UserRebateDetail teamStat = db.UserRebateDetail.FirstOrDefault(m => m.UserId == NavUserId && m.TradeMonth == TradeMonth && m.TradeDate == TradeDate && m.RebateType == ChangeType && m.ProductType == ProductType && m.SeoTitle == "team");
+                                    if (teamStat == null)
+                                    {
+                                        teamStat = db.UserRebateDetail.Add(new UserRebateDetail()
+                                        {
+                                            UserId = NavUserId,
+                                            TradeMonth = TradeMonth,
+                                            TradeDate = TradeDate,
+                                            RebateType = ChangeType,
+                                            ProductType = ProductType,
+                                            SeoTitle = "team",
+                                        }).Entity;
+                                        db.SaveChanges();
+                                    }
+                                    teamStat.CreditRewardAmount += ProfitAmount;
+                                    db.SaveChanges();
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+            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", "执行昨天收益日志");
+        }
+
+
 
 
 

AppStart/Helper/SycnSpServer/SycnSpTradeService.cs

@@ -90,11 +90,15 @@ namespace MySystem
                                         decimal TradeAmount = trade.TradeAmount;
                                         int BankCardType = -1;
                                         int QrPayFlag = 0;
+                                        int VipFlag = 0;
+                                        int PayType = 0;
                                         if (pos.BrandId == 1 || pos.BrandId == 3)
                                         {
                                             TradeAmount = TradeAmount / 100;
                                             BankCardType = int.Parse(trade.BankCardType);
                                             if (trade.TradeType == "02") QrPayFlag = 1;
+                                            else if (trade.TradeType == "NQ") PayType = 1;
+                                            if (trade.SettleMethod == "E") VipFlag = 1;
                                         }
                                         else if (pos.BrandId == 2)
                                         {
@@ -120,6 +124,7 @@ namespace MySystem
                                                 BankCardType = 0;
                                             }
                                             if (trade.TradeType == "200") QrPayFlag = 1;
+                                            if (trade.Field1 == "1") VipFlag = 1;
                                         }
                                         else if (pos.BrandId == 6)
                                         {
@@ -166,6 +171,24 @@ namespace MySystem
                                         }
                                         if (TradeAmount > 0)
                                         {
+                                            ulong MerHelpFlag = 0;
+                                            decimal DepositAmt = decimal.Parse(function.CheckNum(pos.SeoKeyword));
+                                            if (DepositAmt > 0)
+                                            {
+                                                int Days = int.Parse(RedisDbconn.Instance.Get<string>("pobjrule:" + pos.BrandId + ":HelpPolicy:Days")); //天数
+                                                if (pos.BindingTime != null)
+                                                {
+                                                    if (pos.BindingTime.Value.AddDays(Days) > DateTime.Now)
+                                                    {
+                                                        MerHelpFlag = 1;
+                                                    }
+                                                }
+                                            }
+                                            int CapFlag = 0;
+                                            if(BankCardType == 0 && TradeAmount >= 1666.67M)
+                                            {
+                                                CapFlag = 1;
+                                            }
                                             db.TradeRecord.Add(new PxcModels.TradeRecord()
                                             {
                                                 CreateDate = trade.CreateDate,
@@ -174,7 +197,7 @@ namespace MySystem
                                                 UserId = pos.UserId, //创客
                                                 MerchantId = pos.BindMerchantId, //商户
                                                 MerNo = trade.MerNo, //渠道商户编号
-                                                MerHelpFlag = 0, //是否属于扶持周期内商户
+                                                MerHelpFlag = MerHelpFlag, //是否属于扶持周期内商户
                                                 HelpMonthCount = 0, //扶持第几个月
                                                 MerBuddyType = user.MerchantType, //商户创客类型
                                                 SnNo = trade.TradeSnNo, //渠道SN号
@@ -182,6 +205,9 @@ namespace MySystem
                                                 TradeAmount = TradeAmount, //交易金额
                                                 BankCardType = BankCardType, //银行卡类型
                                                 QrPayFlag = QrPayFlag, //云闪付标识
+                                                CapFlag = CapFlag, //借记卡是否封顶
+                                                VipFlag = VipFlag, //会员标记
+                                                PayType = PayType, //支付方式
                                                 BrandId = BrandId, //品牌
                                                 Remark = trade.Remark, //备注
                                                 TopUserId = TopUserId, //顶级创客

Models/ActivityRedPackageJoinss.cs

@@ -0,0 +1,24 @@
+using System;
+using System.Collections.Generic;
+
+namespace MySystem.Models
+{
+    public partial class ActivityRedPackageJoinss
+    {
+        public int Id { get; set; }
+        public int Sort { get; set; }
+        public int QueryCount { get; set; }
+        public int Status { get; set; }
+        public int Version { get; set; }
+        public DateTime? CreateDate { get; set; }
+        public DateTime? UpdateDate { get; set; }
+        public string CreateMan { get; set; }
+        public string UpdateMan { get; set; }
+        public string SeoTitle { get; set; }
+        public string SeoKeyword { get; set; }
+        public string SeoDescription { get; set; }
+        public decimal PrizeAmt { get; set; }
+        public string ActivityDate { get; set; }
+        public int UserId { get; set; }
+    }
+}

Models/ActivityRedPackageStocks.cs

@@ -0,0 +1,24 @@
+using System;
+using System.Collections.Generic;
+
+namespace MySystem.Models
+{
+    public partial class ActivityRedPackageStocks
+    {
+        public int Id { get; set; }
+        public int Sort { get; set; }
+        public int QueryCount { get; set; }
+        public int Status { get; set; }
+        public int Version { get; set; }
+        public DateTime? CreateDate { get; set; }
+        public DateTime? UpdateDate { get; set; }
+        public string CreateMan { get; set; }
+        public string UpdateMan { get; set; }
+        public string SeoTitle { get; set; }
+        public string SeoKeyword { get; set; }
+        public string SeoDescription { get; set; }
+        public string ActivityDate { get; set; }
+        public decimal PrizeAmt { get; set; }
+        public int UserId { get; set; }
+    }
+}

Models/ActivityRedPackageTop10s.cs

@@ -0,0 +1,25 @@
+using System;
+using System.Collections.Generic;
+
+namespace MySystem.Models
+{
+    public partial class ActivityRedPackageTop10s
+    {
+        public int Id { get; set; }
+        public int Sort { get; set; }
+        public int QueryCount { get; set; }
+        public int Status { get; set; }
+        public int Version { get; set; }
+        public DateTime? CreateDate { get; set; }
+        public DateTime? UpdateDate { get; set; }
+        public string CreateMan { get; set; }
+        public string UpdateMan { get; set; }
+        public string SeoTitle { get; set; }
+        public string SeoKeyword { get; set; }
+        public string SeoDescription { get; set; }
+        public int Kind { get; set; }
+        public int TimeNum { get; set; }
+        public decimal PrizeAmt { get; set; }
+        public int UserId { get; set; }
+    }
+}

Models/PosCoupons.cs

@@ -19,5 +19,6 @@ namespace MySystem.Models
         public ulong IsUse { get; set; }
         public string ExchangeCode { get; set; }
         public int UserId { get; set; }
+        public int LeaderUserId { get; set; }
     }
 }

Models/PosMachinesTwo.cs

@@ -43,5 +43,7 @@ namespace MySystem.Models
         public string Detail { get; set; }
         public int ActivationState { get; set; }
         public int BindingState { get; set; }
+        public int LeaderUserId { get; set; }
+        public int PreUserId { get; set; }
     }
 }

Models/PreSendStockDetail.cs

@@ -0,0 +1,34 @@
+using System;
+using System.Collections.Generic;
+
+namespace MySystem.Models
+{
+    public partial class PreSendStockDetail
+    {
+        public int Id { get; set; }
+        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; }
+        public string SeoKeyword { get; set; }
+        public string SeoDescription { get; set; }
+        public DateTime? CancelDate { get; set; }
+        public ulong CancelFlag { get; set; }
+        public int FromStoreId { get; set; }
+        public int FromUserId { get; set; }
+        public DateTime? ApplyDate { get; set; }
+        public ulong ApplyFlag { get; set; }
+        public int SourceStoreId { get; set; }
+        public string ToRemark { get; set; }
+        public int ToStoreId { get; set; }
+        public int ToUserId { get; set; }
+        public int SnId { get; set; }
+        public string SnNo { get; set; }
+        public int BrandId { get; set; }
+        public int StoreId { get; set; }
+    }
+}

Models/SmallStoreHouse.cs

@@ -0,0 +1,27 @@
+using System;
+using System.Collections.Generic;
+
+namespace MySystem.Models
+{
+    public partial class SmallStoreHouse
+    {
+        public int Id { get; set; }
+        public int Sort { get; set; }
+        public int QueryCount { get; set; }
+        public int Status { get; set; }
+        public DateTime? CreateDate { get; set; }
+        public DateTime? UpdateDate { get; set; }
+        public string SeoTitle { get; set; }
+        public string SeoKeyword { get; set; }
+        public string SeoDescription { get; set; }
+        public int FromStoreId { get; set; }
+        public string Mobile { get; set; }
+        public string Remark { get; set; }
+        public int LaveNum { get; set; }
+        public int TotalNum { get; set; }
+        public string BrandId { get; set; }
+        public int UserId { get; set; }
+        public string StoreName { get; set; }
+        public string StoreNo { get; set; }
+    }
+}

Models/TradeDaySummary.cs

@@ -60,5 +60,7 @@ namespace MySystem.Models
         public string TradeMonth { get; set; }
         public string TradeDate { get; set; }
         public int UserId { get; set; }
+        public int PayType { get; set; }
+        public int VipFlag { get; set; }
     }
 }

Models/TradeRecord.cs

@@ -38,5 +38,7 @@ namespace MySystem.Models
         public int UserId { get; set; }
         public string RecordNo { get; set; }
         public string ParentNav { get; set; }
+        public int PayType { get; set; }
+        public int VipFlag { get; set; }
     }
 }

Models/Users.cs

@@ -81,5 +81,6 @@ namespace MySystem.Models
         public string NickName { get; set; }
         public int CashStatus { get; set; }
         public string CashNote { get; set; }
+        public decimal ThisMonthTrade { get; set; }
     }
 }

Models/WebCMSEntities.cs

@@ -106,6 +106,7 @@ namespace MySystem.Models
         public virtual DbSet<PosMerchantInfo> PosMerchantInfo { get; set; }
         public virtual DbSet<PosMerchantOtherInfo> PosMerchantOtherInfo { get; set; }
         public virtual DbSet<PosMerchantTradeSummay> PosMerchantTradeSummay { get; set; }
+        public virtual DbSet<PreSendStockDetail> PreSendStockDetail { get; set; }
         public virtual DbSet<ProductComment> ProductComment { get; set; }
         public virtual DbSet<ProductCommentAgree> ProductCommentAgree { get; set; }
         public virtual DbSet<ProductFareAreas> ProductFareAreas { get; set; }
@@ -140,6 +141,7 @@ namespace MySystem.Models
         public virtual DbSet<RightDic> RightDic { get; set; }
         public virtual DbSet<ServiceCenter> ServiceCenter { get; set; }
         public virtual DbSet<SetMerchantTypeRecord> SetMerchantTypeRecord { get; set; }
+        public virtual DbSet<SmallStoreHouse> SmallStoreHouse { get; set; }
         public virtual DbSet<StoreBalance> StoreBalance { get; set; }
         public virtual DbSet<StoreChangeHistory> StoreChangeHistory { get; set; }
         public virtual DbSet<StoreForCode> StoreForCode { get; set; }
@@ -628,7 +630,56 @@ 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)");
@@ -679,6 +730,56 @@ 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 =>
             {
@@ -730,6 +831,56 @@ 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)");
@@ -4145,6 +4296,52 @@ 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)
@@ -6387,40 +6584,223 @@ namespace MySystem.Models
                     .HasCharSet("utf8")
                     .HasCollation("utf8_general_ci");
 
-                entity.Property(e => e.ShowTitle)
-                    .HasColumnType("bit(1)")
-                    .HasDefaultValueSql("b'0'");
-
+                entity.Property(e => e.ShowTitle)
+                    .HasColumnType("bit(1)")
+                    .HasDefaultValueSql("b'0'");
+
+                entity.Property(e => e.Sort).HasColumnType("int(11)");
+
+                entity.Property(e => e.Status).HasColumnType("int(11)");
+
+                entity.Property(e => e.StatusBarStyle)
+                    .HasColumnType("varchar(10)")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.TextColor)
+                    .HasColumnType("varchar(6)")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.Title)
+                    .HasColumnType("varchar(50)")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                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.Version).HasColumnType("int(11)");
+            });
+
+            modelBuilder.Entity<PosCouponForUser>(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.StatusBarStyle)
+                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.TextColor)
-                    .HasColumnType("varchar(6)")
+                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.LeaderUserId).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.Title)
-                    .HasColumnType("varchar(50)")
+                entity.Property(e => e.SeoKeyword)
+                    .HasColumnType("varchar(200)")
                     .HasCharSet("utf8")
                     .HasCollation("utf8_general_ci");
 
-                entity.Property(e => e.UpdateDate).HasColumnType("datetime");
-
-                entity.Property(e => e.UpdateMan)
-                    .HasColumnType("varchar(50)")
+                entity.Property(e => e.SeoTitle)
+                    .HasColumnType("varchar(100)")
                     .HasCharSet("utf8")
                     .HasCollation("utf8_general_ci");
 
-                entity.Property(e => e.Version).HasColumnType("int(11)");
+                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<PosCouponForUser>(entity =>
+            modelBuilder.Entity<PosMachines>(entity =>
             {
                 entity.Property(e => e.Id).HasColumnType("int(11)");
 
@@ -6792,6 +7172,8 @@ namespace MySystem.Models
                     .HasColumnType("bit(1)")
                     .HasDefaultValueSql("b'0'");
 
+                entity.Property(e => e.LeaderUserId).HasColumnType("int(11)");
+
                 entity.Property(e => e.OrderId).HasColumnType("int(11)");
 
                 entity.Property(e => e.PosSn)
@@ -6801,6 +7183,8 @@ namespace MySystem.Models
 
                 entity.Property(e => e.PosSnType).HasColumnType("int(11)");
 
+                entity.Property(e => e.PreUserId).HasColumnType("int(11)");
+
                 entity.Property(e => e.PrizeParams)
                     .HasColumnType("varchar(200)")
                     .HasCharSet("utf8")
@@ -7055,6 +7439,78 @@ namespace MySystem.Models
                 entity.Property(e => e.UpdateDate).HasColumnType("datetime");
             });
 
+            modelBuilder.Entity<PreSendStockDetail>(entity =>
+            {
+                entity.Property(e => e.Id).HasColumnType("int(11)");
+
+                entity.Property(e => e.ApplyDate).HasColumnType("datetime");
+
+                entity.Property(e => e.ApplyFlag)
+                    .HasColumnType("bit(1)")
+                    .HasDefaultValueSql("b'0'");
+
+                entity.Property(e => e.BrandId).HasColumnType("int(11)");
+
+                entity.Property(e => e.CancelDate).HasColumnType("datetime");
+
+                entity.Property(e => e.CancelFlag)
+                    .HasColumnType("bit(1)")
+                    .HasDefaultValueSql("b'0'");
+
+                entity.Property(e => e.CreateDate).HasColumnType("datetime");
+
+                entity.Property(e => e.FromStoreId).HasColumnType("int(11)");
+
+                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")
+                    .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.SnId).HasColumnType("int(11)");
+
+                entity.Property(e => e.SnNo)
+                    .HasColumnType("varchar(32)")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.Sort).HasColumnType("int(11)");
+
+                entity.Property(e => e.SourceStoreId).HasColumnType("int(11)");
+
+                entity.Property(e => e.Status).HasColumnType("int(11)");
+
+                entity.Property(e => e.StoreId).HasColumnType("int(11)");
+
+                entity.Property(e => e.ToRemark)
+                    .HasColumnType("varchar(64)")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.ToStoreId).HasColumnType("int(11)");
+
+                entity.Property(e => e.ToUserId).HasColumnType("int(11)");
+
+                entity.Property(e => e.UpdateDate).HasColumnType("datetime");
+            });
+
             modelBuilder.Entity<ProductComment>(entity =>
             {
                 entity.Property(e => e.Id).HasColumnType("int(11)");
@@ -9502,6 +9958,138 @@ namespace MySystem.Models
                 entity.Property(e => e.UpdateDate).HasColumnType("datetime");
             });
 
+            modelBuilder.Entity<SmallStoreHouse>(entity =>
+            {
+                entity.Property(e => e.Id).HasColumnType("int(11)");
+
+                entity.Property(e => e.BrandId)
+                    .HasColumnType("varchar(30)")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.CreateDate).HasColumnType("datetime");
+
+                entity.Property(e => e.FromStoreId).HasColumnType("int(11)");
+
+                entity.Property(e => e.LaveNum).HasColumnType("int(11)");
+
+                entity.Property(e => e.Mobile)
+                    .HasColumnType("varchar(11)")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.QueryCount).HasColumnType("int(11)");
+
+                entity.Property(e => e.Remark)
+                    .HasColumnType("varchar(128)")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                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.StoreName)
+                    .HasColumnType("varchar(32)")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.StoreNo)
+                    .HasColumnType("varchar(16)")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.TotalNum).HasColumnType("int(11)");
+
+                entity.Property(e => e.UpdateDate).HasColumnType("datetime");
+
+                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)");
@@ -11263,6 +11851,8 @@ namespace MySystem.Models
 
                 entity.Property(e => e.NotHelpNonDirectTradeAmt).HasColumnType("decimal(18,2)");
 
+                entity.Property(e => e.PayType).HasColumnType("int(11)");
+
                 entity.Property(e => e.QueryCount).HasColumnType("int(11)");
 
                 entity.Property(e => e.SeoDescription)
@@ -11306,6 +11896,8 @@ namespace MySystem.Models
                 entity.Property(e => e.UserId).HasColumnType("int(11)");
 
                 entity.Property(e => e.Version).HasColumnType("int(11)");
+
+                entity.Property(e => e.VipFlag).HasColumnType("int(11)");
             });
 
             modelBuilder.Entity<TradeRecord>(entity =>
@@ -11353,6 +11945,8 @@ namespace MySystem.Models
                     .HasCharSet("utf8")
                     .HasCollation("utf8_general_ci");
 
+                entity.Property(e => e.PayType).HasColumnType("int(11)");
+
                 entity.Property(e => e.QrPayFlag).HasColumnType("int(11)");
 
                 entity.Property(e => e.QueryCount).HasColumnType("int(11)");
@@ -11412,6 +12006,8 @@ namespace MySystem.Models
                 entity.Property(e => e.UserId).HasColumnType("int(11)");
 
                 entity.Property(e => e.Version).HasColumnType("int(11)");
+
+                entity.Property(e => e.VipFlag).HasColumnType("int(11)");
             });
 
             modelBuilder.Entity<TradeRecordTest>(entity =>
@@ -14437,6 +15033,8 @@ namespace MySystem.Models
                     .HasCharSet("utf8")
                     .HasCollation("utf8_general_ci");
 
+                entity.Property(e => e.ThisMonthTrade).HasColumnType("decimal(18,2)");
+
                 entity.Property(e => e.UpdateDate).HasColumnType("datetime");
 
                 entity.Property(e => e.UpdateMan)

Program.cs

@@ -22,7 +22,7 @@ namespace MySystem
                 .ConfigureWebHostDefaults(webBuilder =>
                 {
                     webBuilder
-                    .UseUrls("http://*:5046")
+                    .UseUrls("http://*:5200")
                     .UseKestrel()
                     .UseContentRoot(Directory.GetCurrentDirectory())
                     .UseIISIntegration()

Properties/launchSettings.json

@@ -21,7 +21,7 @@
       "environmentVariables": {
         "ASPNETCORE_ENVIRONMENT": "Development"
       },
-      "applicationUrl": "http://127.0.0.1:5046"
+      "applicationUrl": "http://127.0.0.1:5200"
     }
   }
 }

PxcModels/ActivityRedPackageJoinss.cs

@@ -0,0 +1,24 @@
+using System;
+using System.Collections.Generic;
+
+namespace MySystem.PxcModels
+{
+    public partial class ActivityRedPackageJoinss
+    {
+        public int Id { get; set; }
+        public int Sort { get; set; }
+        public int QueryCount { get; set; }
+        public int Status { get; set; }
+        public int Version { get; set; }
+        public DateTime? CreateDate { get; set; }
+        public DateTime? UpdateDate { get; set; }
+        public string CreateMan { get; set; }
+        public string UpdateMan { get; set; }
+        public string SeoTitle { get; set; }
+        public string SeoKeyword { get; set; }
+        public string SeoDescription { get; set; }
+        public decimal PrizeAmt { get; set; }
+        public string ActivityDate { get; set; }
+        public int UserId { get; set; }
+    }
+}

PxcModels/ActivityRedPackageStocks.cs

@@ -0,0 +1,24 @@
+using System;
+using System.Collections.Generic;
+
+namespace MySystem.PxcModels
+{
+    public partial class ActivityRedPackageStocks
+    {
+        public int Id { get; set; }
+        public int Sort { get; set; }
+        public int QueryCount { get; set; }
+        public int Status { get; set; }
+        public int Version { get; set; }
+        public DateTime? CreateDate { get; set; }
+        public DateTime? UpdateDate { get; set; }
+        public string CreateMan { get; set; }
+        public string UpdateMan { get; set; }
+        public string SeoTitle { get; set; }
+        public string SeoKeyword { get; set; }
+        public string SeoDescription { get; set; }
+        public string ActivityDate { get; set; }
+        public decimal PrizeAmt { get; set; }
+        public int UserId { get; set; }
+    }
+}

PxcModels/ActivityRedPackageTop10s.cs

@@ -0,0 +1,25 @@
+using System;
+using System.Collections.Generic;
+
+namespace MySystem.PxcModels
+{
+    public partial class ActivityRedPackageTop10s
+    {
+        public int Id { get; set; }
+        public int Sort { get; set; }
+        public int QueryCount { get; set; }
+        public int Status { get; set; }
+        public int Version { get; set; }
+        public DateTime? CreateDate { get; set; }
+        public DateTime? UpdateDate { get; set; }
+        public string CreateMan { get; set; }
+        public string UpdateMan { get; set; }
+        public string SeoTitle { get; set; }
+        public string SeoKeyword { get; set; }
+        public string SeoDescription { get; set; }
+        public int Kind { get; set; }
+        public int TimeNum { get; set; }
+        public decimal PrizeAmt { get; set; }
+        public int UserId { get; set; }
+    }
+}

PxcModels/PosCoupons.cs

@@ -19,5 +19,6 @@ namespace MySystem.PxcModels
         public ulong IsUse { get; set; }
         public string ExchangeCode { get; set; }
         public int UserId { get; set; }
+        public int LeaderUserId { get; set; }
     }
 }

PxcModels/PosMachinesTwo.cs

@@ -43,5 +43,7 @@ namespace MySystem.PxcModels
         public string Detail { get; set; }
         public int ActivationState { get; set; }
         public int BindingState { get; set; }
+        public int LeaderUserId { get; set; }
+        public int PreUserId { get; set; }
     }
 }

PxcModels/PreSendStockDetail.cs

@@ -0,0 +1,34 @@
+using System;
+using System.Collections.Generic;
+
+namespace MySystem.PxcModels
+{
+    public partial class PreSendStockDetail
+    {
+        public int Id { get; set; }
+        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; }
+        public string SeoKeyword { get; set; }
+        public string SeoDescription { get; set; }
+        public DateTime? CancelDate { get; set; }
+        public ulong CancelFlag { get; set; }
+        public int FromStoreId { get; set; }
+        public int FromUserId { get; set; }
+        public DateTime? ApplyDate { get; set; }
+        public ulong ApplyFlag { get; set; }
+        public int SourceStoreId { get; set; }
+        public string ToRemark { get; set; }
+        public int ToStoreId { get; set; }
+        public int ToUserId { get; set; }
+        public int SnId { get; set; }
+        public string SnNo { get; set; }
+        public int BrandId { get; set; }
+        public int StoreId { get; set; }
+    }
+}

PxcModels/SmallStoreHouse.cs

@@ -0,0 +1,27 @@
+using System;
+using System.Collections.Generic;
+
+namespace MySystem.PxcModels
+{
+    public partial class SmallStoreHouse
+    {
+        public int Id { get; set; }
+        public int Sort { get; set; }
+        public int QueryCount { get; set; }
+        public int Status { get; set; }
+        public DateTime? CreateDate { get; set; }
+        public DateTime? UpdateDate { get; set; }
+        public string SeoTitle { get; set; }
+        public string SeoKeyword { get; set; }
+        public string SeoDescription { get; set; }
+        public int FromStoreId { get; set; }
+        public string Mobile { get; set; }
+        public string Remark { get; set; }
+        public int LaveNum { get; set; }
+        public int TotalNum { get; set; }
+        public string BrandId { get; set; }
+        public int UserId { get; set; }
+        public string StoreName { get; set; }
+        public string StoreNo { get; set; }
+    }
+}

PxcModels/TradeDaySummary.cs

@@ -60,5 +60,7 @@ namespace MySystem.PxcModels
         public string TradeMonth { get; set; }
         public string TradeDate { get; set; }
         public int UserId { get; set; }
+        public int PayType { get; set; }
+        public int VipFlag { get; set; }
     }
 }

PxcModels/TradeRecord.cs

@@ -38,5 +38,7 @@ namespace MySystem.PxcModels
         public int UserId { get; set; }
         public string RecordNo { get; set; }
         public string ParentNav { get; set; }
+        public int PayType { get; set; }
+        public int VipFlag { get; set; }
     }
 }

PxcModels/Users.cs

@@ -81,5 +81,6 @@ namespace MySystem.PxcModels
         public string NickName { get; set; }
         public int CashStatus { get; set; }
         public string CashNote { get; set; }
+        public decimal ThisMonthTrade { get; set; }
     }
 }

PxcModels/WebCMSEntities.cs

@@ -106,6 +106,7 @@ namespace MySystem.PxcModels
         public virtual DbSet<PosMerchantInfo> PosMerchantInfo { get; set; }
         public virtual DbSet<PosMerchantOtherInfo> PosMerchantOtherInfo { get; set; }
         public virtual DbSet<PosMerchantTradeSummay> PosMerchantTradeSummay { get; set; }
+        public virtual DbSet<PreSendStockDetail> PreSendStockDetail { get; set; }
         public virtual DbSet<ProductComment> ProductComment { get; set; }
         public virtual DbSet<ProductCommentAgree> ProductCommentAgree { get; set; }
         public virtual DbSet<ProductFareAreas> ProductFareAreas { get; set; }
@@ -140,6 +141,7 @@ namespace MySystem.PxcModels
         public virtual DbSet<RightDic> RightDic { get; set; }
         public virtual DbSet<ServiceCenter> ServiceCenter { get; set; }
         public virtual DbSet<SetMerchantTypeRecord> SetMerchantTypeRecord { get; set; }
+        public virtual DbSet<SmallStoreHouse> SmallStoreHouse { get; set; }
         public virtual DbSet<StoreBalance> StoreBalance { get; set; }
         public virtual DbSet<StoreChangeHistory> StoreChangeHistory { get; set; }
         public virtual DbSet<StoreForCode> StoreForCode { get; set; }
@@ -628,7 +630,6 @@ namespace MySystem.PxcModels
 
                 entity.Property(e => e.Version).HasColumnType("int(11)");
             });
-
             modelBuilder.Entity<ActivityRedPackageStock>(entity =>
             {
                 entity.Property(e => e.Id).HasColumnType("int(11)");
@@ -6573,6 +6574,8 @@ namespace MySystem.PxcModels
                     .HasColumnType("bit(1)")
                     .HasDefaultValueSql("b'0'");
 
+                entity.Property(e => e.LeaderUserId).HasColumnType("int(11)");
+
                 entity.Property(e => e.QueryCount).HasColumnType("int(11)");
 
                 entity.Property(e => e.SeoDescription)
@@ -6792,6 +6795,8 @@ namespace MySystem.PxcModels
                     .HasColumnType("bit(1)")
                     .HasDefaultValueSql("b'0'");
 
+                entity.Property(e => e.LeaderUserId).HasColumnType("int(11)");
+
                 entity.Property(e => e.OrderId).HasColumnType("int(11)");
 
                 entity.Property(e => e.PosSn)
@@ -6801,6 +6806,8 @@ namespace MySystem.PxcModels
 
                 entity.Property(e => e.PosSnType).HasColumnType("int(11)");
 
+                entity.Property(e => e.PreUserId).HasColumnType("int(11)");
+
                 entity.Property(e => e.PrizeParams)
                     .HasColumnType("varchar(200)")
                     .HasCharSet("utf8")
@@ -7055,6 +7062,78 @@ namespace MySystem.PxcModels
                 entity.Property(e => e.UpdateDate).HasColumnType("datetime");
             });
 
+            modelBuilder.Entity<PreSendStockDetail>(entity =>
+            {
+                entity.Property(e => e.Id).HasColumnType("int(11)");
+
+                entity.Property(e => e.ApplyDate).HasColumnType("datetime");
+
+                entity.Property(e => e.ApplyFlag)
+                    .HasColumnType("bit(1)")
+                    .HasDefaultValueSql("b'0'");
+
+                entity.Property(e => e.BrandId).HasColumnType("int(11)");
+
+                entity.Property(e => e.CancelDate).HasColumnType("datetime");
+
+                entity.Property(e => e.CancelFlag)
+                    .HasColumnType("bit(1)")
+                    .HasDefaultValueSql("b'0'");
+
+                entity.Property(e => e.CreateDate).HasColumnType("datetime");
+
+                entity.Property(e => e.FromStoreId).HasColumnType("int(11)");
+
+                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")
+                    .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.SnId).HasColumnType("int(11)");
+
+                entity.Property(e => e.SnNo)
+                    .HasColumnType("varchar(32)")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.Sort).HasColumnType("int(11)");
+
+                entity.Property(e => e.SourceStoreId).HasColumnType("int(11)");
+
+                entity.Property(e => e.Status).HasColumnType("int(11)");
+
+                entity.Property(e => e.StoreId).HasColumnType("int(11)");
+
+                entity.Property(e => e.ToRemark)
+                    .HasColumnType("varchar(64)")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.ToStoreId).HasColumnType("int(11)");
+
+                entity.Property(e => e.ToUserId).HasColumnType("int(11)");
+
+                entity.Property(e => e.UpdateDate).HasColumnType("datetime");
+            });
+
             modelBuilder.Entity<ProductComment>(entity =>
             {
                 entity.Property(e => e.Id).HasColumnType("int(11)");
@@ -9502,6 +9581,69 @@ namespace MySystem.PxcModels
                 entity.Property(e => e.UpdateDate).HasColumnType("datetime");
             });
 
+            modelBuilder.Entity<SmallStoreHouse>(entity =>
+            {
+                entity.Property(e => e.Id).HasColumnType("int(11)");
+
+                entity.Property(e => e.BrandId)
+                    .HasColumnType("varchar(30)")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.CreateDate).HasColumnType("datetime");
+
+                entity.Property(e => e.FromStoreId).HasColumnType("int(11)");
+
+                entity.Property(e => e.LaveNum).HasColumnType("int(11)");
+
+                entity.Property(e => e.Mobile)
+                    .HasColumnType("varchar(11)")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.QueryCount).HasColumnType("int(11)");
+
+                entity.Property(e => e.Remark)
+                    .HasColumnType("varchar(128)")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                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.StoreName)
+                    .HasColumnType("varchar(32)")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.StoreNo)
+                    .HasColumnType("varchar(16)")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.TotalNum).HasColumnType("int(11)");
+
+                entity.Property(e => e.UpdateDate).HasColumnType("datetime");
+
+                entity.Property(e => e.UserId).HasColumnType("int(11)");
+            });
+
             modelBuilder.Entity<StoreBalance>(entity =>
             {
                 entity.Property(e => e.Id).HasColumnType("int(11)");
@@ -11263,6 +11405,8 @@ namespace MySystem.PxcModels
 
                 entity.Property(e => e.NotHelpNonDirectTradeAmt).HasColumnType("decimal(18,2)");
 
+                entity.Property(e => e.PayType).HasColumnType("int(11)");
+
                 entity.Property(e => e.QueryCount).HasColumnType("int(11)");
 
                 entity.Property(e => e.SeoDescription)
@@ -11306,6 +11450,8 @@ namespace MySystem.PxcModels
                 entity.Property(e => e.UserId).HasColumnType("int(11)");
 
                 entity.Property(e => e.Version).HasColumnType("int(11)");
+
+                entity.Property(e => e.VipFlag).HasColumnType("int(11)");
             });
 
             modelBuilder.Entity<TradeRecord>(entity =>
@@ -11353,6 +11499,8 @@ namespace MySystem.PxcModels
                     .HasCharSet("utf8")
                     .HasCollation("utf8_general_ci");
 
+                entity.Property(e => e.PayType).HasColumnType("int(11)");
+
                 entity.Property(e => e.QrPayFlag).HasColumnType("int(11)");
 
                 entity.Property(e => e.QueryCount).HasColumnType("int(11)");
@@ -11412,6 +11560,8 @@ namespace MySystem.PxcModels
                 entity.Property(e => e.UserId).HasColumnType("int(11)");
 
                 entity.Property(e => e.Version).HasColumnType("int(11)");
+
+                entity.Property(e => e.VipFlag).HasColumnType("int(11)");
             });
 
             modelBuilder.Entity<TradeRecordTest>(entity =>
@@ -14437,6 +14587,8 @@ namespace MySystem.PxcModels
                     .HasCharSet("utf8")
                     .HasCollation("utf8_general_ci");
 
+                entity.Property(e => e.ThisMonthTrade).HasColumnType("decimal(18,2)");
+
                 entity.Property(e => e.UpdateDate).HasColumnType("datetime");
 
                 entity.Property(e => e.UpdateMan)

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();
 
@@ -232,12 +232,12 @@ namespace MySystem
             RedPackageHelper.Instance.StartSendPrize(); //红包活动发奖
             //必须打开的
 
-
-            // StatService.Instance.StartPosActNum(); //实时统计激活数
-            // StatService.Instance.StartNewUserNum(); //实时统计新增创客数
+            StatService.Instance.StartPosActNum(); //实时统计激活数
+            StatService.Instance.StartNewUserNum(); //实时统计新增创客数
+            StatService.Instance.StartEverDayV2("");
+            StatService.Instance.StatProfit("");
             // RedPackageHelper.Instance.Start();
             // StatService.Instance.StatUserLevel();
-            // StatService.Instance.StartEverDay("2022-05-11");
             // ProfitHelper.Instance.StatProfit("202205"); //统计分润
             // StatService.Instance.ListenFluxRecord();
             // StatService.Instance.StartEverDay2();