Browse Source

调整统计数据盈利期B问题

lcl 1 year ago
parent
commit
1afab6d480
2 changed files with 183 additions and 179 deletions
  1. 179 175
      AppStart/Helper/StatService.cs
  2. 4 4
      Startup.cs

+ 179 - 175
AppStart/Helper/StatService.cs

@@ -167,221 +167,225 @@ namespace MySystem
                                 int TradeCount = int.Parse(selfDr[12].ToString());
                                 string TradeMonth = TradeDate.Substring(0, 6);
 
-                                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)
+                                if(Version < 2)
                                 {
-                                    selfStat = db.TradeDaySummary.Add(new TradeDaySummary()
+                                    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)
                                     {
-                                        UserId = UserId,
-                                        TradeMonth = TradeMonth,
-                                        TradeDate = TradeDate,
-                                        BrandId = BrandId,
-                                        QueryCount = QrPayFlag,
-                                        VipFlag = VipFlag,
-                                        PayType = PayType,
-                                        SeoTitle = "self",
-                                    }).Entity;
-                                    db.SaveChanges();
-                                }
-                                if (BankCardType == 0)
-                                {
-                                    if (Version == 1)
+                                        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.ProfitDirectDebitTradeAmt += TradeAmount;
-                                        if (CapFlag == 1)
+                                        if (Version == 1)
+                                        {
+                                            selfStat.ProfitDirectDebitTradeAmt += TradeAmount;
+                                            if (CapFlag == 1)
+                                            {
+                                                selfStat.ProfitDirectDebitCapTradeAmt += TradeAmount;
+                                                selfStat.ProfitDirectDebitCapNum += TradeCount;
+                                            }
+                                        }
+                                        else if (MerHelpFlag == 1)
+                                        {
+                                            selfStat.HelpDirectDebitTradeAmt += TradeAmount;
+                                            if (CapFlag == 1)
+                                            {
+                                                selfStat.HelpDirectDebitCapTradeAmt += TradeAmount;
+                                                selfStat.HelpDirectDebitCapNum += TradeCount;
+                                            }
+                                        }
+                                        else
                                         {
-                                            selfStat.ProfitDirectDebitCapTradeAmt += TradeAmount;
-                                            selfStat.ProfitDirectDebitCapNum += TradeCount;
+                                            selfStat.NotHelpDirectDebitTradeAmt += TradeAmount;
+                                            if (CapFlag == 1)
+                                            {
+                                                selfStat.NotHelpDirectDebitCapTradeAmt += TradeAmount;
+                                                selfStat.NotHelpDirectDebitCapNum += TradeCount;
+                                            }
                                         }
                                     }
-                                    else if (MerHelpFlag == 1)
+                                    else if (BankCardType != 0)
                                     {
-                                        selfStat.HelpDirectDebitTradeAmt += TradeAmount;
-                                        if (CapFlag == 1)
+                                        if (Version == 1)
+                                        {
+                                            selfStat.ProfitDirectTradeAmt += TradeAmount;
+                                        }
+                                        else if (MerHelpFlag == 1)
+                                        {
+                                            selfStat.HelpDirectTradeAmt += TradeAmount;
+                                        }
+                                        else
                                         {
-                                            selfStat.HelpDirectDebitCapTradeAmt += TradeAmount;
-                                            selfStat.HelpDirectDebitCapNum += TradeCount;
+                                            selfStat.NotHelpDirectTradeAmt += TradeAmount;
                                         }
                                     }
-                                    else
+                                    ParentNav += "," + UserId + ",";
+                                    if (!string.IsNullOrEmpty(ParentNav))
                                     {
-                                        selfStat.NotHelpDirectDebitTradeAmt += TradeAmount;
-                                        if (CapFlag == 1)
+                                        string[] ParentNavList = ParentNav.Trim(',').Replace(",,", ",").Split(',');
+                                        foreach (string NavUserIdString in ParentNavList)
                                         {
-                                            selfStat.NotHelpDirectDebitCapTradeAmt += TradeAmount;
-                                            selfStat.NotHelpDirectDebitCapNum += TradeCount;
+                                            int NavUserId = int.Parse(NavUserIdString);
+                                            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.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)
+                                            {
+                                                if (Version == 1)
+                                                {
+                                                    teamStat.ProfitNonDirectDebitTradeAmt += TradeAmount;
+                                                    if (CapFlag == 1)
+                                                    {
+                                                        teamStat.ProfitDirectDebitCapTradeAmt += TradeAmount;
+                                                        teamStat.ProfitDirectDebitCapNum += TradeCount;
+                                                    }
+                                                }
+                                                else 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)
+                                            {
+                                                if (Version == 1)
+                                                {
+                                                    teamStat.ProfitNonDirectTradeAmt += TradeAmount;
+                                                }
+                                                else if (MerHelpFlag == 1)
+                                                {
+                                                    teamStat.HelpNonDirectTradeAmt += TradeAmount;
+                                                }
+                                                else
+                                                {
+                                                    teamStat.NotHelpNonDirectTradeAmt += TradeAmount;
+                                                }
+                                            }
                                         }
                                     }
                                 }
