Ver código fonte

添加稳定期AB交易额

DuGuYang 2 anos atrás
pai
commit
4ee096b376

+ 95 - 8
Areas/Admin/Controllers/MainServer/UsersController.cs

@@ -1769,6 +1769,13 @@ namespace MySystem.Areas.Admin.Controllers
                 dic["JCountyl"] = Convert.ToInt32(Info["JCountyl"].ToString());
                 dic["JCountyl"] = Convert.ToInt32(Info["JCountyl"].ToString());
                 dic["YAmtyl"] = Convert.ToDecimal(Info["YAmtyl"].ToString());
                 dic["YAmtyl"] = Convert.ToDecimal(Info["YAmtyl"].ToString());
 
 
+                dic["TotalAmtyl2"] = Convert.ToDecimal(Info["TotalAmtyl2"].ToString());
+                dic["DAmtyl2"] = Convert.ToDecimal(Info["DAmtyl2"].ToString());
+                dic["JAmtyl2"] = Convert.ToDecimal(Info["JAmtyl2"].ToString());
+                dic["JfAmtyl2"] = Convert.ToDecimal(Info["JfAmtyl2"].ToString());
+                dic["JCountyl2"] = Convert.ToInt32(Info["JCountyl2"].ToString());
+                dic["YAmtyl2"] = Convert.ToDecimal(Info["YAmtyl2"].ToString());
+
                 dic["TBCount"] = Info["TBCount"].ToString();
                 dic["TBCount"] = Info["TBCount"].ToString();
                 dic["TACount"] = Info["TACount"].ToString();
                 dic["TACount"] = Info["TACount"].ToString();
 
 
@@ -1791,7 +1798,7 @@ namespace MySystem.Areas.Admin.Controllers
             int JCountwd = 0;
             int JCountwd = 0;
             decimal YAmtwd = 0;
             decimal YAmtwd = 0;
 
 
-            //盈利期
+            //盈利期(稳定期A)
             decimal TotalAmtyl = 0;
             decimal TotalAmtyl = 0;
             decimal DAmtyl = 0;
             decimal DAmtyl = 0;
             decimal JAmtyl = 0;
             decimal JAmtyl = 0;
@@ -1799,6 +1806,14 @@ namespace MySystem.Areas.Admin.Controllers
             int JCountyl = 0;
             int JCountyl = 0;
             decimal YAmtyl = 0;
             decimal YAmtyl = 0;
 
 
+            //盈利期(稳定期B)
+            decimal TotalAmtyls = 0;
+            decimal DAmtyls = 0;
+            decimal JAmtyls = 0;
+            decimal JfAmtyls = 0;
+            int JCountyls = 0;
+            decimal YAmtyls = 0;
+
             //团队
             //团队
             //扶持期
             //扶持期
             decimal TotalAmtfc1 = 0;
             decimal TotalAmtfc1 = 0;
@@ -1816,7 +1831,7 @@ namespace MySystem.Areas.Admin.Controllers
             int JCountwd1 = 0;
             int JCountwd1 = 0;
             decimal YAmtwd1 = 0;
             decimal YAmtwd1 = 0;
 
 
-            //盈利期
+            //盈利期(稳定期A)
             decimal TotalAmtyl1 = 0;
             decimal TotalAmtyl1 = 0;
             decimal DAmtyl1 = 0;
             decimal DAmtyl1 = 0;
             decimal JAmtyl1 = 0;
             decimal JAmtyl1 = 0;
@@ -1824,13 +1839,21 @@ namespace MySystem.Areas.Admin.Controllers
             int JCountyl1 = 0;
             int JCountyl1 = 0;
             decimal YAmtyl1 = 0;
             decimal YAmtyl1 = 0;
 
 
+            //盈利期(稳定期B)
+            decimal TotalAmtyl1s = 0;
+            decimal DAmtyl1s = 0;
+            decimal JAmtyl1s = 0;
+            decimal JfAmtyl1s = 0;
+            int JCountyl1s = 0;
+            decimal YAmtyl1s = 0;
+
             int PBCount = 0;
             int PBCount = 0;
             int PACount = 0;
             int PACount = 0;
             int TBCount = 0;
             int TBCount = 0;
             int TACount = 0;
             int TACount = 0;
 
 
             Dictionary<string, object> other = new Dictionary<string, object>();
             Dictionary<string, object> other = new Dictionary<string, object>();
