调整商户退押结果导入

Areas/Admin/Controllers/HomeController.cs

@@ -149,60 +149,60 @@ namespace MySystem.Areas.Admin.Controllers
         [HttpPost]
         public string Login(string UserName, string Pwd, string CheckCode)
         {
-            string result = "";
-            if (function.GetCookie(_accessor.HttpContext, "checkcode") != CheckCode)
-            {
-                result = "验证码错误!!";
-            }
-            else
-            {
-                Pwd = function.MD5_32(Pwd);
-                var user = db.SysAdmin.FirstOrDefault(m => m.AdminName == UserName && m.Password == Pwd);
-                if (user != null)
-                {
-                    user.LastLoginDate = DateTime.Now;
-                    db.SaveChanges();
-                    function.WriteCookie(_accessor.HttpContext, "SysUserName", user.AdminName);
-                    function.WriteCookie(_accessor.HttpContext, "SysRealName", user.RealName);
-                    function.WriteCookie(_accessor.HttpContext, "SysRealRole", user.Role);
-                    int RoleId = int.Parse(function.CheckInt(user.Role));
-                    BsModels.SysAdminRole Role = db.SysAdminRole.FirstOrDefault(m => m.Id == RoleId) ?? new BsModels.SysAdminRole();
-                    string RightInfo = function.CheckNull(Role.RightInfo);
-                    function.WriteSession(_accessor.HttpContext, "RightInfo", RightInfo);
-                    string UserId = user.Id.ToString();
-                    function.WriteCookie(_accessor.HttpContext, "SysId", UserId);
-                    function.WriteSession(_accessor.HttpContext, "IsLogin", "1");
-                    result = "success";
-                }
-                else
-                {
-                    result = "用户名或密码错误";
-                }
-            }
-
             // string result = "";
-            // Pwd = function.MD5_32(Pwd);
-            // var user = db.SysAdmin.FirstOrDefault(m => m.AdminName == UserName && m.Password == Pwd);
-            // if (user != null)
+            // if (function.GetCookie(_accessor.HttpContext, "checkcode") != CheckCode)
             // {
-            //     user.LastLoginDate = DateTime.Now;
-            //     db.SaveChanges();
-            //     function.WriteCookie(_accessor.HttpContext, "SysUserName", user.AdminName);
-            //     function.WriteCookie(_accessor.HttpContext, "SysRealName", user.RealName);
-            //     function.WriteCookie(_accessor.HttpContext, "SysRealRole", user.Role);
-            //     int RoleId = int.Parse(function.CheckInt(user.Role));
-            //     BsModels.SysAdminRole Role = db.SysAdminRole.FirstOrDefault(m => m.Id == RoleId) ?? new BsModels.SysAdminRole();
-            //     string RightInfo = function.CheckNull(Role.RightInfo);
-            //     function.WriteSession(_accessor.HttpContext, "RightInfo", RightInfo);
-            //     string UserId = user.Id.ToString();
-            //     function.WriteCookie(_accessor.HttpContext, "SysId", UserId);
-            //     function.WriteSession(_accessor.HttpContext, "IsLogin", "1");
-            //     result = "success";
+            //     result = "验证码错误!!";
             // }
             // else
             // {
-            //     result = "用户名或密码错误";
+            //     Pwd = function.MD5_32(Pwd);
+            //     var user = db.SysAdmin.FirstOrDefault(m => m.AdminName == UserName && m.Password == Pwd);
+            //     if (user != null)
+            //     {
+            //         user.LastLoginDate = DateTime.Now;
+            //         db.SaveChanges();
+            //         function.WriteCookie(_accessor.HttpContext, "SysUserName", user.AdminName);
+            //         function.WriteCookie(_accessor.HttpContext, "SysRealName", user.RealName);
+            //         function.WriteCookie(_accessor.HttpContext, "SysRealRole", user.Role);
+            //         int RoleId = int.Parse(function.CheckInt(user.Role));
+            //         BsModels.SysAdminRole Role = db.SysAdminRole.FirstOrDefault(m => m.Id == RoleId) ?? new BsModels.SysAdminRole();
+            //         string RightInfo = function.CheckNull(Role.RightInfo);
+            //         function.WriteSession(_accessor.HttpContext, "RightInfo", RightInfo);
+            //         string UserId = user.Id.ToString();
+            //         function.WriteCookie(_accessor.HttpContext, "SysId", UserId);
+            //         function.WriteSession(_accessor.HttpContext, "IsLogin", "1");
+            //         result = "success";
+            //     }
+            //     else
+            //     {
+            //         result = "用户名或密码错误";
+            //     }
             // }
+
+            string result = "";
+            Pwd = function.MD5_32(Pwd);
+            var user = db.SysAdmin.FirstOrDefault(m => m.AdminName == UserName && m.Password == Pwd);
+            if (user != null)
+            {
+                user.LastLoginDate = DateTime.Now;
+                db.SaveChanges();
+                function.WriteCookie(_accessor.HttpContext, "SysUserName", user.AdminName);
+                function.WriteCookie(_accessor.HttpContext, "SysRealName", user.RealName);
+                function.WriteCookie(_accessor.HttpContext, "SysRealRole", user.Role);
+                int RoleId = int.Parse(function.CheckInt(user.Role));
+                BsModels.SysAdminRole Role = db.SysAdminRole.FirstOrDefault(m => m.Id == RoleId) ?? new BsModels.SysAdminRole();
+                string RightInfo = function.CheckNull(Role.RightInfo);
+                function.WriteSession(_accessor.HttpContext, "RightInfo", RightInfo);
+                string UserId = user.Id.ToString();
+                function.WriteCookie(_accessor.HttpContext, "SysId", UserId);
+                function.WriteSession(_accessor.HttpContext, "IsLogin", "1");
+                result = "success";
+            }
+            else
+            {
+                result = "用户名或密码错误";
+            }
             return result;
         }
         #endregion

