Merge branch 'DuGuYang' into develop

Areas/Admin/Controllers/MainServer/StoreHouseController.cs

@@ -155,25 +155,12 @@ namespace MySystem.Areas.Admin.Controllers
                         userIds += item.Id + ",";
                     }
                     userIds += user.Id;//下线创客Id包含自己
-                    // string ParentNav = function.CheckNull(user.ParentNav).Trim(',').Replace(",,", ",");
-                    // string[] ParentNavList = ParentNav.Split(',');
-                    // string OpId = ParentNavList[^1];//上线创客
                     string Id = "";
-                    // var storeHouse = db.StoreHouse.Where(m => m.OpId == int.Parse(OpId) && m.Sort == 0 && m.UserId != 0 && m.UserId != 1 && m.Status == 1).ToList();//上线关联的分仓
-                    DataTable dt = OtherMySqlConn.dtable("SELECT Id FROM StoreHouse WHERE UserId IN(" + userIds.TrimEnd(',') + ") AND OPId not IN (" + userIds.TrimEnd(',') + ") AND `Status`=1 AND Sort=0 AND UserId>1");
+                    DataTable dt = OtherMySqlConn.dtable("SELECT Id FROM StoreHouse WHERE UserId IN(" + userIds.TrimEnd(',') + ") AND `Status`=1 AND Sort=0 AND UserId>1");
                     foreach (DataRow item in dt.Rows)
                     {
                         Id += item["Id"].ToString() + ",";
                     }
-                    // var storeHouses = db.StoreHouse.Where(m => m.OpId == 0 && userIds.TrimEnd(',').Contains(m.UserId.ToString()) && m.UserId != 0 && m.UserId != 1 && m.Status > 0).ToList();//下线未关联分仓?
-                    // foreach (var items in storeHouse)
-                    // {
-                    //     Id += items.Id + ",";
-                    // }
-                    // foreach (var item1 in storeHouses)
-                    // {
-                    //     Id += item1.Id + ",";
-                    // }
                     condition += " and Id in (" + Id.TrimEnd(',') + ")";
 
                 }
@@ -1578,7 +1565,8 @@ namespace MySystem.Areas.Admin.Controllers
                 var tamount = 0;
                 var storeInfo = db.StoreHouse.FirstOrDefault(m => m.Id == StoreId);
                 var posCount = db.PosMachinesTwo.Count(m => m.StoreId == StoreId && m.UserId == 0 && m.BuyUserId == 0 && m.OpId == 0);
