Merge branch 'feature-dgy-后台新功能批量处理' into DuGuYang

Areas/Admin/Controllers/MainServer/UsersController.cs

@@ -2564,6 +2564,7 @@ namespace MySystem.Areas.Admin.Controllers
                                 }
                             }
                             var user = db.Users.FirstOrDefault(m => m.Id == pos.BuyUserId) ?? new Users();
+                            var userAccount = db.UserAccount.FirstOrDefault(m => m.Id == user.Id) ?? new UserAccount();
                             if (!string.IsNullOrEmpty(user.ParentNav))
                             {
                                 string[] ParentNavList = user.ParentNav.Trim(',').Replace(",,", ",").Split(',');
@@ -2593,13 +2594,19 @@ namespace MySystem.Areas.Admin.Controllers
                                 ThirdMakerCode = thirdUserInfo.MakerCode; //次次顶级创客编号
                                 ThirdRealName = thirdUserInfo.RealName; //次次顶级创客姓名
                             }
+                            data["BrandName"] = db.KqProducts.FirstOrDefault(m => m.Id == pos.BrandId).Name; //机具类型
+                            data["BindingTime"] = pos.BindingTime == null ? "" : pos.BindingTime.Value.ToString("yyyy-MM-dd HH:mm:ss"); //绑定时间
+                            data["ActivationTime"] = pos.ActivationTime == null ? "" : pos.ActivationTime.Value.ToString("yyyy-MM-dd HH:mm:ss"); //激活时间
+                            data["MerchantName"] = mer.MerchantName; //商户姓名
+                            // data["MerchantName"] = mer.MerchantName + " " + mer.MerRealName; //商户姓名/真实姓名
                             data["PosSn"] = pos.PosSn; //机具Sn
                             data["MerNo"] = mer.KqMerNo; //商户编号
                             data["PosFee"] = SeoKeyword; //服务费
-                            data["BindingTime"] = pos.BindingTime == null ? "" : pos.BindingTime.Value.ToString("yyyy-MM-dd HH:mm:ss"); //绑定时间
-                            data["ActivationTime"] = pos.ActivationTime == null ? "" : pos.ActivationTime.Value.ToString("yyyy-MM-dd HH:mm:ss"); //激活时间
-                            data["MakerCode"] = user.MakerCode; //创客编号
-                            data["RealName"] = user.RealName; //创客姓名
+                            data["userInfo"] = user.Id > 0 ? user.MakerCode + "_" + user.RealName : ""; //创客信息
+                            // data["MakerCode"] = user.MakerCode; //创客编号
+                            // data["RealName"] = user.RealName; //创客姓名
+                            data["Mobile"] = user.Mobile; //创客手机号
+                            data["Balance"] = userAccount.BalanceAmount; //创客账户余额
                             data["TopMakerCode"] = TopMakerCode; //顶级创客编号
                             data["TopRealName"] = TopRealName; //顶级创客名称
                             data["SecondMakerCode"] = SecondMakerCode; //次顶级创客编号
@@ -2642,6 +2649,7 @@ namespace MySystem.Areas.Admin.Controllers
                                 }
                             }
                             var user = db.Users.FirstOrDefault(m => m.Id == pos.BuyUserId) ?? new Users();
+                            var userAccount = db.UserAccount.FirstOrDefault(m => m.Id == user.Id) ?? new UserAccount();
                             if (!string.IsNullOrEmpty(user.ParentNav))
                             {
                                 string[] ParentNavList = user.ParentNav.Trim(',').Replace(",,", ",").Split(',');
@@ -2671,13 +2679,19 @@ namespace MySystem.Areas.Admin.Controllers
                                 ThirdMakerCode = thirdUserInfo.MakerCode; //次次顶级创客编号
                                 ThirdRealName = thirdUserInfo.RealName; //次次顶级创客姓名
                             }
+                            data["BrandName"] = db.KqProducts.FirstOrDefault(m => m.Id == pos.BrandId).Name; //机具类型
+                            data["BindingTime"] = pos.BindingTime == null ? "" : pos.BindingTime.Value.ToString("yyyy-MM-dd HH:mm:ss"); //绑定时间
+                            data["ActivationTime"] = pos.ActivationTime == null ? "" : pos.ActivationTime.Value.ToString("yyyy-MM-dd HH:mm:ss"); //激活时间
+                            data["MerchantName"] = mer.MerchantName; //商户姓名
+                            // data["MerchantName"] = mer.MerchantName + " " + mer.MerRealName; //商户姓名/真实姓名
                             data["PosSn"] = pos.PosSn; //机具Sn
                             data["MerNo"] = mer.KqMerNo; //商户编号
                             data["PosFee"] = SeoKeyword; //服务费