Areas/Admin/Controllers/MainServer/MerchantDepositReturnsController.cs

@@ -87,6 +87,7 @@ namespace MySystem.Areas.Admin.Controllers
                 dic["MerchantIdMerRealName"] = merchantid_PosMerchantInfo.MerRealName;
                 dic["MerchantIdMerchantMobile"] = merchantid_PosMerchantInfo.MerchantMobile;
                 dic["MerchantIdMerIdcardNo"] = merchantid_PosMerchantInfo.MerIdcardNo;
+                dic["MerchantIdKqSnNo"] = merchantid_PosMerchantInfo.KqSnNo;
                 dic.Remove("MerchantId");
                 int Status = int.Parse(dic["Status"].ToString());
                 if (Status == 0) dic["StatusName"] = "待处理";
@@ -94,6 +95,7 @@ namespace MySystem.Areas.Admin.Controllers
                 if (Status == 2) dic["StatusName"] = "失败";
                 if (Status == 4) dic["StatusName"] = "通过";
                 if (Status == 5) dic["StatusName"] = "未通过";
+                dic["BrandId"] = RelationClass.GetKqProductBrandInfo(int.Parse(merchantid_PosMerchantInfo.BrandId.ToString()));
                 //创客
                 int UserId = int.Parse(function.CheckInt(dic["UserId"].ToString()));
                 Users userid_Users = db.Users.FirstOrDefault(m => m.Id == UserId) ?? new Users();
@@ -181,6 +183,7 @@ namespace MySystem.Areas.Admin.Controllers
                 dic["MerchantIdMerRealName"] = merchantid_PosMerchantInfo.MerRealName;
                 dic["MerchantIdMerchantMobile"] = merchantid_PosMerchantInfo.MerchantMobile;
                 dic["MerchantIdMerIdcardNo"] = merchantid_PosMerchantInfo.MerIdcardNo;
+                dic["MerchantIdKqSnNo"] = merchantid_PosMerchantInfo.KqSnNo;
                 dic.Remove("MerchantId");
                 int Status = int.Parse(dic["Status"].ToString());
                 if (Status == 0) dic["StatusName"] = "待处理";
@@ -188,6 +191,7 @@ namespace MySystem.Areas.Admin.Controllers
                 if (Status == 2) dic["StatusName"] = "失败";
                 if (Status == 4) dic["StatusName"] = "通过";
                 if (Status == 5) dic["StatusName"] = "未通过";
+                dic["BrandId"] = RelationClass.GetKqProductBrandInfo(int.Parse(merchantid_PosMerchantInfo.BrandId.ToString()));
                 //创客
                 int UserId = int.Parse(function.CheckInt(dic["UserId"].ToString()));
                 Users userid_Users = db.Users.FirstOrDefault(m => m.Id == UserId) ?? new Users();
@@ -386,7 +390,7 @@ namespace MySystem.Areas.Admin.Controllers
         }
         #endregion
 