-                var brandInfo = db.KqProducts.FirstOrDefault(m => m.Id == int.Parse(storeInfo.BrandId));
+                var BrandId = int.Parse(storeInfo.BrandId);
+                var brandInfo = db.KqProducts.FirstOrDefault(m => m.Id == BrandId);
                 if (brandInfo.Name.Contains("电签"))
                 {
                     amount = 100;
@@ -1679,7 +1667,8 @@ namespace MySystem.Areas.Admin.Controllers
                             {
                                 var pos = db.PosMachinesTwo.Where(m => m.StoreId == StoreId && m.UserId == 0 && m.BuyUserId == 0).ToList();
                                 var posCount = pos.Count();
-                                var brandInfo = db.KqProducts.FirstOrDefault(m => m.Id == int.Parse(storeInfo.BrandId));
+                                var BrandId = int.Parse(storeInfo.BrandId);
+                                var brandInfo = db.KqProducts.FirstOrDefault(m => m.Id == BrandId);
                                 if (brandInfo.Name.Contains("电签"))
                                 {
                                     amount = 100;
@@ -1843,7 +1832,8 @@ namespace MySystem.Areas.Admin.Controllers
                 var tamount = 0;
                 var storeInfo = db.StoreHouse.FirstOrDefault(m => m.Id == StoreId);
                 var posCount = db.PosMachinesTwo.Count(m => m.StoreId == StoreId && m.UserId == 0 && m.BuyUserId == 0 && m.OpId == storeInfo.OpId);
-                var brandInfo = db.KqProducts.FirstOrDefault(m => m.Id == int.Parse(storeInfo.BrandId));
+                var BrandId = int.Parse(storeInfo.BrandId);
+                var brandInfo = db.KqProducts.FirstOrDefault(m => m.Id == BrandId);
                 if (brandInfo.Name.Contains("电签"))
                 {
                     amount = 100;
@@ -1886,7 +1876,7 @@ namespace MySystem.Areas.Admin.Controllers
             {
                 var sysAdmin = opdb.SysAdmin.FirstOrDefault(m => m.UserId == userForMakerCode.UserId);
                 var userAmount = opdb.UserAccount.FirstOrDefault(m => m.Sort == sysAdmin.Id) ?? new OpModels.UserAccount();
-                decimal TotalAmount = userAmount.ValidAmount + userAmount.TotalAmt + userAmount.ValidForGetAmount;
+                decimal TotalAmount = userAmount.ValidAmount + userAmount.TotalAmt + userAmount.ValidForGetAmount;//旧的总金额
                 Fields.Add("OpId", 0);
                 if (sysAdmin.Id > 0)
                 {
@@ -1908,7 +1898,8 @@ namespace MySystem.Areas.Admin.Controllers
                         {
                             var pos = db.PosMachinesTwo.Where(m => m.StoreId == StoreId && m.UserId == 0 && m.BuyUserId == 0 && m.OpId == sysAdmin.UserId).ToList();
                             var posCount = pos.Count();
-                            var brandInfo = db.KqProducts.FirstOrDefault(m => m.Id == int.Parse(store.BrandId));
+                            var BrandId = int.Parse(store.BrandId);
+                            var brandInfo = db.KqProducts.FirstOrDefault(m => m.Id == BrandId);
                             if (brandInfo.Name.Contains("电签"))
                             {
                                 amount = 100;
@@ -1945,7 +1936,8 @@ namespace MySystem.Areas.Admin.Controllers
                     {
                         return "Warning|" + error;
                     }
-                    if (TotalAmount - deposit >= 0)
+                    decimal toAmount = userAmount.ValidAmount + userAmount.TotalAmt + userAmount.ValidForGetAmount;//新的总金额
+                    if (toAmount - deposit >= 0)
                     {
                         foreach (var item in idlist)
                         {

Areas/Admin/Controllers/MainServer/TradeDaySummaryController.cs

@@ -172,20 +172,26 @@ namespace MySystem.Areas.Admin.Controllers
             Dictionary<string, object> other = new Dictionary<string, object>();
             string HelpDirectTradeAmt = "0.00";//扶持期直营商户交易总额
             string HelpNonDirectTradeAmt = "0.00";//扶持期非直营商户交易总额
+            string ProfitDirectTradeAmt = "0.00";//盈利期非直营商户交易总额
             string NotHelpDirectTradeAmt = "0.00";//非扶持期直营商户交易总额
             string NotHelpNonDirectTradeAmt = "0.00";//非扶持期非直营商户交易总额
-            DataTable dt = OtherMySqlConn.dtable("SELECT SUM(HelpDirectTradeAmt),SUM(HelpNonDirectTradeAmt),SUM(NotHelpDirectTradeAmt),SUM(NotHelpNonDirectTradeAmt) FROM TradeDaySummary where 1=1" + condition);
+            string ProfitNonDirectTradeAmt = "0.00";//盈利期非直营商户交易总额
+            DataTable dt = OtherMySqlConn.dtable("SELECT SUM(HelpDirectTradeAmt),SUM(HelpNonDirectTradeAmt),SUM(ProfitDirectTradeAmt),SUM(NotHelpDirectTradeAmt),SUM(NotHelpNonDirectTradeAmt),SUM(ProfitNonDirectTradeAmt)  FROM TradeDaySummary where 1=1" + condition);
             if (dt.Rows.Count > 0)
             {
                 HelpDirectTradeAmt = decimal.Parse(function.CheckNum(dt.Rows[0][0].ToString())).ToString("f2");
                 HelpNonDirectTradeAmt = decimal.Parse(function.CheckNum(dt.Rows[0][1].ToString())).ToString("f2");
-                NotHelpDirectTradeAmt = decimal.Parse(function.CheckNum(dt.Rows[0][2].ToString())).ToString("f2");
-                NotHelpNonDirectTradeAmt = decimal.Parse(function.CheckNum(dt.Rows[0][3].ToString())).ToString("f2");
+                ProfitDirectTradeAmt = decimal.Parse(function.CheckNum(dt.Rows[0][2].ToString())).ToString("f2");
+                NotHelpDirectTradeAmt = decimal.Parse(function.CheckNum(dt.Rows[0][3].ToString())).ToString("f2");
+                NotHelpNonDirectTradeAmt = decimal.Parse(function.CheckNum(dt.Rows[0][4].ToString())).ToString("f2");
+                ProfitNonDirectTradeAmt = decimal.Parse(function.CheckNum(dt.Rows[0][5].ToString())).ToString("f2");
             }
             other.Add("HelpDirectTradeAmt", HelpDirectTradeAmt);
             other.Add("HelpNonDirectTradeAmt", HelpNonDirectTradeAmt);
+            other.Add("ProfitDirectTradeAmt", ProfitDirectTradeAmt);
             other.Add("NotHelpDirectTradeAmt", NotHelpDirectTradeAmt);
             other.Add("NotHelpNonDirectTradeAmt", NotHelpNonDirectTradeAmt);
+            other.Add("ProfitNonDirectTradeAmt", ProfitNonDirectTradeAmt);
             obj.Add("other", other);
             return Json(obj);
         }
@@ -464,6 +470,7 @@ namespace MySystem.Areas.Admin.Controllers
             ReturnFields.Add("NotHelpNonDirectQrDebitTradeAmt", "非直营云闪付非封顶借记卡(非扶持期)");
             ReturnFields.Add("NotHelpDirectNonQrDebitTradeAmt", "直营非云闪付非封顶借记卡(非扶持期)");
             ReturnFields.Add("NotHelpNonDirectNonQrDebitTradeAmt", "非直营非云闪付非封顶借记卡(非扶持期)");
+
             ReturnFields.Add("HelpDirectTradeAmt", "直营商户交易总额(扶持期)");
             ReturnFields.Add("HelpNonDirectTradeAmt", "非直营商户交易总额(扶持期)");
             ReturnFields.Add("HelpDirectCreditTradeAmt", "直营贷记卡交易总额(扶持期)");
@@ -482,6 +489,25 @@ namespace MySystem.Areas.Admin.Controllers
             ReturnFields.Add("HelpNonDirectQrDebitTradeAmt", "非直营云闪付非封顶借记卡(扶持期)");
             ReturnFields.Add("HelpDirectNonQrDebitTradeAmt", "直营非云闪付非封顶借记卡(扶持期)");
             ReturnFields.Add("HelpNonDirectNonQrDebitTradeAmt", "非直营非云闪付非封顶借记卡(扶持期)");
+            
+            ReturnFields.Add("ProfitDirectTradeAmt", "直营商户交易总额(盈利期)");
+            ReturnFields.Add("ProfitNonDirectTradeAmt", "非直营商户交易总额(盈利期)");
+            ReturnFields.Add("ProfitDirectCreditTradeAmt", "直营贷记卡交易总额(盈利期)");
+            ReturnFields.Add("ProfitNonDirectCreditTradeAmt", "非直营贷记卡交易总额(盈利期)");
+            ReturnFields.Add("ProfitDirectQrCreditTradeAmt", "直营云闪付贷记卡交易额(盈利期)");
+            ReturnFields.Add("ProfitNonDirectQrCreditTradeAmt", "非直营云闪付贷记卡交易额(盈利期)");
+            ReturnFields.Add("ProfitDirectNonQrCreditTradeAmt", "直营非云闪付贷记卡交易额(盈利期)");
+            ReturnFields.Add("ProfitNonDirectNonQrCreditTradeAmt", "非直营非云闪付贷记卡交易额(盈利期)");
+            ReturnFields.Add("ProfitDirectDebitTradeAmt", "直营商户借记卡交易总额(盈利期)");
+            ReturnFields.Add("ProfitDirectDebitCapTradeAmt", "直营商户借记卡封顶交易总金额(盈利期)");
+            ReturnFields.Add("ProfitDirectDebitCapNum", "直营商户借记卡封顶交易总数(盈利期)");
+            ReturnFields.Add("ProfitNonDirectDebitTradeAmt", "非直营商户借记卡交易总额(盈利期)");
+            ReturnFields.Add("ProfitNonDirectDebitCapTradeAmt", "非直营商户借记卡封顶交易总金额(盈利期)");
+            ReturnFields.Add("ProfitNonDirectDebitCapNum", "非直营商户借记卡封顶交易总数(盈利期)");
+            ReturnFields.Add("ProfitDirectQrDebitTradeAmt", "直营云闪付非封顶借记卡(盈利期)");
+            ReturnFields.Add("ProfitNonDirectQrDebitTradeAmt", "非直营云闪付非封顶借记卡(盈利期)");
+            ReturnFields.Add("ProfitDirectNonQrDebitTradeAmt", "直营非云闪付非封顶借记卡(盈利期)");
+            ReturnFields.Add("ProfitNonDirectNonQrDebitTradeAmt", "非直营非云闪付非封顶借记卡(盈利期)");
 
             result.Add("Fields", ReturnFields);
             AddSysLog("0", "TradeDaySummary", "ExportExcel");

Areas/Admin/Controllers/MainServer/UserTradeDaySummaryController.cs

@@ -148,37 +148,50 @@ namespace MySystem.Areas.Admin.Controllers
             Dictionary<string, object> other = new Dictionary<string, object>();
             string HelpDirectTradeAmt = "0.00"; //扶持期直营贷记卡交易
             string NotHelpDirectTradeAmt = "0.00"; //稳定期直营贷记卡交易
+            string ProfitDirectCreditTradeAmt = "0.00"; //盈利期直营贷记卡交易
             string HelpDirectDebitTradeAmt = "0.00"; //扶持期直营借记卡交易
             string NotHelpDirectDebitTradeAmt = "0.00"; //稳定期直营借记卡交易
+            string ProfitDirectDebitTradeAmt = "0.00"; //盈利期直营借记卡交易
+
             string HelpNonDirectTradeAmt = "0.00"; //扶持期非直营贷记卡交易
             string NotHelpNonDirectTradeAmt = "0.00"; //稳定期非直营贷记卡交易
+            string ProfitNonDirectCreditTradeAmt = "0.00"; //盈利期非直营贷记卡交易
             string HelpNonDirectDebitTradeAmt = "0.00"; //扶持期非直营借记卡交易
             string NotHelpNonDirectDebitTradeAmt = "0.00"; //稳定期非直营借记卡交易
+            string ProfitNonDirectDebitTradeAmt = "0.00"; //盈利期非直营借记卡交易
 
-            DataTable dt = OtherMySqlConn.dtable("select sum(HelpDirectTradeAmt),sum(NotHelpDirectTradeAmt),sum(HelpDirectDebitTradeAmt),sum(NotHelpDirectDebitTradeAmt) from TradeDaySummary where SeoTitle='self' " + condition);
+            DataTable dt = OtherMySqlConn.dtable("select sum(HelpDirectTradeAmt),sum(NotHelpDirectTradeAmt),sum(ProfitDirectCreditTradeAmt),sum(HelpDirectDebitTradeAmt),sum(NotHelpDirectDebitTradeAmt),sum(ProfitDirectDebitTradeAmt) from TradeDaySummary where SeoTitle='self' " + condition);
             if (dt.Rows.Count > 0)
             {
                 HelpDirectTradeAmt = dt.Rows[0][0].ToString();
                 NotHelpDirectTradeAmt = dt.Rows[0][1].ToString();
-                HelpDirectDebitTradeAmt = dt.Rows[0][2].ToString();
-                NotHelpDirectDebitTradeAmt = dt.Rows[0][3].ToString();
+                ProfitDirectCreditTradeAmt = dt.Rows[0][2].ToString();
+                HelpDirectDebitTradeAmt = dt.Rows[0][3].ToString();
+                NotHelpDirectDebitTradeAmt = dt.Rows[0][4].ToString();
+                ProfitDirectDebitTradeAmt = dt.Rows[0][5].ToString();
             }
-            dt = OtherMySqlConn.dtable("select sum(HelpNonDirectTradeAmt),sum(NotHelpNonDirectTradeAmt),sum(HelpNonDirectDebitTradeAmt),sum(NotHelpNonDirectDebitTradeAmt) from TradeDaySummary where SeoTitle='team' " + condition);
+            dt = OtherMySqlConn.dtable("select sum(HelpNonDirectTradeAmt),sum(NotHelpNonDirectTradeAmt),sum(ProfitNonDirectCreditTradeAmt),sum(HelpNonDirectDebitTradeAmt),sum(NotHelpNonDirectDebitTradeAmt),sum(ProfitNonDirectDebitTradeAmt) from TradeDaySummary where SeoTitle='team' " + condition);
             if (dt.Rows.Count > 0)
             {
                 HelpNonDirectTradeAmt = dt.Rows[0][0].ToString();
                 NotHelpNonDirectTradeAmt = dt.Rows[0][1].ToString();
-                HelpNonDirectDebitTradeAmt = dt.Rows[0][2].ToString();
-                NotHelpNonDirectDebitTradeAmt = dt.Rows[0][3].ToString();
+                ProfitNonDirectCreditTradeAmt = dt.Rows[0][2].ToString();
+                HelpNonDirectDebitTradeAmt = dt.Rows[0][3].ToString();
+                NotHelpNonDirectDebitTradeAmt = dt.Rows[0][4].ToString();
+                ProfitNonDirectDebitTradeAmt = dt.Rows[0][5].ToString();
             }
             other.Add("HelpDirectTradeAmt", HelpDirectTradeAmt);
             other.Add("NotHelpDirectTradeAmt", NotHelpDirectTradeAmt);
+            other.Add("ProfitDirectCreditTradeAmt", ProfitDirectCreditTradeAmt);
             other.Add("HelpDirectDebitTradeAmt", HelpDirectDebitTradeAmt);
             other.Add("NotHelpDirectDebitTradeAmt", NotHelpDirectDebitTradeAmt);
+            other.Add("ProfitDirectDebitTradeAmt", ProfitDirectDebitTradeAmt);
             other.Add("HelpNonDirectTradeAmt", HelpNonDirectTradeAmt);
             other.Add("NotHelpNonDirectTradeAmt", NotHelpNonDirectTradeAmt);
+            other.Add("ProfitNonDirectCreditTradeAmt", ProfitNonDirectCreditTradeAmt);
             other.Add("HelpNonDirectDebitTradeAmt", HelpNonDirectDebitTradeAmt);
             other.Add("NotHelpNonDirectDebitTradeAmt", NotHelpNonDirectDebitTradeAmt);
+            other.Add("ProfitNonDirectDebitTradeAmt", ProfitNonDirectDebitTradeAmt);
             obj.Add("other", other);
             return Json(obj);
         }
@@ -435,12 +448,16 @@ namespace MySystem.Areas.Admin.Controllers
             ReturnFields.Add("SeoTitle", "交易类型");
             ReturnFields.Add("HelpDirectTradeAmt", "扶持期直营贷记卡交易");
             ReturnFields.Add("NotHelpDirectTradeAmt", "稳定期直营贷记卡交易");
+            ReturnFields.Add("ProfitDirectCreditTradeAmt", "盈利期直营贷记卡交易");
             ReturnFields.Add("HelpDirectDebitTradeAmt", "扶持期直营借记卡交易");
             ReturnFields.Add("NotHelpDirectDebitTradeAmt", "稳定期直营借记卡交易");
+            ReturnFields.Add("ProfitDirectDebitTradeAmt", "盈利期直营借记卡交易");
             ReturnFields.Add("HelpNonDirectTradeAmt", "扶持期非直营贷记卡交易");
             ReturnFields.Add("NotHelpNonDirectTradeAmt", "稳定期非直营贷记卡交易");
+            ReturnFields.Add("ProfitNonDirectCreditTradeAmt", "盈利期非直营贷记卡交易");
             ReturnFields.Add("HelpNonDirectDebitTradeAmt", "扶持期非直营借记卡交易");
             ReturnFields.Add("NotHelpNonDirectDebitTradeAmt", "稳定期非直营借记卡交易");
+            ReturnFields.Add("ProfitNonDirectDebitTradeAmt", "盈利期非直营借记卡交易");
 
             result.Add("Fields", ReturnFields);
             AddSysLog("0", "TradeDaySummary", "ExportExcel");

Areas/Admin/Controllers/MainServer/UsersController.cs

@@ -1561,6 +1561,14 @@ namespace MySystem.Areas.Admin.Controllers
                 dic["JfAmtwd"] = Convert.ToDecimal(Info["JfAmtwd"].ToString());
                 dic["JCountwd"] = Convert.ToInt32(Info["JCountwd"].ToString());
                 dic["YAmtwd"] = Convert.ToDecimal(Info["YAmtwd"].ToString());
+
+                dic["TotalAmtyl"] = Convert.ToDecimal(Info["TotalAmtyl"].ToString()) + Convert.ToDecimal(Info["YAmtyl"].ToString());
+                dic["DAmtyl"] = Convert.ToDecimal(Info["DAmtyl"].ToString());
+                dic["JAmtyl"] = Convert.ToDecimal(Info["JAmtyl"].ToString());
+                dic["JfAmtyl"] = Convert.ToDecimal(Info["JfAmtyl"].ToString());
+                dic["JCountyl"] = Convert.ToInt32(Info["JCountyl"].ToString());
+                dic["YAmtyl"] = Convert.ToDecimal(Info["YAmtyl"].ToString());
+
                 dic["TBCount"] = Info["TBCount"].ToString();
                 dic["TACount"] = Info["TACount"].ToString();
                 // dic["BCount"] = Info["BCount"].ToString();
@@ -1585,6 +1593,14 @@ namespace MySystem.Areas.Admin.Controllers
             int JCountwd = 0;
             decimal YAmtwd = 0;
 
+            //盈利期
+            decimal TotalAmtyl = 0;
+            decimal DAmtyl = 0;
+            decimal JAmtyl = 0;
+            decimal JfAmtyl = 0;
+            int JCountyl = 0;
+            decimal YAmtyl = 0;
+
             //团队
             //扶持期
             decimal TotalAmtfc1 = 0;
@@ -1602,13 +1618,21 @@ namespace MySystem.Areas.Admin.Controllers
             int JCountwd1 = 0;
             decimal YAmtwd1 = 0;
 
+            //盈利期
+            decimal TotalAmtyl1 = 0;
+            decimal DAmtyl1 = 0;
+            decimal JAmtyl1 = 0;
+            decimal JfAmtyl1 = 0;
+            int JCountyl1 = 0;
+            decimal YAmtyl1 = 0;
+
             int PBCount = 0;
             int PACount = 0;
             int TBCount = 0;
             int TACount = 0;
 
             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))from TradeDaySummary where SeoTitle = 'self' and UserId =" + ParentId + "" + con);
+            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);
             if (dt.Rows.Count > 0)
             {
                 TotalAmtfc = Convert.ToDecimal(function.CheckNum(dt.Rows[0][0].ToString()));
@@ -1617,12 +1641,20 @@ namespace MySystem.Areas.Admin.Controllers
                 JfAmtfc = Convert.ToDecimal(function.CheckNum(dt.Rows[0][3].ToString()));
                 JCountfc = Convert.ToInt32(function.CheckInt(dt.Rows[0][4].ToString()));
                 YAmtfc = Convert.ToDecimal(function.CheckNum(dt.Rows[0][5].ToString()));
+
                 TotalAmtwd = Convert.ToDecimal(function.CheckNum(dt.Rows[0][6].ToString()));
                 DAmtwd = Convert.ToDecimal(function.CheckNum(dt.Rows[0][7].ToString()));
                 JAmtwd = Convert.ToDecimal(function.CheckNum(dt.Rows[0][8].ToString()));
                 JfAmtwd = Convert.ToDecimal(function.CheckNum(dt.Rows[0][9].ToString()));
                 JCountwd = Convert.ToInt32(function.CheckInt(dt.Rows[0][10].ToString()));
                 YAmtwd = Convert.ToDecimal(function.CheckNum(dt.Rows[0][11].ToString()));
+
+                TotalAmtyl = Convert.ToDecimal(function.CheckNum(dt.Rows[0][12].ToString()));
+                DAmtyl = Convert.ToDecimal(function.CheckNum(dt.Rows[0][13].ToString()));
+                JAmtyl = Convert.ToDecimal(function.CheckNum(dt.Rows[0][14].ToString()));
+                JfAmtyl = Convert.ToDecimal(function.CheckNum(dt.Rows[0][15].ToString()));
+                JCountyl = Convert.ToInt32(function.CheckInt(dt.Rows[0][16].ToString()));
+                YAmtyl = Convert.ToDecimal(function.CheckNum(dt.Rows[0][17].ToString()));
             }
             //统计激活数(个人、团队)
             dt = OtherMySqlConn.dtable("SELECT SUM(if(SeoTitle='self',ActiveBuddyMerStatus,0)),SUM(if(SeoTitle='team',ActiveBuddyMerStatus,0)) FROM UserTradeMonthSummary WHERE UserId= " + ParentId + "" + cons);
@@ -1632,7 +1664,7 @@ namespace MySystem.Areas.Admin.Controllers
                 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))from TradeDaySummary where SeoTitle = 'team' and UserId =" + ParentId + "" + con);
+            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);
             if (dts.Rows.Count > 0)
             {
                 TotalAmtfc1 = Convert.ToDecimal(function.CheckNum(dts.Rows[0][0].ToString()));
@@ -1641,12 +1673,20 @@ namespace MySystem.Areas.Admin.Controllers
                 JfAmtfc1 = Convert.ToDecimal(function.CheckNum(dts.Rows[0][3].ToString()));
                 JCountfc1 = Convert.ToInt32(function.CheckInt(dts.Rows[0][4].ToString()));
                 YAmtfc1 = Convert.ToDecimal(function.CheckNum(dts.Rows[0][5].ToString()));
+
                 TotalAmtwd1 = Convert.ToDecimal(function.CheckNum(dts.Rows[0][6].ToString()));
                 DAmtwd1 = Convert.ToDecimal(function.CheckNum(dts.Rows[0][7].ToString()));
                 JAmtwd1 = Convert.ToDecimal(function.CheckNum(dts.Rows[0][8].ToString()));
                 JfAmtwd1 = Convert.ToDecimal(function.CheckNum(dts.Rows[0][9].ToString()));
                 JCountwd1 = Convert.ToInt32(function.CheckInt(dts.Rows[0][10].ToString()));
                 YAmtwd1 = Convert.ToDecimal(function.CheckNum(dts.Rows[0][11].ToString()));
+
+                TotalAmtyl1 = Convert.ToDecimal(function.CheckNum(dts.Rows[0][12].ToString()));
+                DAmtyl1 = Convert.ToDecimal(function.CheckNum(dts.Rows[0][13].ToString()));
+                JAmtyl1 = Convert.ToDecimal(function.CheckNum(dts.Rows[0][14].ToString()));
+                JfAmtyl1 = Convert.ToDecimal(function.CheckNum(dts.Rows[0][15].ToString()));
+                JCountyl1 = Convert.ToInt32(function.CheckInt(dts.Rows[0][16].ToString()));
+                YAmtyl1 = Convert.ToDecimal(function.CheckNum(dts.Rows[0][17].ToString()));
             }
 
             other.Add("TotalAmtfc", TotalAmtfc);
@@ -1663,6 +1703,13 @@ namespace MySystem.Areas.Admin.Controllers
             other.Add("JCountwd", JCountwd);
             other.Add("YAmtwd", YAmtwd);
 
+            other.Add("TotalAmtyl", TotalAmtyl);
+            other.Add("DAmtyl", DAmtyl);
+            other.Add("JAmtyl", JAmtyl);
+            other.Add("JfAmtyl", JfAmtyl);
+            other.Add("JCountyl", JCountyl);
+            other.Add("YAmtyl", YAmtyl);
+
             other.Add("TotalAmtfc1", TotalAmtfc1);
             other.Add("DAmtfc1", DAmtfc1);
             other.Add("JAmtfc1", JAmtfc1);
@@ -1677,6 +1724,13 @@ namespace MySystem.Areas.Admin.Controllers
             other.Add("JCountwd1", JCountwd1);
             other.Add("YAmtwd1", YAmtwd1);
 
+            other.Add("TotalAmtyl1", TotalAmtyl1);
+            other.Add("DAmtyl1", DAmtyl1);
+            other.Add("JAmtyl1", JAmtyl1);
+            other.Add("JfAmtyl1", JfAmtyl1);
+            other.Add("JCountyl1", JCountyl1);
+            other.Add("YAmtyl1", YAmtyl1);
+
             other.Add("PBCount", PBCount);
             other.Add("PACount", PACount);
             other.Add("TBCount", TBCount);
@@ -1735,6 +1789,14 @@ namespace MySystem.Areas.Admin.Controllers
             int JCountwd = 0;
             decimal YAmtwd = 0;
 
+            //盈利期
+            decimal TotalAmtyl = 0;
+            decimal DAmtyl = 0;
+            decimal JAmtyl = 0;
+            decimal JfAmtyl = 0;
+            int JCountyl = 0;
+            decimal YAmtyl = 0;
+
             int BCount = 0;
             int ACount = 0;
             int PBCount = 0;
@@ -1743,7 +1805,7 @@ namespace MySystem.Areas.Admin.Controllers
             int TACount = 0;
 
             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))from TradeDaySummary where SeoTitle = 'team'" + condition);
