添加盈利期交易额

修复仓库信息伞下创客筛选项

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(',') + ")";
 
                 }

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/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">

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);