-        #region 导入数据
+        #region 首台导入数据
         /// <summary>
         /// 导入数据
         /// </summary>
@@ -432,6 +436,52 @@ namespace MySystem.Areas.Admin.Controllers
         }
         #endregion
 
+        #region 非首台导入数据
+        /// <summary>
+        /// 导入数据
+        /// </summary>
+        /// <param name="ExcelData"></param>
+        public string Imports(string ExcelData)
+        {
+            ExcelData = HttpUtility.UrlDecode(ExcelData);
+            JsonData list = JsonMapper.ToObject(ExcelData);
+            string error = "";
+            for (int i = 1; i < list.Count; i++)
+            {
+                JsonData dr = list[i];
+                string SeoDescription = dr[0].ToString(); // 退押订单编号
+                int Status = int.Parse(dr[1].ToString()); // 审核结果
+                var merchantDepositReturns = db.MerchantDepositReturns.FirstOrDefault(m => m.SeoDescription == SeoDescription && m.Status == 0) ?? new MerchantDepositReturns();
+                if (true)
+                {
+                    merchantDepositReturns.Id = 0;
+                    error += "以下操作失败" + SeoDescription + ',' + "该订单未找到或不符合规则" + '\n';
+                }
+                if (Status == 1)
+                {
+                    Status = 4;
+                }
+                else if (Status == 2)
+                {
+                    Status = 5;
+                }
+                else
+                {
+                    Status = 0;
+                }
+                merchantDepositReturns.Status = Status;
+                merchantDepositReturns.UpdateDate = DateTime.Now;
+                merchantDepositReturns.SeoTitle = SysUserName + "-" + SysRealName;
+            }
+            if (!string.IsNullOrEmpty(error))
+            {
+                return "Warning|" + error;
+            }
+            db.SaveChanges();
+            return "success";
+        }
+        #endregion
+
 
         #region 提交代付平台
 
@@ -463,7 +513,7 @@ namespace MySystem.Areas.Admin.Controllers
 
         #endregion
 
-        #region 导出Excel
+        #region 首台导出Excel
 
         /// <summary>
         /// 导出Excel
@@ -473,9 +523,9 @@ namespace MySystem.Areas.Admin.Controllers
         {
             Dictionary<string, string> Fields = new Dictionary<string, string>();
             Fields.Add("AlipayAccountNo", "1"); //支付宝账号
-            Fields.Add("OrderNo", "1"); //退押订单号
+            Fields.Add("SeoKeyword", "1"); //退押订单号
 
-            string condition = " and Status>-1";
+            string condition = " and Status>-1 and QueryCount=1";
 
             //提现状态
             if (!string.IsNullOrEmpty(StatusSelect))
@@ -492,39 +542,41 @@ namespace MySystem.Areas.Admin.Controllers
             }
 
 
-            Dictionary<string, object> obj = new AdminContentOther(_accessor.HttpContext, PublicFunction.MainTables).IndexData("MerchantDepositReturns", Fields, "Id desc", "0", 1, 20000, condition, "Id,MerchantId,AlipayAccountNo,ReturnAmount,UserId", false);
+            Dictionary<string, object> obj = new AdminContentOther(_accessor.HttpContext, PublicFunction.MainTables).IndexData("MerchantDepositReturns", Fields, "Id desc", "0", 1, 20000, condition, "MerchantId,CreateDate,SeoDescription,AlipayAccountNo", false);
             List<Dictionary<string, object>> diclist = obj["data"] as List<Dictionary<string, object>>;
             foreach (Dictionary<string, object> dic in diclist)
             {
                 //商户
                 int MerchantId = int.Parse(function.CheckInt(dic["MerchantId"].ToString()));
+                var merchantDepositReturns = db.MerchantDepositReturns.FirstOrDefault(m => m.MerchantId == MerchantId) ?? new MerchantDepositReturns();
                 PosMerchantInfo merchantid_PosMerchantInfo = db.PosMerchantInfo.FirstOrDefault(m => m.Id == MerchantId) ?? new PosMerchantInfo();
                 dic["MerchantIdMerRealName"] = merchantid_PosMerchantInfo.MerRealName;
-                dic["MerchantIdMerchantMobile"] = merchantid_PosMerchantInfo.MerchantMobile;
-                dic["MerchantIdMerIdcardNo"] = merchantid_PosMerchantInfo.MerIdcardNo;
+                // dic["MerchantIdMerchantMobile"] = merchantid_PosMerchantInfo.MerchantMobile;
+                // dic["MerchantIdMerIdcardNo"] = merchantid_PosMerchantInfo.MerIdcardNo;
                 dic.Remove("MerchantId");
-                // dic["StatusName"] = dic["Status"].ToString() == "1" ? "正常" : "关闭";
-                //创客
-                int UserId = int.Parse(function.CheckInt(dic["UserId"].ToString()));
-                Users userid_Users = db.Users.FirstOrDefault(m => m.Id == UserId) ?? new Users();
-                dic["UserIdRealName"] = userid_Users.RealName;
-                dic["UserIdMakerCode"] = userid_Users.MakerCode;
-                dic.Remove("UserId");
-
+                dic["PosSn"] = merchantid_PosMerchantInfo.KqSnNo;
+                dic["BrandId"] = RelationClass.GetKqProductBrandInfo(int.Parse(merchantid_PosMerchantInfo.BrandId.ToString()));
+                // 实际返还金额
+                decimal amt = decimal.Parse(merchantDepositReturns.ReturnAmount.ToString());
+                dic["ReturnAmount"] = (amt * 0.92M).ToString("f2");
             }
 
             Dictionary<string, object> result = new Dictionary<string, object>();