+            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);
             if (dt.Rows.Count > 0)
             {
                 TotalAmtfc = Convert.ToDecimal(function.CheckNum(dt.Rows[0][0].ToString()));
@@ -1752,12 +1814,20 @@ namespace MySystem.Areas.Admin.Controllers
                 JfAmtfc = Convert.ToDecimal(function.CheckNum(dt.Rows[0][3].ToString()));
                 JCountfc = Convert.ToInt32(function.CheckInt(dt.Rows[0][4].ToString()));
                 YAmtfc = Convert.ToDecimal(function.CheckNum(dt.Rows[0][5].ToString()));
+                
                 TotalAmtwd = Convert.ToDecimal(function.CheckNum(dt.Rows[0][6].ToString()));
                 DAmtwd = Convert.ToDecimal(function.CheckNum(dt.Rows[0][7].ToString()));
                 JAmtwd = Convert.ToDecimal(function.CheckNum(dt.Rows[0][8].ToString()));
                 JfAmtwd = Convert.ToDecimal(function.CheckNum(dt.Rows[0][9].ToString()));
                 JCountwd = Convert.ToInt32(function.CheckInt(dt.Rows[0][10].ToString()));
                 YAmtwd = Convert.ToDecimal(function.CheckNum(dt.Rows[0][11].ToString()));
+
+                TotalAmtyl = Convert.ToDecimal(function.CheckNum(dt.Rows[0][12].ToString()));
+                DAmtyl = Convert.ToDecimal(function.CheckNum(dt.Rows[0][13].ToString()));
+                JAmtyl = Convert.ToDecimal(function.CheckNum(dt.Rows[0][14].ToString()));
+                JfAmtyl = Convert.ToDecimal(function.CheckNum(dt.Rows[0][15].ToString()));
+                JCountyl = Convert.ToInt32(function.CheckInt(dt.Rows[0][16].ToString()));
+                YAmtyl = Convert.ToDecimal(function.CheckNum(dt.Rows[0][17].ToString()));
             }
             //统计激活数(个人、团队)
             dt = OtherMySqlConn.dtable("SELECT SUM(if(SeoTitle='team',ActiveBuddyMerStatus,0)) FROM UserTradeMonthSummary WHERE UserId= " + UserId + "" + cons);