-            DataTable dt = OtherMySqlConn.dtable("SELECT Sum(HelpDirectTradeAmt + HelpDirectDebitTradeAmt),Sum(if (QueryCount = 0,HelpDirectTradeAmt,0)),Sum(if (QueryCount = 0,HelpDirectDebitTradeAmt - HelpDirectDebitCapTradeAmt,0)),Sum(if (QueryCount = 0,HelpDirectDebitCapTradeAmt,0)),Sum(if (QueryCount = 0,HelpDirectDebitCapNum,0)),Sum(if (QueryCount = 1,HelpDirectTradeAmt,0)),Sum(NotHelpDirectTradeAmt + NotHelpDirectDebitTradeAmt),Sum(if (QueryCount = 0,NotHelpDirectTradeAmt,0)),Sum(if (QueryCount = 0,NotHelpDirectDebitTradeAmt - NotHelpDirectDebitCapTradeAmt,0)),Sum(if (QueryCount = 0,NotHelpDirectDebitCapTradeAmt,0)),Sum(if (QueryCount = 0,NotHelpDirectDebitCapNum,0)),Sum(if (QueryCount = 1,NotHelpDirectTradeAmt,0)),Sum(ProfitDirectTradeAmt + ProfitDirectDebitTradeAmt),Sum(if (QueryCount = 0,ProfitDirectTradeAmt,0)),Sum(if (QueryCount = 0,ProfitDirectDebitTradeAmt - ProfitDirectDebitCapTradeAmt,0)),Sum(if (QueryCount = 0,ProfitDirectDebitCapTradeAmt,0)),Sum(if (QueryCount = 0,ProfitDirectDebitCapNum,0)),Sum(if (QueryCount = 1,ProfitDirectTradeAmt,0))from TradeDaySummary where SeoTitle = 'self' and UserId =" + ParentId + "" + con);
+            DataTable dt = CustomerSqlConn.dtable("SELECT Sum(HelpDirectTradeAmt + HelpDirectDebitTradeAmt),Sum(if (QueryCount = 0,HelpDirectTradeAmt,0)),Sum(if (QueryCount = 0,HelpDirectDebitTradeAmt - HelpDirectDebitCapTradeAmt,0)),Sum(if (QueryCount = 0,HelpDirectDebitCapTradeAmt,0)),Sum(if (QueryCount = 0,HelpDirectDebitCapNum,0)),Sum(if (QueryCount = 1,HelpDirectTradeAmt,0)),Sum(NotHelpDirectTradeAmt + NotHelpDirectDebitTradeAmt),Sum(if (QueryCount = 0,NotHelpDirectTradeAmt,0)),Sum(if (QueryCount = 0,NotHelpDirectDebitTradeAmt - NotHelpDirectDebitCapTradeAmt,0)),Sum(if (QueryCount = 0,NotHelpDirectDebitCapTradeAmt,0)),Sum(if (QueryCount = 0,NotHelpDirectDebitCapNum,0)),Sum(if (QueryCount = 1,NotHelpDirectTradeAmt,0)),Sum(ProfitDirectTradeAmt + ProfitDirectDebitTradeAmt),Sum(if (QueryCount = 0,ProfitDirectTradeAmt,0)),Sum(if (QueryCount = 0,ProfitDirectDebitTradeAmt - ProfitDirectDebitCapTradeAmt,0)),Sum(if (QueryCount = 0,ProfitDirectDebitCapTradeAmt,0)),Sum(if (QueryCount = 0,ProfitDirectDebitCapNum,0)),Sum(if (QueryCount = 1,ProfitDirectTradeAmt,0))from TradeDaySummary where SeoTitle = 'self' and UserId =" + ParentId + "" + con, MysqlConn.ReadSqlConnStr);
             if (dt.Rows.Count > 0)
             if (dt.Rows.Count > 0)
             {
             {
                 TotalAmtfc = Convert.ToDecimal(function.CheckNum(dt.Rows[0][0].ToString()));
                 TotalAmtfc = Convert.ToDecimal(function.CheckNum(dt.Rows[0][0].ToString()));
@@ -1854,15 +1877,27 @@ namespace MySystem.Areas.Admin.Controllers
                 JCountyl = Convert.ToInt32(function.CheckInt(dt.Rows[0][16].ToString()));
                 JCountyl = Convert.ToInt32(function.CheckInt(dt.Rows[0][16].ToString()));
                 YAmtyl = Convert.ToDecimal(function.CheckNum(dt.Rows[0][17].ToString()));
                 YAmtyl = Convert.ToDecimal(function.CheckNum(dt.Rows[0][17].ToString()));
             }
             }
+
+            dt = CustomerSqlConn.dtable("SELECT Sum(ProfitTradeAmt + ProfitDebitTradeAmt),Sum(if (QueryCount = 0,ProfitTradeAmt,0)),Sum(if (QueryCount = 0,ProfitDebitTradeAmt - ProfitDebitCapTradeAmt,0)),Sum(if (QueryCount = 0,ProfitDebitCapTradeAmt,0)),Sum(if (QueryCount = 0,ProfitDebitCapNum,0)),Sum(if (QueryCount = 1,ProfitTradeAmt,0)) from TradeDaySummary2 where SeoTitle = 'self'" + condition, MysqlConn.ReadSqlConnStr);
+            if (dt.Rows.Count > 0)
+            {
+                TotalAmtyls = Convert.ToDecimal(function.CheckNum(dt.Rows[0][0].ToString()));
+                DAmtyls = Convert.ToDecimal(function.CheckNum(dt.Rows[0][1].ToString()));
+                JAmtyls = Convert.ToDecimal(function.CheckNum(dt.Rows[0][2].ToString()));
+                JfAmtyls = Convert.ToDecimal(function.CheckNum(dt.Rows[0][3].ToString()));
+                JCountyls = Convert.ToInt32(function.CheckInt(dt.Rows[0][4].ToString()));
+                YAmtyls = Convert.ToDecimal(function.CheckNum(dt.Rows[0][5].ToString()));
+            }
+
             //统计激活数(个人、团队)
             //统计激活数(个人、团队)
-            dt = OtherMySqlConn.dtable("SELECT SUM(if(SeoTitle='self',ActiveBuddyMerStatus,0)),SUM(if(SeoTitle='team',ActiveBuddyMerStatus,0)) FROM UserTradeMonthSummary WHERE UserId= " + ParentId + "" + cons);
+            dt = CustomerSqlConn.dtable("SELECT SUM(if(SeoTitle='self',ActiveBuddyMerStatus,0)),SUM(if(SeoTitle='team',ActiveBuddyMerStatus,0)) FROM UserTradeMonthSummary WHERE UserId= " + ParentId + "" + cons, MysqlConn.ReadSqlConnStr);
             if (dt.Rows.Count > 0)
             if (dt.Rows.Count > 0)
             {
             {
                 PACount = Convert.ToInt32(function.CheckNum(dt.Rows[0][0].ToString()));
                 PACount = Convert.ToInt32(function.CheckNum(dt.Rows[0][0].ToString()));
                 TACount = Convert.ToInt32(function.CheckNum(dt.Rows[0][1].ToString()));
                 TACount = Convert.ToInt32(function.CheckNum(dt.Rows[0][1].ToString()));
             }
             }
 
 