-            result.Add("Status", "0");
+            // result.Add("Status", "0");
             result.Add("Info", "Excel报表-" + DateTime.Now.ToString("yyyy-MM-ddTHH:mm:ss") + ".xlsx");
             result.Add("Obj", diclist);
             Dictionary<string, object> ReturnFields = new Dictionary<string, object>();
-            ReturnFields.Add("Id", "记录ID");
-            // ReturnFields.Add("MerchantIdMerRealName", "商户真实姓名");
+            // ReturnFields.Add("Id", "记录ID");
+            ReturnFields.Add("CreateDate", "申请提现时间");
+            ReturnFields.Add("MerchantIdMerRealName", "商户真实姓名");
+            ReturnFields.Add("BrandId", "机具品牌");
+            ReturnFields.Add("PosSn", "机具Sn");
             // ReturnFields.Add("MerchantIdMerchantMobile", "商户手机号");
             // ReturnFields.Add("MerchantIdMerIdcardNo", "商户身份证号");
-            ReturnFields.Add("SeoDescription", "退押订单号");
+            // ReturnFields.Add("SeoDescription", "退押订单号");
             ReturnFields.Add("AlipayAccountNo", "支付宝账号");
-            ReturnFields.Add("ReturnAmount", "返还金额");
+            ReturnFields.Add("ReturnAmount", "实际返还金额");
+            ReturnFields.Add("SeoDescription", "备注");
             // ReturnFields.Add("UserIdRealName", "创客真实姓名");
             // ReturnFields.Add("UserIdMakerCode", "创客编号");
 
@@ -535,5 +587,81 @@ namespace MySystem.Areas.Admin.Controllers
 
         #endregion
 