@@ -1781,6 +1851,13 @@ namespace MySystem.Areas.Admin.Controllers
             obj.Add("JCountwd", JCountwd);
             obj.Add("YAmtwd", YAmtwd);
 
+            obj.Add("TotalAmtyl", TotalAmtyl);
+            obj.Add("DAmtyl", DAmtyl);
+            obj.Add("JAmtyl", JAmtyl);
+            obj.Add("JfAmtyl", JfAmtyl);
+            obj.Add("JCountyl", JCountyl);
+            obj.Add("YAmtyl", YAmtyl);
+
             obj.Add("BCount", BCount);
             obj.Add("ACount", ACount);
             obj.Add("PBCount", PBCount);

Areas/Admin/Controllers/OperateServer/SysAdminOperateController.cs

@@ -100,7 +100,7 @@ namespace MySystem.Areas.Admin.Controllers
                 dic["MakerName"] = sysAdmin.MakerName;
 
                 //登陆地址
-                dic["LoginUrl"] = OpHost + "/Admin/" + dbconn.Encrypt3DES(sysAdmin.Sort.ToString(), "kxs12345") + "/Login";
+                dic["LoginUrl"] = OpHost + "Admin/" + dbconn.Encrypt3DES(sysAdmin.Sort.ToString(), "kxs12345") + "/Login";
 
                 //未使用用额度
                 UserAccount userAccount = opdb.UserAccount.FirstOrDefault(m => m.Sort == Id) ?? new UserAccount();