-                            data["BindingTime"] = pos.BindingTime == null ? "" : pos.BindingTime.Value.ToString("yyyy-MM-dd HH:mm:ss"); //绑定时间
-                            data["ActivationTime"] = pos.ActivationTime == null ? "" : pos.ActivationTime.Value.ToString("yyyy-MM-dd HH:mm:ss"); //激活时间
-                            data["MakerCode"] = user.MakerCode; //创客编号
-                            data["RealName"] = user.RealName; //创客姓名
+                            data["userInfo"] = user.Id > 0 ? user.MakerCode + "_" + user.RealName : ""; //创客信息
+                            // data["MakerCode"] = user.MakerCode; //创客编号
+                            // data["RealName"] = user.RealName; //创客姓名
+                            data["Mobile"] = user.Mobile; //创客手机号
+                            data["Balance"] = userAccount.BalanceAmount; //创客账户余额
                             data["TopMakerCode"] = TopMakerCode; //顶级创客编号
                             data["TopRealName"] = TopRealName; //顶级创客名称
                             data["SecondMakerCode"] = SecondMakerCode; //次顶级创客编号
@@ -2733,7 +2747,7 @@ namespace MySystem.Areas.Admin.Controllers
                         posIds += pos.Id + ",";
                     }
                     posIds = posIds.TrimEnd(',');
-                    sql = "SELECT i.PosSn '机具SN',j.KqMerNo '商编',j.MerchantName '商户名称',(CASE WHEN i.posfee IS NULL THEN 0 ELSE i.posfee END) '服务费',DATE_FORMAT(i.BindingTime,'%Y-%m-%d %H:%i:%s') '绑定时间',DATE_FORMAT(i.ActivationTime,'%Y-%m-%d %H:%i:%s') '激活时间',i.uMakerCode '推荐码',i.uRealName '创客姓名',i.topMakerCode '顶级推荐码',i.topRealname '顶级姓名',i.secondMakerCode '次顶级推荐码',i.secondRealname '次顶级姓名',i.thirdMakerCode '次次顶级推荐码',i.thirdRealname '次次顶级姓名'  FROM(SELECT g.*,h.MakerCode thirdMakerCode,h.Realname thirdRealname FROM (SELECT e.*,f.MakerCode secondMakerCode,f.Realname secondRealname FROM(SELECT c.*,d.MakerCode topMakerCode,d.Realname topRealname FROM(SELECT a.*,(CASE WHEN a.BrandId not in(2,7,10,11) THEN ROUND(CAST(a.SeoKeyword AS DECIMAL)/100, 2) ELSE a.SeoKeyword end) posfee,b.Id useId,b.MakerCode uMakerCode,b.RealName uRealName, SUBSTRING_INDEX(SUBSTRING_INDEX(b.ParentNav,',',4),',',-1) topId,SUBSTRING_INDEX(SUBSTRING_INDEX(b.ParentNav,',',6),',',-1) secondId,SUBSTRING_INDEX(SUBSTRING_INDEX(b.ParentNav,',',8),',',-1) thirdId FROM PosMachinesTwo a LEFT JOIN Users b ON a.BuyUserId=b.Id WHERE a.Id in(" + posIds + "))c LEFT JOIN Users d ON c.topId=d.Id) e LEFT JOIN Users f ON e.secondId=f.Id) g LEFT JOIN Users h ON g.thirdId=h.Id) i LEFT JOIN PosMerchantInfo j ON i.BindMerchantId=j.Id";
+                    sql = "SELECT i.BrandName '机具类型',i.PosSn '机具SN',j.KqMerNo '商编',j.MerchantName '商户名称',(CASE WHEN i.posfee IS NULL THEN 0 ELSE i.posfee END) '服务费',DATE_FORMAT(i.BindingTime,'%Y-%m-%d %H:%i:%s') '绑定时间',DATE_FORMAT(i.ActivationTime,'%Y-%m-%d %H:%i:%s') '激活时间',i.userInfo '创客信息',i.Mobile '创客手机号',i.BalanceAmount '创客账户余额',i.topMakerCode '顶级创客编号',i.topRealname '顶级姓名',i.secondMakerCode '次顶级创客编号',i.secondRealname '次顶级姓名',i.thirdMakerCode '次次顶级创客编号',i.thirdRealname '次次顶级姓名'  FROM(SELECT g.*,h.MakerCode thirdMakerCode,h.Realname thirdRealname FROM (SELECT e.*,f.MakerCode secondMakerCode,f.Realname secondRealname FROM(SELECT c.*,d.MakerCode topMakerCode,d.Realname topRealname FROM(SELECT a.*,c1.NAME BrandName,(CASE WHEN a.BrandId not in(2,7,10,11) THEN ROUND(CAST(a.SeoKeyword AS DECIMAL)/100, 2) ELSE a.SeoKeyword end) posfee,b.Id useId,CONCAT(b.MakerCode,'_',b.RealName) userInfo,b.Mobile,c2.BalanceAmount,b.RealName uRealName, SUBSTRING_INDEX(SUBSTRING_INDEX(b.ParentNav,',',4),',',-1) topId,SUBSTRING_INDEX(SUBSTRING_INDEX(b.ParentNav,',',6),',',-1) secondId,SUBSTRING_INDEX(SUBSTRING_INDEX(b.ParentNav,',',8),',',-1) thirdId FROM PosMachinesTwo a LEFT JOIN Users b ON a.BuyUserId=b.Id LEFT JOIN UserAccount c2 ON a.BuyUserId=c2.Id LEFT JOIN KqProducts c1 ON a.BrandId=c1.Id WHERE a.Id in(" + posIds + "))c LEFT JOIN Users d ON c.topId=d.Id) e LEFT JOIN Users f ON e.secondId=f.Id) g LEFT JOIN Users h ON g.thirdId=h.Id) i LEFT JOIN PosMerchantInfo j ON i.BindMerchantId=j.Id";
                 }
                 if (!string.IsNullOrEmpty(MerNos))
                 {
@@ -2745,7 +2759,7 @@ namespace MySystem.Areas.Admin.Controllers
                         merIds += mer.Id + ",";
                     }
                     merIds = merIds.TrimEnd(',');