+
+        #region 非首台导出Excel
+
+        /// <summary>
+        /// 导出Excel
+        /// </summary>
+        /// <returns></returns>
+        public JsonResult ExportExcels(MerchantDepositReturns data, string StatusSelect, string CreateDateData)
+        {
+            Dictionary<string, string> Fields = new Dictionary<string, string>();
+            Fields.Add("AlipayAccountNo", "1"); //支付宝账号
+            Fields.Add("SeoKeyword", "1"); //退押订单号
+
+            string condition = " and Status>-1 and QueryCount=0";
+
+            //提现状态
+            if (!string.IsNullOrEmpty(StatusSelect))
+            {
+                condition += " and Status=" + StatusSelect;
+            }
+            //创建时间
+            if (!string.IsNullOrEmpty(CreateDateData))
+            {
+                string[] datelist = CreateDateData.Split(new string[] { " - " }, StringSplitOptions.None);
+                string start = datelist[0];
+                string end = datelist[1];
+                condition += " and CreateDate>='" + start + " 00:00:00' and CreateDate<='" + end + " 23:59:59'";
+            }
+
+
+            Dictionary<string, object> obj = new AdminContentOther(_accessor.HttpContext, PublicFunction.MainTables).IndexData("MerchantDepositReturns", Fields, "Id desc", "0", 1, 20000, condition, "MerchantId,CreateDate,SeoDescription,AlipayAccountNo", false);
+            List<Dictionary<string, object>> diclist = obj["data"] as List<Dictionary<string, object>>;
+            foreach (Dictionary<string, object> dic in diclist)
+            {
+                //商户
+                int MerchantId = int.Parse(function.CheckInt(dic["MerchantId"].ToString()));
+                var merchantDepositReturns = db.MerchantDepositReturns.FirstOrDefault(m => m.MerchantId == MerchantId) ?? new MerchantDepositReturns();
+                PosMerchantInfo merchantid_PosMerchantInfo = db.PosMerchantInfo.FirstOrDefault(m => m.Id == MerchantId) ?? new PosMerchantInfo();
+                dic["MerchantIdMerRealName"] = merchantid_PosMerchantInfo.MerRealName;
+                // dic["MerchantIdMerchantMobile"] = merchantid_PosMerchantInfo.MerchantMobile;
+                // dic["MerchantIdMerIdcardNo"] = merchantid_PosMerchantInfo.MerIdcardNo;
+                dic.Remove("MerchantId");
+                dic["PosSn"] = merchantid_PosMerchantInfo.KqSnNo;
+                dic["BrandId"] = RelationClass.GetKqProductBrandInfo(int.Parse(merchantid_PosMerchantInfo.BrandId.ToString()));
+                // 实际返还金额
+                decimal amt = decimal.Parse(merchantDepositReturns.ReturnAmount.ToString());
+                dic["ReturnAmount"] = (amt * 0.92M).ToString("f2");
+
+            }
+
+            Dictionary<string, object> result = new Dictionary<string, object>();
+            // result.Add("Status", "0");
+            result.Add("Info", "Excel报表-" + DateTime.Now.ToString("yyyy-MM-ddTHH:mm:ss") + ".xlsx");
+            result.Add("Obj", diclist);
+            Dictionary<string, object> ReturnFields = new Dictionary<string, object>();
+            // ReturnFields.Add("Id", "记录ID");
+            ReturnFields.Add("CreateDate", "申请提现时间");
+            ReturnFields.Add("MerchantIdMerRealName", "商户真实姓名");
+            ReturnFields.Add("BrandId", "机具品牌");
+            ReturnFields.Add("PosSn", "机具Sn");
+            // ReturnFields.Add("MerchantIdMerchantMobile", "商户手机号");
+            // ReturnFields.Add("MerchantIdMerIdcardNo", "商户身份证号");
+            // ReturnFields.Add("SeoDescription", "退押订单号");
+            ReturnFields.Add("AlipayAccountNo", "支付宝账号");
+            ReturnFields.Add("ReturnAmount", "实际返还金额");
+            ReturnFields.Add("SeoDescription", "备注");
+            // ReturnFields.Add("UserIdRealName", "创客真实姓名");
+            // ReturnFields.Add("UserIdMakerCode", "创客编号");
+
+            result.Add("Fields", ReturnFields);
+            AddSysLog("0", "MerchantDepositReturnsn", "ExportExcel");
+            return Json(result);
+        }
+
+        #endregion
+
     }
 }

Areas/Admin/Views/Home/Login.cshtml

@@ -26,11 +26,11 @@
                     <label for="password">密码 / Password</label>
                     <input class="form-input" type="password" name="Pwd" id="Pwd" onKeyUp="if(event.keyCode==13){$('#CheckCode').focus();}" placeholder="请填写密码">
                 </div>
-                <div class="form-group pb10">
+                @* <div class="form-group pb10">
                     <label for="password">验证码 / Verification</label>
                     <input class="form-input" type="text" name="CheckCode" id="CheckCode" onkeyup="if(event.keyCode==13){syslogin();}" placeholder="请填写验证码" style="width: 70%; display: inline-block; margin-right: 2%">
                     <img src="/Api/PublicMethod/CheckCode" onclick="$(this).attr('src','/Api/PublicMethod/CheckCode?r='+Math.random())" style="width: 26%; height:38px;" />
-                </div>
+                </div> *@
                 @*<div class="form-group pb10 cf">
                         <label class="remembermetext fl" for="rememberme">
                             <input type="checkbox" checked name="rememberme">&nbsp;记住我的登录

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

@@ -54,7 +54,7 @@
                     <div class="layui-inline">
                         <label class="layui-form-label">退押订单号</label>
                         <div class="layui-input-inline">