Areas/Admin/Views/MainServer/TradeDaySummary/Index.cshtml

@@ -97,7 +97,8 @@
 
             <div class="layui-card-body">
                 <blockquote class="layui-elem-quote layui-text">
-                    扶持期直营商户交易总额(元)：<span style="color: #f00;" id="HelpDirectTradeAmt">0.00</span>　|　扶持期非直营商户交易总额(元)：<span style="color: #f00;" id="HelpNonDirectTradeAmt">0.00</span>　|　非扶持期直营商户交易总额(元)：<span style="color: #f00;" id="NotHelpDirectTradeAmt">0.00</span>　|　非扶持期非直营商户交易总额(元)：<span style="color: #f00;" id="NotHelpNonDirectTradeAmt">0.00</span>
+                    扶持期直营商户交易总额(元)：<span style="color: #f00;" id="HelpDirectTradeAmt">0.00</span>　|　扶持期非直营商户交易总额(元)：<span style="color: #f00;" id="ProfitDirectTradeAmt">0.00</span>　|　盈利期非直营商户交易总额(元)：<span style="color: #f00;" id="HelpNonDirectTradeAmt">0.00</span><br />
+                    非扶持期直营商户交易总额(元)：<span style="color: #f00;" id="NotHelpDirectTradeAmt">0.00</span>　|　非扶持期非直营商户交易总额(元)：<span style="color: #f00;" id="ProfitNonDirectTradeAmt">0.00</span>　|　盈利期期非直营商户交易总额(元)：<span style="color: #f00;" id="NotHelpNonDirectTradeAmt">0.00</span>
                 </blockquote>
                 <table id="LAY-list-manage" lay-filter="LAY-list-manage"></table>
                 <script type="text/html" id="table-list-tools">