-                    sql = "SELECT i.KqSnNo '机具SN',i.KqMerNo '商编',i.MerchantName '商户名称',(CASE WHEN i.SeoKeyword IS NULL THEN 0 ELSE i.SeoKeyword END) '服务费',i.BindingTime '绑定时间',i.ActivationTime '激活时间',i.uMakerCode '推荐码',i.uRealName '创客姓名',i.topMakerCode '顶级推荐码',i.topRealname '顶级姓名',i.secondMakerCode '次顶级推荐码',i.secondRealname '次顶级姓名',j.MakerCode '次次顶级推荐码',j.Realname '次次顶级姓名' FROM(SELECT g.*,h.MakerCode secondMakerCode,h.Realname secondRealname FROM(SELECT e.*,f.MakerCode topMakerCode,f.RealName topRealName FROM(SELECT c.*,d.MakerCode uMakerCode,d.RealName uRealName,SUBSTRING_INDEX(SUBSTRING_INDEX(d.ParentNav,',',4),',',-1) topId,SUBSTRING_INDEX(SUBSTRING_INDEX(d.ParentNav,',',6),',',-1) secondId,SUBSTRING_INDEX(SUBSTRING_INDEX(d.ParentNav,',',8),',',-1) thirdId FROM(SELECT a.KqMerNo,a.KqSnNo,a.MerchantName,(CASE WHEN b.BrandId not in(2,7,10,11) THEN ROUND(CAST(b.SeoKeyword AS DECIMAL)/100, 2) ELSE b.SeoKeyword end) SeoKeyword,b.BindingTime,b.ActivationTime,b.BuyUserId,b.BrandId FROM PosMerchantInfo a LEFT JOIN PosMachinesTwo b ON a.KqSnNo=b.PosSn WHERE a.Id in(" + merIds + "))c LEFT JOIN Users d ON c.BuyUserId=d.Id) e LEFT JOIN Users f ON e.topId=f.Id) g LEFT JOIN Users h ON g.secondId=h.Id) i LEFT JOIN Users j ON i.thirdId=j.Id";
+                    sql = "SELECT i.BrandName '机具类型',i.KqSnNo '机具SN',i.KqMerNo '商编',i.MerchantName '商户名称',(CASE WHEN i.SeoKeyword IS NULL THEN 0 ELSE i.SeoKeyword END) '服务费',DATE_FORMAT(i.BindingTime,'%Y-%m-%d %H:%i:%s') '绑定时间',DATE_FORMAT(i.ActivationTime,'%Y-%m-%d %H:%i:%s') '激活时间',i.userInfo '创客信息',i.Mobile '创客手机号',i.BalanceAmount '创客账户余额',i.topMakerCode '顶级创客编号',i.topRealname '顶级姓名',i.secondMakerCode '次顶级创客编号',i.secondRealname '次顶级姓名',j.MakerCode '次次顶级创客编号',j.Realname '次次顶级姓名' FROM(SELECT g.*,h.MakerCode secondMakerCode,h.Realname secondRealname FROM(SELECT e.*,f.MakerCode topMakerCode,f.RealName topRealName FROM(SELECT c.*,CONCAT(d.MakerCode,'_',d.RealName) userInfo,d.Mobile,SUBSTRING_INDEX(SUBSTRING_INDEX(d.ParentNav,',',4),',',-1) topId,SUBSTRING_INDEX(SUBSTRING_INDEX(d.ParentNav,',',6),',',-1) secondId,SUBSTRING_INDEX(SUBSTRING_INDEX(d.ParentNav,',',8),',',-1) thirdId FROM(SELECT a.KqMerNo,a.KqSnNo,a.MerchantName,(CASE WHEN b.BrandId not in(2,7,10,11) THEN ROUND(CAST(b.SeoKeyword AS DECIMAL)/100, 2) ELSE b.SeoKeyword end) SeoKeyword,b.BindingTime,b.ActivationTime,b.BuyUserId,c1.Name BrandName,c2.BalanceAmount FROM PosMerchantInfo a  LEFT JOIN PosMachinesTwo b ON a.KqSnNo=b.PosSn LEFT JOIN UserAccount c2 ON b.BuyUserId=c2.Id LEFT JOIN KqProducts c1 ON b.BrandId=c1.Id WHERE a.Id in(" + merIds + "))c LEFT JOIN Users d ON c.BuyUserId=d.Id) e LEFT JOIN Users f ON e.topId=f.Id) g LEFT JOIN Users h ON g.secondId=h.Id) i LEFT JOIN Users j ON i.thirdId=j.Id";
                 }
             }
             var sysAdmin = bsdb.SysAdmin.FirstOrDefault(m => m.AdminName == SysUserName && m.Status > -1);