-            DataTable dts = OtherMySqlConn.dtable("SELECT Sum(HelpNonDirectTradeAmt + HelpNonDirectDebitTradeAmt),Sum(if (QueryCount = 0,HelpNonDirectTradeAmt,0)),Sum(if (QueryCount = 0,HelpNonDirectDebitTradeAmt - HelpNonDirectDebitCapTradeAmt,0)),Sum(if (QueryCount = 0,HelpNonDirectDebitCapTradeAmt,0)),Sum(if (QueryCount = 0,HelpNonDirectDebitCapNum,0)),Sum(if (QueryCount = 1,HelpNonDirectTradeAmt,0)),Sum(NotHelpNonDirectTradeAmt + NotHelpNonDirectDebitTradeAmt),Sum(if (QueryCount = 0,NotHelpNonDirectTradeAmt,0)),Sum(if (QueryCount = 0,NotHelpNonDirectDebitTradeAmt - NotHelpNonDirectDebitCapTradeAmt,0)),Sum(if (QueryCount = 0,NotHelpNonDirectDebitCapTradeAmt,0)),Sum(if (QueryCount = 0,NotHelpNonDirectDebitCapNum,0)),Sum(if (QueryCount = 1,NotHelpNonDirectTradeAmt,0)),Sum(ProfitNonDirectTradeAmt + ProfitNonDirectDebitTradeAmt),Sum(if (QueryCount = 0,ProfitNonDirectTradeAmt,0)),Sum(if (QueryCount = 0,ProfitNonDirectDebitTradeAmt - ProfitNonDirectDebitCapTradeAmt,0)),Sum(if (QueryCount = 0,ProfitNonDirectDebitCapTradeAmt,0)),Sum(if (QueryCount = 0,ProfitNonDirectDebitCapNum,0)),Sum(if (QueryCount = 1,ProfitNonDirectTradeAmt,0))from TradeDaySummary where SeoTitle = 'team' and UserId =" + ParentId + "" + con);
+            DataTable dts = CustomerSqlConn.dtable("SELECT Sum(HelpNonDirectTradeAmt + HelpNonDirectDebitTradeAmt),Sum(if (QueryCount = 0,HelpNonDirectTradeAmt,0)),Sum(if (QueryCount = 0,HelpNonDirectDebitTradeAmt - HelpNonDirectDebitCapTradeAmt,0)),Sum(if (QueryCount = 0,HelpNonDirectDebitCapTradeAmt,0)),Sum(if (QueryCount = 0,HelpNonDirectDebitCapNum,0)),Sum(if (QueryCount = 1,HelpNonDirectTradeAmt,0)),Sum(NotHelpNonDirectTradeAmt + NotHelpNonDirectDebitTradeAmt),Sum(if (QueryCount = 0,NotHelpNonDirectTradeAmt,0)),Sum(if (QueryCount = 0,NotHelpNonDirectDebitTradeAmt - NotHelpNonDirectDebitCapTradeAmt,0)),Sum(if (QueryCount = 0,NotHelpNonDirectDebitCapTradeAmt,0)),Sum(if (QueryCount = 0,NotHelpNonDirectDebitCapNum,0)),Sum(if (QueryCount = 1,NotHelpNonDirectTradeAmt,0)),Sum(ProfitNonDirectTradeAmt + ProfitNonDirectDebitTradeAmt),Sum(if (QueryCount = 0,ProfitNonDirectTradeAmt,0)),Sum(if (QueryCount = 0,ProfitNonDirectDebitTradeAmt - ProfitNonDirectDebitCapTradeAmt,0)),Sum(if (QueryCount = 0,ProfitNonDirectDebitCapTradeAmt,0)),Sum(if (QueryCount = 0,ProfitNonDirectDebitCapNum,0)),Sum(if (QueryCount = 1,ProfitNonDirectTradeAmt,0))from TradeDaySummary where SeoTitle = 'team' and UserId =" + ParentId + "" + con, MysqlConn.ReadSqlConnStr);
             if (dts.Rows.Count > 0)
             if (dts.Rows.Count > 0)
             {
             {
                 TotalAmtfc1 = Convert.ToDecimal(function.CheckNum(dts.Rows[0][0].ToString()));
                 TotalAmtfc1 = Convert.ToDecimal(function.CheckNum(dts.Rows[0][0].ToString()));
@@ -1887,6 +1922,17 @@ namespace MySystem.Areas.Admin.Controllers
                 YAmtyl1 = Convert.ToDecimal(function.CheckNum(dts.Rows[0][17].ToString()));
                 YAmtyl1 = Convert.ToDecimal(function.CheckNum(dts.Rows[0][17].ToString()));
             }
             }
 
 