Areas/Admin/Views/MainServer/UserTradeDaySummary/Index.cshtml

@@ -95,12 +95,16 @@
                 <blockquote class="layui-elem-quote layui-text">
                     扶持期直营贷记卡交易：<span style="color: #f00;" id="HelpDirectTradeAmt">0.00</span>　|　
                     稳定期直营贷记卡交易：<span style="color: #f00;" id="NotHelpDirectTradeAmt">0.00</span>　|　
+                    盈利期直营贷记卡交易<span style="color: #f00;" id="ProfitDirectCreditTradeAmt">0.00</span><br />
                     扶持期直营借记卡交易：<span style="color: #f00;" id="HelpDirectDebitTradeAmt">0.00</span>　|　
-                    稳定期直营借记卡交易：<span style="color: #f00;" id="NotHelpDirectDebitTradeAmt">0.00</span><br />
+                    稳定期直营借记卡交易：<span style="color: #f00;" id="NotHelpDirectDebitTradeAmt">0.00</span>　|　
+                    盈利期直营借记卡交易<span style="color: #f00;" id="ProfitDirectDebitTradeAmt">0.00</span><br />
                     扶持期非直营贷记卡交易：<span style="color: #f00;" id="HelpNonDirectTradeAmt">0.00</span>　|　
                     稳定期非直营贷记卡交易：<span style="color: #f00;" id="NotHelpNonDirectTradeAmt">0.00</span>　|　
+                    盈利期非直营贷记卡交易<span style="color: #f00;" id="ProfitNonDirectCreditTradeAmt">0.00</span><br />
                     扶持期非直营借记卡交易：<span style="color: #f00;" id="HelpNonDirectDebitTradeAmt">0.00</span>　|　
-                    稳定期非直营借记卡交易：<span style="color: #f00;" id="NotHelpNonDirectDebitTradeAmt">0.00</span>
+                    稳定期非直营借记卡交易：<span style="color: #f00;" id="NotHelpNonDirectDebitTradeAmt">0.00</span>　|　
+                    盈利期非直营借记卡交易<span style="color: #f00;" id="ProfitNonDirectDebitTradeAmt">0.00</span>
                 </blockquote>
                 <table id="LAY-list-manage" lay-filter="LAY-list-manage"></table>
                 <script type="text/html" id="table-list-tools">

