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

Areas/Admin/Controllers/MainServer/SysToolsController.cs

@@ -4210,8 +4210,12 @@ namespace MySystem.Areas.Admin.Controllers
             return View();
         }
 
-        public string TransferPosCouponDo(string PosCouponCodes, string FromMakerCode, string ToMakerCode, string LeaderMakerCode = "")
+        public string TransferPosCouponDo(string Kind, string PosCouponCodes, string FromMakerCode, string ToMakerCode, string LeaderMakerCode = "")
         {
+            if (string.IsNullOrEmpty(PosCouponCodes))
+            {
+                return "请输入机具券码";
+            }
             if (string.IsNullOrEmpty(PosCouponCodes))
             {
                 return "请输入机具券码";
@@ -4285,9 +4289,9 @@ namespace MySystem.Areas.Admin.Controllers
             int CouponCount = PosCouponList.Length;
             PosCouponOrders stat = db.PosCouponOrders.Add(new PosCouponOrders()
             {
-                QueryCount = 3,
+                QueryCount = 2,
                 CreateDate = DateTime.Now,
-                ChangeKind = 1,//类型(0购买，1划拨，2使⽤，3申请机具循环驳回)
+                ChangeKind = 2,
                 ChangeCount = CouponCount,
                 // AfterOut = AfterOut,
                 // AfterTotal = AfterTotal,
@@ -4299,6 +4303,22 @@ namespace MySystem.Areas.Admin.Controllers
                 ToUserId = tUserId.Id,
                 FromUserId = fUserId.Id,
             }).Entity;
+            PosCouponOrders tostat = db.PosCouponOrders.Add(new PosCouponOrders()
+            {
+                QueryCount = 1,
+                CreateDate = DateTime.Now,
+                ChangeKind = 1,
+                ChangeCount = CouponCount,
+                // AfterOut = AfterOut,
+                // AfterTotal = AfterTotal,
+                // AfterStock = AfterStock,
+                // BeforeOut = BeforeOut,
+                // BeforeTotal = BeforeTotal,
+                // BeforeStock = BeforeStock,
+                OrderNo = ChangeRecordNo,
+                FromUserId = tUserId.Id,
+                ToUserId = fUserId.Id,
+            }).Entity;
             db.SaveChanges();
             db.Dispose();
 
@@ -4898,21 +4918,28 @@ namespace MySystem.Areas.Admin.Controllers
             }
             if (!string.IsNullOrEmpty(PosFeeSelect))
             {
-                condition += " and tb.SeoKeyword=" + PosFeeSelect;
+                if (PosFeeSelect == "0")
+                {
+                    condition += " and tb.SeoKeyword is null";
+                }
+                else
+                {
+                    condition += " and tb.SeoKeyword=" + PosFeeSelect;
+                }
             }
             if (!string.IsNullOrEmpty(BrandId))
             {
                 condition += " and tb.BrandId=" + BrandId;
             }
 
-            DataTable dt = CustomerSqlConn.dtable("select wname,k.`Name`,PosSnType,PosSn,tb.SeoKeyword,TransferTime,BindingTime,ActivationTime,PrizeParams from (select (select Name from BusinessPartner where Id=(select PartnerId from BusinessPartnerPos where PosId=pos.Id and `Status`>-1 limit 1)) wname,BrandId,PosSnType,PosSn,(CASE WHEN BrandId not in(2,7,10,11) THEN ROUND(CAST(SeoKeyword AS DECIMAL)/100, 2) ELSE SeoKeyword end) SeoKeyword,TransferTime,BindingTime,ActivationTime,PrizeParams from PosMachinesTwo pos where BindingState=1 and `Status`>=-1 and BuyUserId=" + UserId + "  and Id in (select PosId from BusinessPartnerPos)) tb left join KqProducts k on tb.BrandId=k.Id" + condition, conn);
+            DataTable dt = CustomerSqlConn.dtable("select wname,k.`Name`,PosSnType,PosSn,(CASE WHEN tb.SeoKeyword IS NULL AND tb.PrizeParams=0 THEN 0 ELSE tb.SeoKeyword END) SeoKeyword,TransferTime,BindingTime,ActivationTime,PrizeParams from (select (select Name from BusinessPartner where Id=(select PartnerId from BusinessPartnerPos where PosId=pos.Id and `Status`>-1 limit 1)) wname,BrandId,PosSnType,PosSn,(CASE WHEN BrandId not in(2,7,10,11) THEN ROUND(CAST(SeoKeyword AS DECIMAL)/100, 2) ELSE SeoKeyword end) SeoKeyword,TransferTime,BindingTime,ActivationTime,PrizeParams from PosMachinesTwo pos where BindingState=1 and `Status`>=-1 and BuyUserId=" + UserId + "  and Id in (select PosId from BusinessPartnerPos)) tb left join KqProducts k on tb.BrandId=k.Id" + condition, conn);
             foreach (DataRow item in dt.Rows)
             {
                 Dictionary<string, object> curData = new Dictionary<string, object>();
                 curData.Add("wname", item["wname"].ToString()); //伙伴名称
                 curData.Add("Name", item["Name"].ToString()); //机具品牌
                 curData.Add("PosSn", item["PosSn"].ToString()); //机具Sn
-                curData.Add("SeoKeyword", item["SeoKeyword"].ToString()); //押金
+                curData.Add("SeoKeyword", item["SeoKeyword"].ToString()); //服务费
                 curData.Add("BindingTime", string.IsNullOrEmpty(item["BindingTime"].ToString()) ? "" : Convert.ToDateTime(item["BindingTime"]).ToString("yyyy-MM-dd HH:mm:ss")); //绑定时间
                 curData.Add("ActivationTime", string.IsNullOrEmpty(item["ActivationTime"].ToString()) ? "" : Convert.ToDateTime(item["ActivationTime"]).ToString("yyyy-MM-dd HH:mm:ss")); //激活时间
                 dataList.Add(curData);
@@ -4969,13 +4996,20 @@ namespace MySystem.Areas.Admin.Controllers
             }
             if (!string.IsNullOrEmpty(PosFeeSelect))
             {
-                condition += " and tb.SeoKeyword=" + PosFeeSelect;
+                if (PosFeeSelect == "0")
+                {
+                    condition += " and tb.SeoKeyword is null";
+                }
+                else
+                {
+                    condition += " and tb.SeoKeyword=" + PosFeeSelect;
+                }
             }
             if (!string.IsNullOrEmpty(BrandId))
             {
                 condition += " and tb.BrandId=" + BrandId;
             }
-            var Sql = "select wname '伙伴名称',k.`Name` '机具品牌',PosSn '机具Sn',tb.SeoKeyword '押金',DATE_FORMAT(BindingTime,'%Y-%m-%d %H:%i:%s') '绑定时间',DATE_FORMAT(ActivationTime,'%Y-%m-%d %H:%i:%s') '激活时间' from (select (select Name from BusinessPartner where Id=(select PartnerId from BusinessPartnerPos where PosId=pos.Id and `Status`>-1 limit 1)) wname,BrandId,PosSnType,PosSn,(CASE WHEN BrandId not in(2,7,10,11) THEN ROUND(CAST(SeoKeyword AS DECIMAL)/100, 2) ELSE SeoKeyword end) SeoKeyword,TransferTime,BindingTime,ActivationTime,PrizeParams from PosMachinesTwo pos where BindingState=1 and `Status`>=-1 and BuyUserId=" + UserId + "  and Id in (select PosId from BusinessPartnerPos)) tb left join KqProducts k on tb.BrandId=k.Id" + condition;
+            var Sql = "select wname '伙伴名称',k.`Name` '机具品牌',PosSn '机具Sn',(CASE WHEN tb.SeoKeyword IS NULL AND tb.PrizeParams=0 THEN 0 ELSE tb.SeoKeyword END) '服务费',DATE_FORMAT(BindingTime,'%Y-%m-%d %H:%i:%s') '绑定时间',DATE_FORMAT(ActivationTime,'%Y-%m-%d %H:%i:%s') '激活时间' from (select (select Name from BusinessPartner where Id=(select PartnerId from BusinessPartnerPos where PosId=pos.Id and `Status`>-1 limit 1)) wname,BrandId,PosSnType,PosSn,(CASE WHEN BrandId not in(2,7,10,11) THEN ROUND(CAST(SeoKeyword AS DECIMAL)/100, 2) ELSE SeoKeyword end) SeoKeyword,TransferTime,BindingTime,ActivationTime,PrizeParams from PosMachinesTwo pos where BindingState=1 and `Status`>=-1 and BuyUserId=" + UserId + "  and Id in (select PosId from BusinessPartnerPos)) tb left join KqProducts k on tb.BrandId=k.Id" + condition;
 
             var sysAdmin = bsdb.SysAdmin.FirstOrDefault(m => m.AdminName == SysUserName && m.Status > -1);
             var FileName = "直营团队数据记录" + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss");

Areas/Admin/Controllers/MainServer/UsersController.cs

@@ -2739,7 +2739,7 @@ namespace MySystem.Areas.Admin.Controllers
                         posIds += pos.Id + ",";
                     }
                     posIds = posIds.TrimEnd(',');