+            dt = CustomerSqlConn.dtable("SELECT Sum(ProfitTradeAmt + ProfitDebitTradeAmt),Sum(if (QueryCount = 0,ProfitTradeAmt,0)),Sum(if (QueryCount = 0,ProfitDebitTradeAmt - ProfitDebitCapTradeAmt,0)),Sum(if (QueryCount = 0,ProfitDebitCapTradeAmt,0)),Sum(if (QueryCount = 0,ProfitDebitCapNum,0)),Sum(if (QueryCount = 1,ProfitTradeAmt,0)) from TradeDaySummary2 where SeoTitle = 'team'" + condition, MysqlConn.ReadSqlConnStr);
+            if (dt.Rows.Count > 0)
+            {
+                TotalAmtyl1s = Convert.ToDecimal(function.CheckNum(dt.Rows[0][0].ToString()));
+                DAmtyl1s = Convert.ToDecimal(function.CheckNum(dt.Rows[0][1].ToString()));
+                JAmtyl1s = Convert.ToDecimal(function.CheckNum(dt.Rows[0][2].ToString()));
+                JfAmtyl1s = Convert.ToDecimal(function.CheckNum(dt.Rows[0][3].ToString()));
+                JCountyl1s = Convert.ToInt32(function.CheckInt(dt.Rows[0][4].ToString()));
+                YAmtyl1s = Convert.ToDecimal(function.CheckNum(dt.Rows[0][5].ToString()));
+            }
+
             other.Add("TotalAmtfc", TotalAmtfc);
             other.Add("TotalAmtfc", TotalAmtfc);
             other.Add("DAmtfc", DAmtfc);
             other.Add("DAmtfc", DAmtfc);
             other.Add("JAmtfc", JAmtfc);
             other.Add("JAmtfc", JAmtfc);
@@ -1908,6 +1954,13 @@ namespace MySystem.Areas.Admin.Controllers
             other.Add("JCountyl", JCountyl);
             other.Add("JCountyl", JCountyl);
             other.Add("YAmtyl", YAmtyl);
             other.Add("YAmtyl", YAmtyl);
 
 
+            other.Add("TotalAmtyls", TotalAmtyls);
+            other.Add("DAmtyls", DAmtyls);
+            other.Add("JAmtyls", JAmtyls);
+            other.Add("JfAmtyls", JfAmtyls);
+            other.Add("JCountyls", JCountyls);
+            other.Add("YAmtyls", YAmtyls);
+
             other.Add("TotalAmtfc1", TotalAmtfc1);
             other.Add("TotalAmtfc1", TotalAmtfc1);
             other.Add("DAmtfc1", DAmtfc1);
             other.Add("DAmtfc1", DAmtfc1);
             other.Add("JAmtfc1", JAmtfc1);
             other.Add("JAmtfc1", JAmtfc1);
@@ -1929,6 +1982,13 @@ namespace MySystem.Areas.Admin.Controllers
             other.Add("JCountyl1", JCountyl1);
             other.Add("JCountyl1", JCountyl1);
             other.Add("YAmtyl1", YAmtyl1);
             other.Add("YAmtyl1", YAmtyl1);
 
 
+            other.Add("TotalAmtyl1s", TotalAmtyl1s);
+            other.Add("DAmtyl1s", DAmtyl1s);
+            other.Add("JAmtyl1s", JAmtyl1s);
+            other.Add("JfAmtyl1s", JfAmtyl1s);
+            other.Add("JCountyl1s", JCountyl1s);
+            other.Add("YAmtyl1s", YAmtyl1s);
+
             other.Add("PBCount", PBCount);
             other.Add("PBCount", PBCount);
             other.Add("PACount", PACount);
             other.Add("PACount", PACount);
             other.Add("TBCount", TBCount);
             other.Add("TBCount", TBCount);
@@ -1987,7 +2047,7 @@ namespace MySystem.Areas.Admin.Controllers
             int JCountwd = 0;
             int JCountwd = 0;
             decimal YAmtwd = 0;
             decimal YAmtwd = 0;
 
 
-            //盈利期
+            //盈利期(稳定期A)
             decimal TotalAmtyl = 0;
             decimal TotalAmtyl = 0;
             decimal DAmtyl = 0;
             decimal DAmtyl = 0;
             decimal JAmtyl = 0;
             decimal JAmtyl = 0;
@@ -1995,6 +2055,14 @@ namespace MySystem.Areas.Admin.Controllers
             int JCountyl = 0;
             int JCountyl = 0;
             decimal YAmtyl = 0;
             decimal YAmtyl = 0;
 
 
+            //盈利期(稳定期B)
+            decimal TotalAmtyl2 = 0;
+            decimal DAmtyl2 = 0;
+            decimal JAmtyl2 = 0;
+            decimal JfAmtyl2 = 0;
+            int JCountyl2 = 0;
+            decimal YAmtyl2 = 0;
+
             int BCount = 0;
             int BCount = 0;
             int ACount = 0;
             int ACount = 0;
             int PBCount = 0;
             int PBCount = 0;
@@ -2003,7 +2071,7 @@ namespace MySystem.Areas.Admin.Controllers
             int TACount = 0;
             int TACount = 0;
 
 
             Dictionary<string, object> obj = new Dictionary<string, object>();
             Dictionary<string, object> obj = new Dictionary<string, object>();