-                                else if (BankCardType != 0)
+                                else
                                 {
-                                    if (Version == 1)
+                                    //盈利期,费率0.6
+                                    TradeDaySummary2 selfStat2 = db.TradeDaySummary2.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 (selfStat2 == null)
                                     {
-                                        selfStat.ProfitDirectTradeAmt += TradeAmount;
-                                    }
-                                    else if (MerHelpFlag == 1)
-                                    {
-                                        selfStat.HelpDirectTradeAmt += TradeAmount;
+                                        selfStat2 = db.TradeDaySummary2.Add(new TradeDaySummary2()
+                                        {
+                                            UserId = UserId,
+                                            TradeMonth = TradeMonth,
+                                            TradeDate = TradeDate,
+                                            BrandId = BrandId,
+                                            QueryCount = QrPayFlag,
+                                            VipFlag = VipFlag,
+                                            PayType = PayType,
+                                            SeoTitle = "self",
+                                        }).Entity;
+                                        db.SaveChanges();
                                     }
-                                    else
+                                    if (BankCardType == 0)
                                     {
-                                        selfStat.NotHelpDirectTradeAmt += TradeAmount;
+                                        if (Version == 2)
+                                        {
+                                            selfStat2.ProfitDebitTradeAmt += TradeAmount;
+                                            if (CapFlag == 1)
+                                            {
+                                                selfStat2.ProfitDebitCapTradeAmt += TradeAmount;
+                                                selfStat2.ProfitDebitCapNum += TradeCount;
+                                            }
+                                        }
                                     }
-                                }
-                                ParentNav += "," + UserId + ",";
-                                if (!string.IsNullOrEmpty(ParentNav))
-                                {
-                                    string[] ParentNavList = ParentNav.Trim(',').Replace(",,", ",").Split(',');
-                                    foreach (string NavUserIdString in ParentNavList)
+                                    else if (BankCardType != 0)
                                     {
-                                        int NavUserId = int.Parse(NavUserIdString);
-                                        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)
+                                        if (Version == 2)
                                         {
-                                            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();
+                                            selfStat2.ProfitTradeAmt += TradeAmount;
                                         }
-                                        if (BankCardType == 0)
+                                    }
+                                    ParentNav += "," + UserId + ",";
+                                    if (!string.IsNullOrEmpty(ParentNav))
+                                    {
+                                        string[] ParentNavList = ParentNav.Trim(',').Replace(",,", ",").Split(',');
+                                        foreach (string NavUserIdString in ParentNavList)
                                         {
-                                            if (Version == 1)
+                                            int NavUserId = int.Parse(NavUserIdString);
+                                            TradeDaySummary2 teamStat2 = db.TradeDaySummary2.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 (teamStat2 == null)
                                             {
-                                                teamStat.ProfitNonDirectDebitTradeAmt += TradeAmount;
-                                                if (CapFlag == 1)
+                                                teamStat2 = db.TradeDaySummary2.Add(new TradeDaySummary2()
                                                 {
-                                                    teamStat.ProfitDirectDebitCapTradeAmt += TradeAmount;
-                                                    teamStat.ProfitDirectDebitCapNum += TradeCount;
-                                                }
+                                                    UserId = NavUserId,
+                                                    TradeMonth = TradeMonth,
+                                                    TradeDate = TradeDate,
+                                                    BrandId = BrandId,
+                                                    QueryCount = QrPayFlag,
+                                                    VipFlag = VipFlag,
+                                                    PayType = PayType,
+                                                    SeoTitle = "team",
+                                                }).Entity;
+                                                db.SaveChanges();
                                             }
-                                            else if (MerHelpFlag == 1)
+                                            if (BankCardType == 0)
                                             {
-                                                teamStat.HelpNonDirectDebitTradeAmt += TradeAmount;
-                                                if (CapFlag == 1)
+                                                if (Version == 2)
                                                 {
-                                                    teamStat.HelpDirectDebitCapTradeAmt += TradeAmount;
-                                                    teamStat.HelpDirectDebitCapNum += TradeCount;
+                                                    teamStat2.ProfitDebitTradeAmt += TradeAmount;
+                                                    if (CapFlag == 1)
+                                                    {
+                                                        teamStat2.ProfitDebitCapTradeAmt += TradeAmount;
+                                                        teamStat2.ProfitDebitCapNum += TradeCount;
+                                                    }
                                                 }
                                             }
-                                            else
+                                            else if (BankCardType != 0)
                                             {
-                                                teamStat.NotHelpNonDirectDebitTradeAmt += TradeAmount;
-                                                if (CapFlag == 1)
+                                                if (Version == 2)
                                                 {
-                                                    teamStat.NotHelpDirectDebitCapTradeAmt += TradeAmount;
-                                                    teamStat.NotHelpDirectDebitCapNum += TradeCount;
+                                                    teamStat2.ProfitTradeAmt += TradeAmount;
                                                 }
                                             }
                                         }