-                    sql = "SELECT i.PosSn '机具SN',j.KqMerNo '商编',j.MerchantName '商户名称',(CASE WHEN i.BrandId not in(2,7,10,11) THEN ROUND(CAST(i.SeoKeyword AS DECIMAL)/100, 2) 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.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.*,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.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";
                 }
                 if (!string.IsNullOrEmpty(MerNos))
                 {
@@ -2751,7 +2751,7 @@ namespace MySystem.Areas.Admin.Controllers
                         merIds += mer.Id + ",";
                     }
                     merIds = merIds.TrimEnd(',');
-                    sql = "SELECT i.KqSnNo '机具SN',i.KqMerNo '商编',i.MerchantName '商户名称',i.SeoKeyword '服务费',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.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";
                 }
             }
             var sysAdmin = bsdb.SysAdmin.FirstOrDefault(m => m.AdminName == SysUserName && m.Status > -1);

wwwroot/layuiadmin/modules_main/BatchSeeUserInfo_Admin.js

@@ -109,16 +109,100 @@ layui.config({
 
     //事件
     var active = {
-        ImportData: function () {
+        batchdel: function () {
+            var checkStatus = table.checkStatus('LAY-list-manage')
+                , data = checkStatus.data; //得到选中的数据
+            if (data.length < 1) {
+                parent.layer.msg("请选择要删除的项");
+            } else {
+                var ids = "";
+                $.each(data, function (index, value) {
+                    ids += data[index].Id + ",";
+                });
+                ids = ids.substring(0, ids.length - 1);
+                var index = layer.confirm('确定要删除吗？删除后不能恢复！', function (index) {
+                    $.ajax({
+                        type: "POST",
+                        // url: "/Admin/LeaderReserveRecord/Delete?r=" + Math.random(1),
+                        data: "Id=" + ids,
+                        dataType: "text",
+                        success: function (data) {
+                            layer.close(index);
+                            if (data == "success") {
+                                table.reload('LAY-list-manage');
+                            } else {
+                                layer.msg(data);
+                            }
+                        }
+                    });
+                });
+            }
+        }
+        , add: function () {
+            var perContent = layer.open({
+                type: 2
+                , title: '盟主管理-添加'
+                , content: 'Add'
+                , maxmin: true
+                , area: ['500px', '450px']
+                , btn: ['确定', '取消']
+                , yes: function (index, layero) {
+                    var iframeWindow = window['layui-layer-iframe' + index]
+                        , submitID = 'LAY-list-front-submit'
+                        , submit = layero.find('iframe').contents().find('#' + submitID);
+
+                    setTimeout(function () {
+                        layero.find('iframe').contents().find('.layui-tab-item').each(function (i) {
+                            var errObj = $(this).find('.layui-form-danger');
+                            if (errObj.length > 0) {
+                                iframeWindow.element.tabChange('mytabbar', String(i + 1));
+                                submit.click();
+                            }
+                        });
+                    }, 300);
+                    //监听提交
+                    iframeWindow.layui.form.on('submit(' + submitID + ')', function (data) {
+                        var field = data.field; //获取提交的字段
+                        var userdata = "";
+                        for (var prop in field) {
+                            userdata += prop + "=" + encodeURIComponent(field[prop]) + "&";
+                        }
+                        //提交 Ajax 成功后，静态更新表格中的数据
+                        //$.ajax({});
+
+                        $.ajax({
+                            type: "POST",
+                            // url: "/Admin/LeaderReserveRecord/Add?r=" + Math.random(1),
+                            data: userdata,
+                            dataType: "text",
+                            success: function (data) {
+                                layer.close(index); //关闭弹层
+                                if (data == "success") {
+                                    table.reload('LAY-list-manage'); //数据刷新
+                                } else {
+                                    layer.msg(data);
+                                }
+                            }
+                        });
+                    });
+
+                    submit.trigger('click');
+                }
+            });
+            layer.full(perContent);
+        }
+        , ImportData: function () {
+            ExcelKind = 1;
             layer.open({
                 type: 1,
                 title: '导入',
                 maxmin: false,
-                area: ['460px', '180px'],
+                area: ['460px', '280px'],
                 content: $('#excelForm'),
                 cancel: function () {
                 }
             });
+            $("#excelTemp").html('<a href="/excelfile/模板文件.xlsx">点击下载模板文件</a>');
         }
         , ExportExcel: function () {
             var userdata = '';
@@ -136,12 +220,12 @@ layui.config({
                     type: "Post",
                     url: "/Admin/Users/ExportBatchSeeUserInfoExcelDo?r=" + Math.random(1),
                     data: userdata,
-                    dataType: "json",
+                    dataType: "text",
                     success: function (data) {
                         layer.close(index); //关闭弹层
                         if (data == "success") {
                             layer.close(indexs); //关闭弹层
-                            layer.msg('成功', {
+                            layer.msg('导出成功，请在我的下载中点击下载', {
                                 time: 1000
                             }, function () {
                                 window.location.reload();

wwwroot/layuiadmin/modules_main/LeaderReserveRecord_Admin.js

@@ -354,7 +354,7 @@ layui.config({
                         layer.close(index); //关闭弹层
                         if (data == "success") {
                             layer.close(indexs); //关闭弹层
-                            layer.msg('成功', {
+                            layer.msg('导出成功，请在我的下载中点击下载', {
                                 time: 1000
                             }, function () {
                                 window.location.reload();

wwwroot/layuiadmin/modules_main/Team1Info_Admin.js

@@ -105,7 +105,7 @@ layui.config({
             , { field: 'wname', width: 200, title: '伙伴名称', sort: true }
             , { field: 'Name', width: 200, title: '机具品牌', sort: true }
             , { field: 'PosSn', width: 200, title: '机具Sn', sort: true }
-            , { field: 'SeoKeyword', width: 200, title: '押金', sort: true }
+            , { field: 'SeoKeyword', width: 200, title: '服务费', sort: true }
             , { field: 'BindingTime', width: 200, title: '绑定时间', sort: true }
             , { field: 'ActivationTime', width: 200, title: '激活时间', sort: true }
         ]]