-            DataTable dt = OtherMySqlConn.dtable("SELECT Sum(HelpNonDirectTradeAmt + HelpNonDirectDebitTradeAmt),Sum(if (QueryCount = 0,HelpNonDirectTradeAmt,0)),Sum(if (QueryCount = 0,HelpNonDirectDebitTradeAmt - HelpNonDirectDebitCapTradeAmt,0)),Sum(if (QueryCount = 0,HelpNonDirectDebitCapTradeAmt,0)),Sum(if (QueryCount = 0,HelpNonDirectDebitCapNum,0)),Sum(if (QueryCount = 1,HelpNonDirectTradeAmt,0)),Sum(NotHelpNonDirectTradeAmt + NotHelpNonDirectDebitTradeAmt),Sum(if (QueryCount = 0,NotHelpNonDirectTradeAmt,0)),Sum(if (QueryCount = 0,NotHelpNonDirectDebitTradeAmt - NotHelpNonDirectDebitCapTradeAmt,0)),Sum(if (QueryCount = 0,NotHelpNonDirectDebitCapTradeAmt,0)),Sum(if (QueryCount = 0,NotHelpNonDirectDebitCapNum,0)),Sum(if (QueryCount = 1,NotHelpNonDirectTradeAmt,0)),Sum(ProfitNonDirectTradeAmt + ProfitNonDirectDebitTradeAmt),Sum(if (QueryCount = 0,ProfitNonDirectTradeAmt,0)),Sum(if (QueryCount = 0,ProfitNonDirectDebitTradeAmt - ProfitNonDirectDebitCapTradeAmt,0)),Sum(if (QueryCount = 0,ProfitNonDirectDebitCapTradeAmt,0)),Sum(if (QueryCount = 0,ProfitNonDirectDebitCapNum,0)),Sum(if (QueryCount = 1,ProfitNonDirectTradeAmt,0))from TradeDaySummary where SeoTitle = 'team'" + condition);
+            DataTable dt = CustomerSqlConn.dtable("SELECT Sum(HelpNonDirectTradeAmt + HelpNonDirectDebitTradeAmt),Sum(if (QueryCount = 0,HelpNonDirectTradeAmt,0)),Sum(if (QueryCount = 0,HelpNonDirectDebitTradeAmt - HelpNonDirectDebitCapTradeAmt,0)),Sum(if (QueryCount = 0,HelpNonDirectDebitCapTradeAmt,0)),Sum(if (QueryCount = 0,HelpNonDirectDebitCapNum,0)),Sum(if (QueryCount = 1,HelpNonDirectTradeAmt,0)),Sum(NotHelpNonDirectTradeAmt + NotHelpNonDirectDebitTradeAmt),Sum(if (QueryCount = 0,NotHelpNonDirectTradeAmt,0)),Sum(if (QueryCount = 0,NotHelpNonDirectDebitTradeAmt - NotHelpNonDirectDebitCapTradeAmt,0)),Sum(if (QueryCount = 0,NotHelpNonDirectDebitCapTradeAmt,0)),Sum(if (QueryCount = 0,NotHelpNonDirectDebitCapNum,0)),Sum(if (QueryCount = 1,NotHelpNonDirectTradeAmt,0)),Sum(ProfitNonDirectTradeAmt + ProfitNonDirectDebitTradeAmt),Sum(if (QueryCount = 0,ProfitNonDirectTradeAmt,0)),Sum(if (QueryCount = 0,ProfitNonDirectDebitTradeAmt - ProfitNonDirectDebitCapTradeAmt,0)),Sum(if (QueryCount = 0,ProfitNonDirectDebitCapTradeAmt,0)),Sum(if (QueryCount = 0,ProfitNonDirectDebitCapNum,0)),Sum(if (QueryCount = 1,ProfitNonDirectTradeAmt,0))from TradeDaySummary where SeoTitle = 'team'" + condition, MysqlConn.ReadSqlConnStr);
             if (dt.Rows.Count > 0)
             if (dt.Rows.Count > 0)
             {
             {
                 TotalAmtfc = Convert.ToDecimal(function.CheckNum(dt.Rows[0][0].ToString()));
                 TotalAmtfc = Convert.ToDecimal(function.CheckNum(dt.Rows[0][0].ToString()));
@@ -2027,6 +2095,18 @@ namespace MySystem.Areas.Admin.Controllers
                 JCountyl = Convert.ToInt32(function.CheckInt(dt.Rows[0][16].ToString()));
                 JCountyl = Convert.ToInt32(function.CheckInt(dt.Rows[0][16].ToString()));
                 YAmtyl = Convert.ToDecimal(function.CheckNum(dt.Rows[0][17].ToString()));
                 YAmtyl = Convert.ToDecimal(function.CheckNum(dt.Rows[0][17].ToString()));
             }
             }
+
+            dt = CustomerSqlConn.dtable("SELECT Sum(ProfitTradeAmt + ProfitDebitTradeAmt),Sum(if (QueryCount = 0,ProfitTradeAmt,0)),Sum(if (QueryCount = 0,ProfitDebitTradeAmt - ProfitDebitCapTradeAmt,0)),Sum(if (QueryCount = 0,ProfitDebitCapTradeAmt,0)),Sum(if (QueryCount = 0,ProfitDebitCapNum,0)),Sum(if (QueryCount = 1,ProfitTradeAmt,0)) from TradeDaySummary2 where SeoTitle = 'team'" + condition, MysqlConn.ReadSqlConnStr);
+            if (dt.Rows.Count > 0)
+            {
+
+                TotalAmtyl2 = Convert.ToDecimal(function.CheckNum(dt.Rows[0][0].ToString()));
+                DAmtyl2 = Convert.ToDecimal(function.CheckNum(dt.Rows[0][1].ToString()));
+                JAmtyl2 = Convert.ToDecimal(function.CheckNum(dt.Rows[0][2].ToString()));
+                JfAmtyl2 = Convert.ToDecimal(function.CheckNum(dt.Rows[0][3].ToString()));
+                JCountyl2 = Convert.ToInt32(function.CheckInt(dt.Rows[0][4].ToString()));
+                YAmtyl2 = Convert.ToDecimal(function.CheckNum(dt.Rows[0][5].ToString()));
+            }
             //统计激活数(个人、团队)
             //统计激活数(个人、团队)
             dt = OtherMySqlConn.dtable("SELECT SUM(if(SeoTitle='team',ActiveBuddyMerStatus,0)) FROM UserTradeMonthSummary WHERE UserId= " + UserId + "" + cons);
             dt = OtherMySqlConn.dtable("SELECT SUM(if(SeoTitle='team',ActiveBuddyMerStatus,0)) FROM UserTradeMonthSummary WHERE UserId= " + UserId + "" + cons);
             if (dt.Rows.Count > 0)
             if (dt.Rows.Count > 0)