wwwroot/layuiadmin/modules_main/BatchSeeUserInfo_Admin.js

@@ -58,13 +58,18 @@ layui.config({
         , url: '/Admin/Users/BatchSeeUserInfoDo' //模拟接口
         , cols: [[
             { type: 'checkbox', fixed: 'left' }
+            , { field: 'BrandName', width: 150, title: '机具类型', sort: true }
+            , { field: 'BindingTime', width: 150, title: '绑定时间', sort: true }
+            , { field: 'ActivationTime', width: 150, title: '激活时间', sort: true }
+            , { field: 'MerchantName', width: 150, title: '商户姓名', sort: true }
             , { field: 'PosSn', width: 150, title: '机具Sn', sort: true }
             , { field: 'MerNo', width: 150, title: '商户编号', sort: true }
+            , { field: 'userInfo', width: 150, title: '创客信息', sort: true }
+            // , { field: 'MakerCode', width: 105, title: '创客编号', sort: true }
+            // , { field: 'RealName', width: 105, title: '创客姓名', sort: true }
+            , { field: 'Mobile', width: 150, title: '创客手机号', sort: true }
+            , { field: 'Balance', width: 150, title: '创客账户余额', sort: true }
             , { field: 'PosFee', width: 150, title: '服务费', sort: true }
-            , { field: 'BindingTime', width: 150, title: '绑定时间', sort: true }
-            , { field: 'ActivationTime', width: 150, title: '激活时间', sort: true }
-            , { field: 'MakerCode', width: 105, title: '创客编号', sort: true }
-            , { field: 'RealName', width: 105, title: '创客姓名', sort: true }
             , { field: 'TopMakerCode', width: 160, title: '顶级创客编号', sort: true }
             , { field: 'TopRealName', width: 160, title: '顶级创客名称', sort: true }
             , { field: 'SecondMakerCode', width: 160, title: '次顶级创客编号', sort: true }