盈利期

AppStart/Helper/StatService.cs

@@ -63,7 +63,7 @@ namespace MySystem
                             ids += idsDr["Id"].ToString() + ",";
                             startId = idsDr["Id"].ToString();
                         }
-                        DataTable selfDt = OtherMySqlConn.dtable("select UserId,ParentNav,BrandId,BankCardType,QrPayFlag,MerHelpFlag,CapFlag,VipFlag,PayType,DATE_FORMAT(CreateDate,'%Y%m%d'),sum(TradeAmount),count(Id) from TradeRecord where Id in (" + ids.TrimEnd(',') + ") group by UserId,ParentNav,BrandId,BankCardType,QrPayFlag,MerHelpFlag,CapFlag,VipFlag,PayType,DATE_FORMAT(CreateDate,'%Y%m%d')");
+                        DataTable selfDt = OtherMySqlConn.dtable("select UserId,ParentNav,BrandId,BankCardType,QrPayFlag,MerHelpFlag,Version,CapFlag,VipFlag,PayType,DATE_FORMAT(CreateDate,'%Y%m%d'),sum(TradeAmount),count(Id) from TradeRecord where Id in (" + ids.TrimEnd(',') + ") group by UserId,ParentNav,BrandId,BankCardType,QrPayFlag,MerHelpFlag,Version,CapFlag,VipFlag,PayType,DATE_FORMAT(CreateDate,'%Y%m%d')");
                         if (selfDt.Rows.Count > 0)
                         {
                             function.WriteLog("统计人数:" + selfDt.Rows.Count + "\n\n", "实时执行交易额V2日志");
@@ -76,12 +76,13 @@ namespace MySystem
                                 int BankCardType = int.Parse(selfDr["BankCardType"].ToString());
                                 int QrPayFlag = int.Parse(selfDr["QrPayFlag"].ToString());
                                 int MerHelpFlag = int.Parse(selfDr["MerHelpFlag"].ToString());
+                                int Version = int.Parse(selfDr["Version"].ToString());
                                 int CapFlag = int.Parse(selfDr["CapFlag"].ToString());
                                 int VipFlag = int.Parse(selfDr["VipFlag"].ToString());
                                 int PayType = int.Parse(selfDr["PayType"].ToString());
-                                string TradeDate = selfDr[9].ToString();
-                                decimal TradeAmount = decimal.Parse(selfDr[10].ToString());
-                                int TradeCount = int.Parse(selfDr[11].ToString());
+                                string TradeDate = selfDr[10].ToString();
+                                decimal TradeAmount = decimal.Parse(selfDr[11].ToString());
+                                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)
@@ -101,22 +102,22 @@ namespace MySystem
                                 }
                                 if (BankCardType == 0)
                                 {
-                                    if (MerHelpFlag == 1)
+                                    if (Version == 1)
                                     {
-                                        selfStat.HelpDirectDebitTradeAmt += TradeAmount;
+                                        selfStat.ProfitDirectDebitTradeAmt += TradeAmount;
                                         if (CapFlag == 1)
                                         {
-                                            selfStat.HelpDirectDebitCapTradeAmt += TradeAmount;
-                                            selfStat.HelpDirectDebitCapNum += TradeCount;
+                                            selfStat.ProfitDirectDebitCapTradeAmt += TradeAmount;
+                                            selfStat.ProfitDirectDebitCapNum += TradeCount;
                                         }
                                     }
-                                    else if (MerHelpFlag == 2)
+                                    else if (MerHelpFlag == 1)
                                     {
-                                        selfStat.ProfitDirectDebitTradeAmt += TradeAmount;
+                                        selfStat.HelpDirectDebitTradeAmt += TradeAmount;
                                         if (CapFlag == 1)
                                         {
-                                            selfStat.ProfitDirectDebitCapTradeAmt += TradeAmount;
-                                            selfStat.ProfitDirectDebitCapNum += TradeCount;
+                                            selfStat.HelpDirectDebitCapTradeAmt += TradeAmount;
+                                            selfStat.HelpDirectDebitCapNum += TradeCount;
                                         }
                                     }
                                     else
@@ -131,13 +132,13 @@ namespace MySystem
                                 }
                                 else if (BankCardType != 0)
                                 {
-                                    if (MerHelpFlag == 1)
+                                    if (Version == 1)
                                     {
-                                        selfStat.HelpDirectTradeAmt += TradeAmount;
+                                        selfStat.ProfitDirectTradeAmt += TradeAmount;
                                     }
-                                    else if (MerHelpFlag == 2)
+                                    else if (MerHelpFlag == 1)
                                     {
-                                        selfStat.ProfitDirectTradeAmt += TradeAmount;
+                                        selfStat.HelpDirectTradeAmt += TradeAmount;
                                     }
                                     else
                                     {
@@ -169,22 +170,22 @@ namespace MySystem
                                         }
                                         if (BankCardType == 0)
                                         {
-                                            if (MerHelpFlag == 1)
+                                            if (Version == 1)
                                             {
-                                                teamStat.HelpNonDirectDebitTradeAmt += TradeAmount;
+                                                teamStat.ProfitNonDirectDebitTradeAmt += TradeAmount;
                                                 if (CapFlag == 1)
                                                 {
-                                                    teamStat.HelpDirectDebitCapTradeAmt += TradeAmount;
-                                                    teamStat.HelpDirectDebitCapNum += TradeCount;
+                                                    teamStat.ProfitDirectDebitCapTradeAmt += TradeAmount;
+                                                    teamStat.ProfitDirectDebitCapNum += TradeCount;
                                                 }
                                             }
-                                            else if (MerHelpFlag == 2)
+                                            else if (MerHelpFlag == 1)
                                             {
-                                                teamStat.ProfitNonDirectDebitTradeAmt += TradeAmount;
+                                                teamStat.HelpNonDirectDebitTradeAmt += TradeAmount;
                                                 if (CapFlag == 1)
                                                 {
-                                                    teamStat.ProfitDirectDebitCapTradeAmt += TradeAmount;
-                                                    teamStat.ProfitDirectDebitCapNum += TradeCount;
+                                                    teamStat.HelpDirectDebitCapTradeAmt += TradeAmount;
+                                                    teamStat.HelpDirectDebitCapNum += TradeCount;
                                                 }
                                             }
                                             else
@@ -199,13 +200,13 @@ namespace MySystem
                                         }
                                         else if (BankCardType != 0)
                                         {
-                                            if (MerHelpFlag == 1)
+                                            if (Version == 1)
                                             {
-                                                teamStat.HelpNonDirectTradeAmt += TradeAmount;
+                                                teamStat.ProfitNonDirectTradeAmt += TradeAmount;
                                             }
-                                            else if (MerHelpFlag == 2)
+                                            else if (MerHelpFlag == 1)
                                             {
-                                                teamStat.ProfitNonDirectTradeAmt += TradeAmount;
+                                                teamStat.HelpNonDirectTradeAmt += TradeAmount;
                                             }
                                             else
                                             {