@@ -2056,6 +2136,13 @@ namespace MySystem.Areas.Admin.Controllers
             obj.Add("JCountyl", JCountyl);
             obj.Add("JCountyl", JCountyl);
             obj.Add("YAmtyl", YAmtyl);
             obj.Add("YAmtyl", YAmtyl);
 
 
+            obj.Add("TotalAmtyl2", TotalAmtyl2);
+            obj.Add("DAmtyl2", DAmtyl2);
+            obj.Add("JAmtyl2", JAmtyl2);
+            obj.Add("JfAmtyl2", JfAmtyl2);
+            obj.Add("JCountyl2", JCountyl2);
+            obj.Add("YAmtyl2", YAmtyl2);
+
             obj.Add("BCount", BCount);
             obj.Add("BCount", BCount);
             obj.Add("ACount", ACount);
             obj.Add("ACount", ACount);
             obj.Add("PBCount", PBCount);
             obj.Add("PBCount", PBCount);
@@ -2797,7 +2884,7 @@ namespace MySystem.Areas.Admin.Controllers
             new AdminContentOther(_accessor.HttpContext, PublicFunction.MainTables).Edit("Users", Fields, Id);
             new AdminContentOther(_accessor.HttpContext, PublicFunction.MainTables).Edit("Users", Fields, Id);
             AddSysLog(Id, "Users", "SetLogoutDate");
             AddSysLog(Id, "Users", "SetLogoutDate");
             return "success";
             return "success";
-        } 
+        }
 
 
         #endregion
         #endregion
 
 

+ 6 - 2
Areas/Admin/Views/MainServer/Users/Children.cshtml

@@ -97,7 +97,9 @@
                     </br>
                     </br>
                     刷卡交易总额(稳)(元):<span style="color: #f00;" id="TotalAmtwd">0.00</span> | 贷记卡交易额(稳)(元):<span style="color: #f00;" id="DAmtwd">0.00</span> | 借记卡非封顶交易额(稳)(元):<span style="color: #f00;" id="JAmtwd">0.00</span> | 借记卡封顶交易额(稳)(元):<span style="color: #f00;" id="JfAmtwd">0.00</span> | 借记卡交易笔数(稳)(元):<span style="color: #f00;" id="JCountwd">0.00</span> | 云闪付小额交易额(稳)(元):<span style="color: #f00;" id="YAmtwd">0.00</span>
                     刷卡交易总额(稳)(元):<span style="color: #f00;" id="TotalAmtwd">0.00</span> | 贷记卡交易额(稳)(元):<span style="color: #f00;" id="DAmtwd">0.00</span> | 借记卡非封顶交易额(稳)(元):<span style="color: #f00;" id="JAmtwd">0.00</span> | 借记卡封顶交易额(稳)(元):<span style="color: #f00;" id="JfAmtwd">0.00</span> | 借记卡交易笔数(稳)(元):<span style="color: #f00;" id="JCountwd">0.00</span> | 云闪付小额交易额(稳)(元):<span style="color: #f00;" id="YAmtwd">0.00</span>
                     </br>
                     </br>
-                    刷卡交易总额(盈)(元):<span style="color: #f00;" id="TotalAmtyl">0.00</span> | 贷记卡交易额(盈)(元):<span style="color: #f00;" id="DAmtyl">0.00</span> | 借记卡非封顶交易额(盈)(元):<span style="color: #f00;" id="JAmtyl">0.00</span> | 借记卡封顶交易额(盈)(元):<span style="color: #f00;" id="JfAmtyl">0.00</span> | 借记卡交易笔数(盈)(元):<span style="color: #f00;" id="JCountyl">0.00</span> | 云闪付小额交易额(盈)(元):<span style="color: #f00;" id="YAmtyl">0.00</span>
+                    刷卡交易总额(稳A)(元):<span style="color: #f00;" id="TotalAmtyl">0.00</span> | 贷记卡交易额(稳A)(元):<span style="color: #f00;" id="DAmtyl">0.00</span> | 借记卡非封顶交易额(稳A)(元):<span style="color: #f00;" id="JAmtyl">0.00</span> | 借记卡封顶交易额(稳A)(元):<span style="color: #f00;" id="JfAmtyl">0.00</span> | 借记卡交易笔数(稳A)(元):<span style="color: #f00;" id="JCountyl">0.00</span> | 云闪付小额交易额(稳A)(元):<span style="color: #f00;" id="YAmtyl">0.00</span>
+                    </br>
+                    刷卡交易总额(稳B)(元):<span style="color: #f00;" id="TotalAmtyls">0.00</span> | 贷记卡交易额(稳B)(元):<span style="color: #f00;" id="DAmtyls">0.00</span> | 借记卡非封顶交易额(稳B)(元):<span style="color: #f00;" id="JAmtyls">0.00</span> | 借记卡封顶交易额(稳B)(元):<span style="color: #f00;" id="JfAmtyls">0.00</span> | 借记卡交易笔数(稳B)(元):<span style="color: #f00;" id="JCountyls">0.00</span> | 云闪付小额交易额(稳B)(元):<span style="color: #f00;" id="YAmtyls">0.00</span>
                     </br>
                     </br>
                     个人机具绑定总数:<span style="color: #f00;" id="PBCount">0</span> | 个人机具激活总数:<span style="color: #f00;" id="PACount">0</span> 
                     个人机具绑定总数:<span style="color: #f00;" id="PBCount">0</span> | 个人机具激活总数:<span style="color: #f00;" id="PACount">0</span> 
                     </br>
                     </br>