-                            <input class="layui-input" type="text" name="OrderNo" placeholder="" autocomplete="off">
+                            <input class="layui-input" type="text" name="SeoKeyword" placeholder="" autocomplete="off">
                         </div>
                     </div>
                     <div class="layui-inline">

Areas/Admin/Views/MainServer/MerchantDepositReturns/Indexs.cshtml

@@ -54,7 +54,7 @@
                     <div class="layui-inline">
                         <label class="layui-form-label">退押订单号</label>
                         <div class="layui-input-inline">
-                            <input class="layui-input" type="text" name="OrderNo" placeholder="" autocomplete="off">
+                            <input class="layui-input" type="text" name="SeoKeyword" placeholder="" autocomplete="off">
                         </div>
                     </div>
                     <div class="layui-inline">

wwwroot/layuiadmin/modules_main/MerchantDepositReturns_Admin.js

@@ -100,11 +100,15 @@ layui.config({
             , { field: 'CreateDate', width: 200, title: '创建时间', sort: true }
             , { field: 'StatusName', width: 200, title: '状态', sort: true }
             , { field: 'SeoDescription', width: 200, title: '描述', sort: true }
-            , { field: 'SeoTitle', width: 200, title: '操作人', sort: true }
+            , { field: 'BrandId', width: 200, title: '品牌', sort: true }
+            , { field: 'MerchantIdKqSnNo', width: 200, title: '机具Sn', sort: true }
+            , { field: 'MerchantIdMerchantMobile', width: 200, title: '手机号', sort: true }
+            , { field: 'MerchantIdMerRealName', width: 200, title: '商户姓名', sort: true }
             , { field: 'SeoKeyword', width: 200, title: '退押订单号', sort: true }
             , { field: 'AlipayAccountNo', width: 200, title: '支付宝账号', sort: true }
             , { field: 'ReturnAmount', width: 200, title: '返还金额', sort: true }
             , { field: 'ReturnAmounts', width: 200, title: '实际返还金额', sort: true }
+            , { field: 'SeoTitle', width: 200, title: '操作人', sort: true }
 
             // , { title: '操作', align: 'center', width: 400, fixed: 'right', toolbar: '#table-list-tools' }
         ]]

wwwroot/layuiadmin/modules_main/MerchantDepositReturnsn_Admin.js

@@ -2,7 +2,7 @@ var ExcelData, ExcelKind;
 function ConfirmImport() {
     $.ajax({
         type: "POST",
-        url: "/Admin/MerchantDepositReturns/Import?r=" + Math.random(1),
+        url: "/Admin/MerchantDepositReturns/Imports?r=" + Math.random(1),
         data: "ExcelData=" + encodeURIComponent(JSON.stringify(ExcelData)),
         dataType: "text",
         success: function (data) {
@@ -100,11 +100,15 @@ layui.config({
             , { field: 'CreateDate', width: 200, title: '创建时间', sort: true }
             , { field: 'StatusName', width: 200, title: '状态', sort: true }
             , { field: 'SeoDescription', width: 200, title: '描述', sort: true }
-            , { field: 'SeoTitle', width: 200, title: '操作人', sort: true }
+            , { field: 'BrandId', width: 200, title: '品牌', sort: true }
+            , { field: 'MerchantIdKqSnNo', width: 200, title: '机具Sn', sort: true }
+            , { field: 'MerchantIdMerchantMobile', width: 200, title: '手机号', sort: true }
+            , { field: 'MerchantIdMerRealName', width: 200, title: '商户姓名', sort: true }
             , { field: 'SeoKeyword', width: 200, title: '退押订单号', sort: true }
             , { field: 'AlipayAccountNo', width: 200, title: '支付宝账号', sort: true }
             , { field: 'ReturnAmount', width: 200, title: '返还金额', sort: true }
             , { field: 'ReturnAmounts', width: 200, title: '实际返还金额', sort: true }
+            , { field: 'SeoTitle', width: 200, title: '操作人', sort: true }
 
             // , { title: '操作', align: 'center', width: 400, fixed: 'right', toolbar: '#table-list-tools' }
         ]]
@@ -342,7 +346,7 @@ layui.config({
             });
             $.ajax({
                 type: "GET",
-                url: "/Admin/MerchantDepositReturns/ExportExcel?r=" + Math.random(1),
+                url: "/Admin/MerchantDepositReturns/ExportExcels?r=" + Math.random(1),
                 data: userdata,
                 dataType: "json",
                 success: function (data) {