押金退还调整，待完善

Areas/Admin/Controllers/MainServer/MerchantDepositReturnsController.cs

@@ -7,6 +7,7 @@ using System.Web;
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.Linq;
+using System.Data;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Http;
@@ -60,7 +61,7 @@ namespace MySystem.Areas.Admin.Controllers
             Fields.Add("OrderNo", "1"); //退押订单号
 
             string condition = " and Status>-1";
-            
+
             //提现状态
             if (!string.IsNullOrEmpty(StatusSelect))
             {
@@ -87,7 +88,11 @@ namespace MySystem.Areas.Admin.Controllers
                 dic["MerchantIdMerchantMobile"] = merchantid_PosMerchantInfo.MerchantMobile;
                 dic["MerchantIdMerIdcardNo"] = merchantid_PosMerchantInfo.MerIdcardNo;
                 dic.Remove("MerchantId");
-                dic["StatusName"] = dic["Status"].ToString() == "1" ? "正常" : "关闭";
+                int Status = int.Parse(dic["Status"].ToString());
+                if (Status == 0) dic["StatusName"] = "待处理";
+                if (Status == 3) dic["StatusName"] = "处理中";
+                if (Status == 1) dic["StatusName"] = "成功";
+                if (Status == 2) dic["StatusName"] = "失败";
                 //创客
                 int UserId = int.Parse(function.CheckInt(dic["UserId"].ToString()));
                 Users userid_Users = db.Users.FirstOrDefault(m => m.Id == UserId) ?? new Users();
@@ -278,19 +283,21 @@ namespace MySystem.Areas.Admin.Controllers
         {
             ExcelData = HttpUtility.UrlDecode(ExcelData);
             JsonData list = JsonMapper.ToObject(ExcelData);
+            var Ids = "";
             for (int i = 1; i < list.Count; i++)
             {
                 JsonData dr = list[i];
-
-                db.MerchantDepositReturns.Add(new MerchantDepositReturns()
-                {
-                    CreateDate = DateTime.Now,
-                    UpdateDate = DateTime.Now,
-
-                });
-                db.SaveChanges();
+                string Id = dr[0].ToString(); // 记录Id
+                string SeoDescription = dr[1].ToString(); // 退押订单编号
+                string AlipayAccountNo = dr[2].ToString(); // 支付宝帐号
+                string ReturnAmount = dr[3].ToString(); // 退还金额
+                string Status = dr[3].ToString(); // 审核结果
+                Ids += Id + ",";
             }
-            AddSysLog("0", "MerchantDepositReturns", "Import");
+            DataTable dt = OtherMySqlConn.dtable("UPDATE MerchantDepositReturns SET `Status`=3  WHERE Id IN(" + Ids.TrimEnd(',') + ")");
+            string text = string.Format("商户押金退还，记录Id: '" + Ids.TrimEnd(',') + "'，操作人: '" + SysUserName + "_" + SysRealName + "'，Time'" + DateTime.Now + "'");
+            function.WriteLog(text, "商户押金退还");
+            RedisDbconn.Instance.AddList("ToAlipayAccountQueue", Ids.TrimEnd(','));
             return "success";
         }
         #endregion
@@ -308,7 +315,7 @@ namespace MySystem.Areas.Admin.Controllers
             Fields.Add("OrderNo", "1"); //退押订单号
 
             string condition = " and Status>-1";
-            
+
             //提现状态
             if (!string.IsNullOrEmpty(StatusSelect))
             {
@@ -350,13 +357,15 @@ namespace MySystem.Areas.Admin.Controllers
             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("MerchantIdMerRealName", "商户真实姓名");
-            ReturnFields.Add("MerchantIdMerchantMobile", "商户手机号");
-            ReturnFields.Add("MerchantIdMerIdcardNo", "商户身份证号");
+            ReturnFields.Add("Id", "记录ID");
+            // ReturnFields.Add("MerchantIdMerRealName", "商户真实姓名");
+            // ReturnFields.Add("MerchantIdMerchantMobile", "商户手机号");
+            // ReturnFields.Add("MerchantIdMerIdcardNo", "商户身份证号");
+            ReturnFields.Add("SeoDescription", "退押订单号");
             ReturnFields.Add("AlipayAccountNo", "支付宝账号");
             ReturnFields.Add("ReturnAmount", "返还金额");
-            ReturnFields.Add("UserIdRealName", "创客真实姓名");
-            ReturnFields.Add("UserIdMakerCode", "创客编号");
+            // ReturnFields.Add("UserIdRealName", "创客真实姓名");
+            // ReturnFields.Add("UserIdMakerCode", "创客编号");
 
             result.Add("Fields", ReturnFields);
             AddSysLog("0", "MerchantDepositReturns", "ExportExcel");

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

@@ -66,11 +66,12 @@
                         </div>
                     </div>
                     <div class="layui-inline">
-                        <label class="layui-form-label">提现状态</label>
+                        <label class="layui-form-label">退押状态</label>
                         <div class="layui-input-inline">
                             <select id="StatusSelect" name="StatusSelect" lay-search="">
                                 <option value="">全部...</option>
-                                <option value="0">处理中</option>
+                                <option value="0">待处理</option>
+                                <option value="3">处理中</option>
                                 <option value="2">失败</option>
                                 <option value="1">成功</option>
                             </select>

wwwroot/layuiadmin/modules_main/MerchantDepositReturns_Admin.js

@@ -95,7 +95,7 @@ layui.config({
             , { field: 'CreateDate', width: 200, title: '创建时间', sort: true }
             , { field: 'StatusName', width: 200, title: '状态', sort: true }
             , { field: 'OperateMan', width: 200, title: '操作人', sort: true }
-            , { field: 'OrderNo', width: 200, title: '退押订单号', sort: true }
+            , { field: 'SeoDescription', width: 200, title: '退押订单号', sort: true }
             , { field: 'AlipayAccountNo', width: 200, title: '支付宝账号', sort: true }
             , { field: 'ReturnAmount', width: 200, title: '返还金额', sort: true }
 
@@ -321,7 +321,7 @@ layui.config({
                 cancel: function () {
                 }
             });
-            $("#excelTemp").html('<a href="/excelfile/模板文件.xlsx">点击下载模板文件</a>');
+            $("#excelTemp").html('<a href="/excelfile/模板文件.xlsx">点击下载退押结果模板</a>');
         }
         , ExportExcel: function () {
             var userdata = '';

wwwroot/layuiadmin/modules_main/PosMerchantInfoList_Admin.js

@@ -297,6 +297,8 @@ layui.config({
         }
         else {
             //执行重载
+            var field = data.field;
+            field.ShowFlag = 1;
             table.reload('LAY-list-manage', {
                 where: field,
                 page: {