@@ -107,7 +109,9 @@
                     </br>
                     </br>
                     刷卡交易总额(稳)(元):<span style="color: #f00;" id="TotalAmtwd1">0.00</span> | 贷记卡交易额(稳)(元):<span style="color: #f00;" id="DAmtwd1">0.00</span> | 借记卡非封顶交易额(稳)(元):<span style="color: #f00;" id="JAmtwd1">0.00</span> | 借记卡封顶交易额(稳)(元):<span style="color: #f00;" id="JfAmtwd1">0.00</span> | 借记卡交易笔数(稳)(元):<span style="color: #f00;" id="JCountwd1">0.00</span> | 云闪付小额交易额(稳)(元):<span style="color: #f00;" id="YAmtwd1">0.00</span>
                     刷卡交易总额(稳)(元):<span style="color: #f00;" id="TotalAmtwd1">0.00</span> | 贷记卡交易额(稳)(元):<span style="color: #f00;" id="DAmtwd1">0.00</span> | 借记卡非封顶交易额(稳)(元):<span style="color: #f00;" id="JAmtwd1">0.00</span> | 借记卡封顶交易额(稳)(元):<span style="color: #f00;" id="JfAmtwd1">0.00</span> | 借记卡交易笔数(稳)(元):<span style="color: #f00;" id="JCountwd1">0.00</span> | 云闪付小额交易额(稳)(元):<span style="color: #f00;" id="YAmtwd1">0.00</span>
                     </br>
                     </br>
-                    刷卡交易总额(盈)(元):<span style="color: #f00;" id="TotalAmtyl1">0.00</span> | 贷记卡交易额(盈)(元):<span style="color: #f00;" id="DAmtyl1">0.00</span> | 借记卡非封顶交易额(盈)(元):<span style="color: #f00;" id="JAmtyl1">0.00</span> | 借记卡封顶交易额(盈)(元):<span style="color: #f00;" id="JfAmtyl1">0.00</span> | 借记卡交易笔数(盈)(元):<span style="color: #f00;" id="JCountyl1">0.00</span> | 云闪付小额交易额(盈)(元):<span style="color: #f00;" id="YAmtyl1">0.00</span>
+                    刷卡交易总额(稳A)(元):<span style="color: #f00;" id="TotalAmtyl1">0.00</span> | 贷记卡交易额(稳A)(元):<span style="color: #f00;" id="DAmtyl1">0.00</span> | 借记卡非封顶交易额(稳A)(元):<span style="color: #f00;" id="JAmtyl1">0.00</span> | 借记卡封顶交易额(稳A)(元):<span style="color: #f00;" id="JfAmtyl1">0.00</span> | 借记卡交易笔数(稳A)(元):<span style="color: #f00;" id="JCountyl1">0.00</span> | 云闪付小额交易额(稳A)(元):<span style="color: #f00;" id="YAmtyl1">0.00</span>
+                    </br>
+                    刷卡交易总额(稳B)(元):<span style="color: #f00;" id="TotalAmtyl1s">0.00</span> | 贷记卡交易额(稳B)(元):<span style="color: #f00;" id="DAmtyl1s">0.00</span> | 借记卡非封顶交易额(稳B)(元):<span style="color: #f00;" id="JAmtyl1s">0.00</span> | 借记卡封顶交易额(稳B)(元):<span style="color: #f00;" id="JfAmtyl1s">0.00</span> | 借记卡交易笔数(稳B)(元):<span style="color: #f00;" id="JCountyl1s">0.00</span> | 云闪付小额交易额(稳B)(元):<span style="color: #f00;" id="YAmtyl1s">0.00</span>
                     </br>
                     </br>
                     团队机具绑定总数:<span style="color: #f00;" id="TBCount">0</span> | 团队机具激活总数:<span style="color: #f00;" id="TACount">0</span> 
                     团队机具绑定总数:<span style="color: #f00;" id="TBCount">0</span> | 团队机具激活总数:<span style="color: #f00;" id="TACount">0</span> 
                 
                 

+ 1 - 1
appsettings.Development.json

@@ -19,7 +19,7 @@
     "OssHost": "http://oss.kexiaoshuang.com",
     "OssHost": "http://oss.kexiaoshuang.com",
     "Database": "KxsMainServer",
     "Database": "KxsMainServer",
     "SqlConnStr": "server=47.109.31.237;port=3306;user=KxsMainServer;password=FrW8ZfxlcaVdm1r0;database=KxsMainServer;charset=utf8;",
     "SqlConnStr": "server=47.109.31.237;port=3306;user=KxsMainServer;password=FrW8ZfxlcaVdm1r0;database=KxsMainServer;charset=utf8;",
-    "ReadSqlConnStr": "server=47.109.31.237;port=3306;user=KxsMainServer;password=FrW8ZfxlcaVdm1r0;database=KxsMainServer;charset=utf8;",
+    "ReadSqlConnStr": "server=rr-2vc53lrwpwm1ewscogo.mysql.cn-chengdu.rds.aliyuncs.com;port=3306;user=liuyang;password=liu#yang@2023;database=KxsProfitServer;charset=utf8;",
     "StatSqlConnStr": "server=47.109.31.237;port=3306;user=KxsMainServer;password=FrW8ZfxlcaVdm1r0;database=KxsMainServer;charset=utf8;ConnectionTimeout=600;DefaultCommandTimeout=600;",
     "StatSqlConnStr": "server=47.109.31.237;port=3306;user=KxsMainServer;password=FrW8ZfxlcaVdm1r0;database=KxsMainServer;charset=utf8;ConnectionTimeout=600;DefaultCommandTimeout=600;",
     "OpSqlConnStr": "server=47.109.31.237;port=3306;user=KxsOpServer;password=r7jwZ8ydLoeswDR4;database=KxsOpServer;charset=utf8;",
     "OpSqlConnStr": "server=47.109.31.237;port=3306;user=KxsOpServer;password=r7jwZ8ydLoeswDR4;database=KxsOpServer;charset=utf8;",
     "BsSqlConnStr": "server=47.109.31.237;port=3306;user=KxsBsServer;password=wyA1bEhi6aAkN8SB;database=KxsBsServer;charset=utf8;",
     "BsSqlConnStr": "server=47.109.31.237;port=3306;user=KxsBsServer;password=wyA1bEhi6aAkN8SB;database=KxsBsServer;charset=utf8;",