Areas/Admin/Views/MainServer/Users/Children.cshtml

@@ -97,6 +97,8 @@
                     </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>
                     </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>
+                    </br>
                     个人机具绑定总数：<span style="color: #f00;" id="PBCount">0</span>　| 个人机具激活总数：<span style="color: #f00;" id="PACount">0</span>　
                     </br>
                     团队交易额：
@@ -105,6 +107,8 @@
                     </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>
                     </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>
+                    </br>
                     团队机具绑定总数：<span style="color: #f00;" id="TBCount">0</span>　| 团队机具激活总数：<span style="color: #f00;" id="TACount">0</span>　
                 
                 </blockquote>

wwwroot/layuiadmin/modules_main/StoreHouse_Admin.js

@@ -315,7 +315,7 @@ layui.config({
 
         },
         page: true,
-        limit: 30,
+        limit: 500,
         height: 'full-' + String($('.layui-card-header').height() + 130),
         text: '对不起，加载出现异常！',
         done: function (res, curr, count) {
@@ -889,6 +889,7 @@ layui.config({
                                         clickflag = 0;
                                         layer.close(index);
                                         if (data == "success") {
+                                            layer.close(loadindex);
                                             layer.msg('关联成功', {
                                                 time: 1000
                                             }, function () {
@@ -970,6 +971,7 @@ layui.config({
                                         clickflag = 0;
                                         layer.close(index);
                                         if (data == "success") {
+                                            layer.close(loadindex);
                                             layer.msg('取消成功', {
                                                 time: 1000
                                             }, function () {

wwwroot/layuiadmin/modules_main/TradeDaySummary_Admin.js

@@ -119,6 +119,7 @@ layui.config({
             ,{field:'NotHelpNonDirectQrDebitTradeAmt', width: 320, title:'非直营云闪付非封顶借记卡(非扶持期)(元)', sort: true}
             ,{field:'NotHelpDirectNonQrDebitTradeAmt', width: 320, title:'直营非云闪付非封顶借记卡(非扶持期)(元)', sort: true}
             ,{field:'NotHelpNonDirectNonQrDebitTradeAmt', width: 320, title:'非直营非云闪付非封顶借记卡(非扶持期)(元)', sort: true}
+
             ,{field:'HelpDirectTradeAmt', width: 320, title:'直营商户交易总额(扶持期)(元)', sort: true}
             ,{field:'HelpNonDirectTradeAmt', width: 320, title:'非直营商户交易总额(扶持期)(元)', sort: true}
             ,{field:'HelpDirectCreditTradeAmt', width: 320, title:'直营贷记卡交易总额(扶持期)(元)', sort: true}
@@ -137,6 +138,25 @@ layui.config({
             ,{field:'HelpNonDirectQrDebitTradeAmt', width: 320, title:'非直营云闪付非封顶借记卡(扶持期)(元)', sort: true}
             ,{field:'HelpDirectNonQrDebitTradeAmt', width: 320, title:'直营非云闪付非封顶借记卡(扶持期)(元)', sort: true}
             ,{field:'HelpNonDirectNonQrDebitTradeAmt', width: 320, title:'非直营非云闪付非封顶借记卡(扶持期)(元)', sort: true}
+
+            ,{field:'ProfitDirectTradeAmt', width: 320, title:'直营商户交易总额(非扶持期)(元)', sort: true}
+            ,{field:'ProfitNonDirectTradeAmt', width: 320, title:'非直营商户交易总额(非扶持期)(元)', sort: true}
+            ,{field:'ProfitDirectCreditTradeAmt', width: 320, title:'直营贷记卡交易总额(非扶持期)(元)', sort: true}
+            ,{field:'ProfitNonDirectCreditTradeAmt', width: 320, title:'非直营贷记卡交易总额(非扶持期)(元)', sort: true}
+            ,{field:'ProfitDirectQrCreditTradeAmt', width: 320, title:'直营云闪付贷记卡交易额(非扶持期)(元)', sort: true}
+            ,{field:'ProfitNonDirectQrCreditTradeAmt', width: 320, title:'非直营云闪付贷记卡交易额(非扶持期)(元)', sort: true}
+            ,{field:'ProfitDirectNonQrCreditTradeAmt', width: 320, title:'直营非云闪付贷记卡交易额(非扶持期)(元)', sort: true}
+            ,{field:'ProfitNonDirectNonQrCreditTradeAmt', width: 320, title:'非直营非云闪付贷记卡交易额(非扶持期)(元)', sort: true}
+            ,{field:'ProfitDirectDebitTradeAmt', width: 320, title:'直营商户借记卡交易总额(非扶持期)(元)', sort: true}
+            ,{field:'ProfitDirectDebitCapTradeAmt', width: 320, title:'直营商户借记卡封顶交易总金额(非扶持期)(元)', sort: true}
+            ,{field:'ProfitDirectDebitCapNum', width: 320, title:'直营商户借记卡封顶交易总数(非扶持期)', sort: true}
+            ,{field:'ProfitNonDirectDebitTradeAmt', width: 320, title:'非直营商户借记卡交易总额(非扶持期)(元)', sort: true}
+            ,{field:'ProfitNonDirectDebitCapTradeAmt', width: 320, title:'非直营商户借记卡封顶交易总金额(非扶持期)(元)', sort: true}
+            ,{field:'ProfitNonDirectDebitCapNum', width: 320, title:'非直营商户借记卡封顶交易总数(非扶持期)', sort: true}
+            ,{field:'ProfitDirectQrDebitTradeAmt', width: 320, title:'直营云闪付非封顶借记卡(非扶持期)(元)', sort: true}
+            ,{field:'ProfitNonDirectQrDebitTradeAmt', width: 320, title:'非直营云闪付非封顶借记卡(非扶持期)(元)', sort: true}
+            ,{field:'ProfitDirectNonQrDebitTradeAmt', width: 320, title:'直营非云闪付非封顶借记卡(非扶持期)(元)', sort: true}
+            ,{field:'ProfitNonDirectNonQrDebitTradeAmt', width: 320, title:'非直营非云闪付非封顶借记卡(非扶持期)(元)', sort: true}
         ]]
         , where: {
             BrandId: BrandId
@@ -148,8 +168,10 @@ layui.config({
         , done: function (res, curr, count) {
             $("#HelpDirectTradeAmt").text(res.other.HelpDirectTradeAmt);
             $("#HelpNonDirectTradeAmt").text(res.other.HelpNonDirectTradeAmt);
+            $("#ProfitDirectTradeAmt").text(res.other.ProfitDirectTradeAmt);
             $("#NotHelpDirectTradeAmt").text(res.other.NotHelpDirectTradeAmt);
             $("#NotHelpNonDirectTradeAmt").text(res.other.NotHelpNonDirectTradeAmt);
+            $("#ProfitNonDirectTradeAmt").text(res.other.ProfitNonDirectTradeAmt);
             $(".layui-none").text("无数据");
         }
     });

wwwroot/layuiadmin/modules_main/UserTradeDaySummary_Admin.js

@@ -88,7 +88,6 @@ layui.config({
             });
         }
     });
-    
     //列表数据
     table.render({
         elem: '#LAY-list-manage'
@@ -102,12 +101,16 @@ layui.config({
             ,{field:'BrandId', width: 200, title:'产品名称', sort: true}
             ,{field:'HelpDirectTradeAmt', width: 300, title:'扶持期直营贷记卡交易', sort: true}
             ,{field:'NotHelpDirectTradeAmt', width: 300, title:'稳定期直营贷记卡交易', sort: true}
+            ,{field:'ProfitDirectCreditTradeAmt', width: 300, title:'盈利期直营贷记卡交易', sort: true}
             ,{field:'HelpDirectDebitTradeAmt', width: 300, title:'扶持期直营借记卡交易', sort: true}
             ,{field:'NotHelpDirectDebitTradeAmt', width: 300, title:'稳定期直营借记卡交易', sort: true}
+            ,{field:'ProfitDirectDebitTradeAmt', width: 300, title:'盈利期直营借记卡交易', sort: true}
             ,{field:'HelpNonDirectTradeAmt', width: 300, title:'扶持期非直营贷记卡交易', sort: true}
             ,{field:'NotHelpNonDirectTradeAmt', width: 300, title:'稳定期非直营贷记卡交易', sort: true}
+            ,{field:'ProfitNonDirectCreditTradeAmt', width: 300, title:'盈利期非直营贷记卡交易', sort: true}
             ,{field:'HelpNonDirectDebitTradeAmt', width: 300, title:'扶持期非直营借记卡交易', sort: true}
             ,{field:'NotHelpNonDirectDebitTradeAmt', width: 300, title:'稳定期非直营借记卡交易', sort: true}
+            ,{field:'ProfitNonDirectDebitTradeAmt', width: 300, title:'盈利期非直营借记卡交易', sort: true}
         ]]
         , where: {
             
@@ -119,12 +122,16 @@ layui.config({
         , done: function (res, curr, count) {
             $("#HelpDirectTradeAmt").text(res.other.HelpDirectTradeAmt);
             $("#NotHelpDirectTradeAmt").text(res.other.NotHelpDirectTradeAmt);
+            $("#ProfitDirectCreditTradeAmt").text(res.other.ProfitDirectCreditTradeAmt);
             $("#HelpDirectDebitTradeAmt").text(res.other.HelpDirectDebitTradeAmt);
             $("#NotHelpDirectDebitTradeAmt").text(res.other.NotHelpDirectDebitTradeAmt);
+            $("#ProfitDirectDebitTradeAmt").text(res.other.ProfitDirectDebitTradeAmt);
             $("#HelpNonDirectTradeAmt").text(res.other.HelpNonDirectTradeAmt);
             $("#NotHelpNonDirectTradeAmt").text(res.other.NotHelpNonDirectTradeAmt);
+            $("#ProfitNonDirectCreditTradeAmt").text(res.other.ProfitNonDirectCreditTradeAmt);
             $("#HelpNonDirectDebitTradeAmt").text(res.other.HelpNonDirectDebitTradeAmt);
             $("#NotHelpNonDirectDebitTradeAmt").text(res.other.NotHelpNonDirectDebitTradeAmt);
+            $("#ProfitNonDirectDebitTradeAmt").text(res.other.ProfitNonDirectDebitTradeAmt);
             $(".layui-none").text("无数据");
         }
     });

wwwroot/layuiadmin/modules_main/UsersChildren_Admin.js

@@ -114,6 +114,13 @@ layui.config({
             , { field: 'JCountwd', 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: 'TBCount', width: 200, title: '团队机具绑定总数', sort: true }
             , { field: 'TACount', width: 200, title: '团队机具激活总数', sort: true }
 
@@ -143,6 +150,13 @@ layui.config({
             $("#JCountwd").text(res.other.JCountwd);
             $("#YAmtwd").text(res.other.YAmtwd);
 
+            $("#TotalAmtyl").text(res.other.TotalAmtyl);
+            $("#DAmtyl").text(res.other.DAmtyl);
+            $("#JAmtyl").text(res.other.JAmtyl);
+            $("#JfAmtyl").text(res.other.JfAmtyl);
+            $("#JCountyl").text(res.other.JCountyl);
+            $("#YAmtyl").text(res.other.YAmtyl);
+
             $("#TotalAmtfc1").text(res.other.TotalAmtfc1);
             $("#DAmtfc1").text(res.other.DAmtfc1);
             $("#JAmtfc1").text(res.other.JAmtfc1);
@@ -157,6 +171,13 @@ layui.config({
             $("#JCountwd1").text(res.other.JCountwd1);
             $("#YAmtwd1").text(res.other.YAmtwd1);
 
+            $("#TotalAmtyl1").text(res.other.TotalAmtyl1);
+            $("#DAmtyl1").text(res.other.DAmtyl1);
+            $("#JAmtyl1").text(res.other.JAmtyl1);
+            $("#JfAmtyl1").text(res.other.JfAmtyl1);
+            $("#JCountyl1").text(res.other.JCountyl1);
+            $("#YAmtyl1").text(res.other.YAmtyl1);
+
             $("#BCount").text(res.other.BCount);
             $("#ACount").text(res.other.ACount);
             $("#PBCount").text(res.other.PBCount);