-                                        else if (BankCardType != 0)
-                                        {
-                                            if (Version == 1)
-                                            {
-                                                teamStat.ProfitNonDirectTradeAmt += TradeAmount;
-                                            }
-                                            else if (MerHelpFlag == 1)
-                                            {
-                                                teamStat.HelpNonDirectTradeAmt += TradeAmount;
-                                            }
-                                            else
-                                            {
-                                                teamStat.NotHelpNonDirectTradeAmt += TradeAmount;
-                                            }
-                                        }
                                     }
                                 }
 
 
-                                // //盈利期,费率0.6
-                                // TradeDaySummary2 selfStat2 = db.TradeDaySummary2.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 (selfStat2 == null)
-                                // {
-                                //     selfStat2 = db.TradeDaySummary2.Add(new TradeDaySummary2()
-                                //     {
-                                //         UserId = UserId,
-                                //         TradeMonth = TradeMonth,
-                                //         TradeDate = TradeDate,
-                                //         BrandId = BrandId,
-                                //         QueryCount = QrPayFlag,
-                                //         VipFlag = VipFlag,
-                                //         PayType = PayType,
-                                //         SeoTitle = "self",
-                                //     }).Entity;
-                                //     db.SaveChanges();
-                                // }
-                                // if (BankCardType == 0)
-                                // {
-                                //     if (Version == 2)
-                                //     {
-                                //         selfStat2.ProfitDebitTradeAmt += TradeAmount;
-                                //         if (CapFlag == 1)
-                                //         {
-                                //             selfStat2.ProfitDebitCapTradeAmt += TradeAmount;
-                                //             selfStat2.ProfitDebitCapNum += TradeCount;
-                                //         }
-                                //     }
-                                // }
-                                // else if (BankCardType != 0)
-                                // {
-                                //     if (Version == 2)
-                                //     {
-                                //         selfStat2.ProfitTradeAmt += TradeAmount;
-                                //     }
-                                // }
-                                // ParentNav += "," + UserId + ",";
-                                // if (!string.IsNullOrEmpty(ParentNav))
-                                // {
-                                //     string[] ParentNavList = ParentNav.Trim(',').Replace(",,", ",").Split(',');
-                                //     foreach (string NavUserIdString in ParentNavList)
-                                //     {
-                                //         int NavUserId = int.Parse(NavUserIdString);
-                                //         TradeDaySummary2 teamStat2 = db.TradeDaySummary2.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 (teamStat2 == null)
-                                //         {
-                                //             teamStat2 = db.TradeDaySummary2.Add(new TradeDaySummary2()
-                                //             {
-                                //                 UserId = NavUserId,
-                                //                 TradeMonth = TradeMonth,
-                                //                 TradeDate = TradeDate,
-                                //                 BrandId = BrandId,
-                                //                 QueryCount = QrPayFlag,
-                                //                 VipFlag = VipFlag,
-                                //                 PayType = PayType,
-                                //                 SeoTitle = "team",
-                                //             }).Entity;
-                                //             db.SaveChanges();
-                                //         }
-                                //         if (BankCardType == 0)
-                                //         {
-                                //             if (Version == 2)
-                                //             {
-                                //                 teamStat2.ProfitDebitTradeAmt += TradeAmount;
-                                //                 if (CapFlag == 1)
-                                //                 {
-                                //                     teamStat2.ProfitDebitCapTradeAmt += TradeAmount;
-                                //                     teamStat2.ProfitDebitCapNum += TradeCount;
-                                //                 }
-                                //             }
-                                //         }
-                                //         else if (BankCardType != 0)
-                                //         {
-                                //             if (Version == 2)
-                                //             {
-                                //                 teamStat2.ProfitTradeAmt += TradeAmount;
-                                //             }
-                                //         }
-                                //     }
-                                // }
-
-
                                 Dictionary<string, object> statData = new Dictionary<string, object>();
                                 statData.Add("UserId", UserId);
                                 statData.Add("BrandId", BrandId);

+ 4 - 4
Startup.cs

@@ -129,10 +129,10 @@ namespace MySystem
         {
             string conn = Configuration["Setting:SqlConnStr"];
             string dbName = "KxsMainServer";
-            if(Library.ConfigurationManager.EnvironmentFlag == 2)
-            {
-                dbName = "KxsProfitServer";
-            }
+            // if(Library.ConfigurationManager.EnvironmentFlag == 2)
+            // {
+            //     dbName = "KxsProfitServer";
+            // }
             Dictionary<string, Dictionary<string, string>> tables = new Dictionary<string, Dictionary<string, string>>();
             System.Data.DataTable tablecollection = Library.CustomerSqlConn.dtable("select DISTINCT TABLE_NAME from information_schema.columns where table_schema = '" + dbName + "'", conn);
             foreach (System.Data.DataRow subtable in tablecollection.Rows)