+ 27 - 6
wwwroot/layuiadmin/modules_main/UsersChildren_Admin.js

@@ -114,12 +114,19 @@ layui.config({
             , { field: 'JCountwd', width: 200, title: '借记卡交易笔数(稳)', sort: true }
             , { field: 'JCountwd', width: 200, title: '借记卡交易笔数(稳)', sort: true }
             , { field: 'YAmtwd', width: 200, title: '云闪付小额交易额(稳)', sort: true }
             , { field: 'YAmtwd', width: 200, title: '云闪付小额交易额(稳)', sort: true }
 
 
-            , { field: 'TotalAmtyl', width: 200, title: '刷卡交易总额(盈)', sort: true }
-            , { field: 'DAmtyl', width: 200, title: '贷记卡交易额(盈)', sort: true }
-            , { field: 'JAmtyl', width: 200, title: '借记卡非封顶交易额(盈)', sort: true }
-            , { field: 'JfAmtyl', width: 200, title: '借记卡封顶交易额(盈)', sort: true }
-            , { field: 'JCountyl', width: 200, title: '借记卡交易笔数(盈)', sort: true }
-            , { field: 'YAmtyl', width: 200, title: '云闪付小额交易额(盈)', sort: true }
+            , { field: 'TotalAmtyl', width: 200, title: '刷卡交易总额(稳A)', sort: true }
+            , { field: 'DAmtyl', width: 200, title: '贷记卡交易额(稳A)', sort: true }
+            , { field: 'JAmtyl', width: 200, title: '借记卡非封顶交易额(稳A)', sort: true }
+            , { field: 'JfAmtyl', width: 200, title: '借记卡封顶交易额(稳A)', sort: true }
+            , { field: 'JCountyl', width: 200, title: '借记卡交易笔数(稳A)', sort: true }
+            , { field: 'YAmtyl', width: 200, title: '云闪付小额交易额(稳A)', sort: true }
+
+            , { field: 'TotalAmtyl2', width: 200, title: '刷卡交易总额(稳B)', sort: true }
+            , { field: 'DAmtyl2', width: 200, title: '贷记卡交易额(稳B)', sort: true }
+            , { field: 'JAmtyl2', width: 200, title: '借记卡非封顶交易额(稳B)', sort: true }
+            , { field: 'JfAmtyl2', width: 200, title: '借记卡封顶交易额(稳B)', sort: true }
+            , { field: 'JCountyl2', width: 200, title: '借记卡交易笔数(稳B)', sort: true }
+            , { field: 'YAmtyl2', width: 200, title: '云闪付小额交易额(稳B)', sort: true }
 
 
             , { field: 'TBCount', width: 200, title: '团队机具绑定总数', sort: true }
             , { field: 'TBCount', width: 200, title: '团队机具绑定总数', sort: true }
             , { field: 'TACount', width: 200, title: '团队机具激活总数', sort: true }
             , { field: 'TACount', width: 200, title: '团队机具激活总数', sort: true }
@@ -157,6 +164,13 @@ layui.config({
             $("#JCountyl").text(res.other.JCountyl);
             $("#JCountyl").text(res.other.JCountyl);
             $("#YAmtyl").text(res.other.YAmtyl);
             $("#YAmtyl").text(res.other.YAmtyl);
 
 
+            $("#TotalAmtyls").text(res.other.TotalAmtyls);
+            $("#DAmtyls").text(res.other.DAmtyls);
+            $("#JAmtyls").text(res.other.JAmtyls);
+            $("#JfAmtyls").text(res.other.JfAmtyls);
+            $("#JCountyls").text(res.other.JCountyls);
+            $("#YAmtyls").text(res.other.YAmtyls);
+
             $("#TotalAmtfc1").text(res.other.TotalAmtfc1);
             $("#TotalAmtfc1").text(res.other.TotalAmtfc1);
             $("#DAmtfc1").text(res.other.DAmtfc1);
             $("#DAmtfc1").text(res.other.DAmtfc1);
             $("#JAmtfc1").text(res.other.JAmtfc1);
             $("#JAmtfc1").text(res.other.JAmtfc1);
@@ -178,6 +192,13 @@ layui.config({
             $("#JCountyl1").text(res.other.JCountyl1);
             $("#JCountyl1").text(res.other.JCountyl1);
             $("#YAmtyl1").text(res.other.YAmtyl1);
             $("#YAmtyl1").text(res.other.YAmtyl1);
 
 
+            $("#TotalAmtyl1s").text(res.other.TotalAmtyl1s);
+            $("#DAmtyl1s").text(res.other.DAmtyl1s);
+            $("#JAmtyl1s").text(res.other.JAmtyl1s);
+            $("#JfAmtyl1s").text(res.other.JfAmtyl1s);
+            $("#JCountyl1s").text(res.other.JCountyl1s);
+            $("#YAmtyl1s").text(res.other.YAmtyl1s);
+
             $("#BCount").text(res.other.BCount);
             $("#BCount").text(res.other.BCount);
             $("#ACount").text(res.other.ACount);
             $("#ACount").text(res.other.ACount);
             $("#PBCount").text(res.other.PBCount);
             $("#PBCount").text(res.other.PBCount);