银行卡临时额度提现和小分仓临时额度提现快捷导出功能调整

Areas/Admin/Controllers/MainServer/PreAmountRecordController.cs

@@ -358,7 +358,14 @@ namespace MySystem.Areas.Admin.Controllers
             //状态
             if (!string.IsNullOrEmpty(StatusSelect))
             {
-                condition += " and a.Status=" + StatusSelect;
+                if (StatusSelect == "0")
+                {
+                    condition += " and a.Status=2";
+                }
+                else
+                {
+                    condition += " and a.Status=" + StatusSelect;
+                }
                 conditions += " and Status=" + StatusSelect;
             }
 
@@ -373,12 +380,13 @@ namespace MySystem.Areas.Admin.Controllers
             }
             Ids = Ids.TrimEnd(',');
 
+            OtherMySqlConn.op("UPDATE PreAmountRecord SET `Status`=2 WHERE Id IN(" + Ids + ") AND `Status`=0");
+            
             var Sql = "SELECT a.Id '记录ID',DATE_FORMAT(a.CreateDate,'%Y-%m-%d %H:%i:%s') '提现申请时间',(CASE WHEN a.Status=0 THEN '待处理' WHEN a.Status=2 THEN '处理中' WHEN a.Status=1 THEN '成功' WHEN a.Status=-1 THEN '失败' ELSE '' end) '提现结果',b.RealName '创客真实姓名',b.MakerCode '创客编号',a.UseAmount '申请提现临额',b.CertId '身份证号',b.SettleBankCardNo '银行卡号',b.SettleBankName '银行名称',b.Mobile '手机号',(CASE WHEN a.AmountType=1 THEN '临额提现' ELSE '' end) '交易类型',null '是否成功(是、否)' FROM PreAmountRecord a LEFT JOIN Users b ON a.UserId=b.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");
             string SendData = "{\"Operater\":\"" + sysAdmin.Id + "\",\"SqlString\":\"" + Sql + "\",\"FileName\":\"" + FileName + "\",\"MaxCount\":\"0\"}";
             RedisDbconn.Instance.AddList("ExportQueue", SendData);
-            OtherMySqlConn.op("UPDATE PreAmountRecord SET `Status`=2 WHERE Id IN(" + Ids + ") AND `Status`=0");
             AddSysLog(Ids, "PreAmountRecord", "ExportExcel");
             return "success";
         }

Areas/Admin/Controllers/MainServer/StoreHouseAmountRecordController.cs

@@ -642,7 +642,7 @@ namespace MySystem.Areas.Admin.Controllers
 
 
 
-         #region 快捷导出Excel
+        #region 快捷导出Excel
         public IActionResult QuickExportExcel(string right)
         {
             ViewBag.RightInfo = RightInfo;
@@ -681,7 +681,14 @@ namespace MySystem.Areas.Admin.Controllers
             //状态
             if (!string.IsNullOrEmpty(StatusSelect))
             {
-                condition += " and a.Status=" + StatusSelect;
+                if (StatusSelect == "0")
+                {
+                    condition += " and a.Status=2";
+                }
+                else
+                {
+                    condition += " and a.Status=" + StatusSelect;
+                }
                 conditions += " and Status=" + StatusSelect;
             }
 
@@ -696,12 +703,13 @@ namespace MySystem.Areas.Admin.Controllers
             }
             Ids = Ids.TrimEnd(',');
 
+            OtherMySqlConn.op("UPDATE StoreHouseAmountRecord SET `Status`=2 WHERE Id IN(" + Ids + ") AND `Status`=0");
+
             var Sql = "SELECT a.Id '记录ID',DATE_FORMAT(a.CreateDate,'%Y-%m-%d %H:%i:%s') '提现申请时间',(CASE WHEN a.Status=0 THEN '待处理' WHEN a.Status=2 THEN '处理中' WHEN a.Status=1 THEN '成功' WHEN a.Status=-1 THEN '失败' ELSE '' end) '提现结果',b.RealName '创客真实姓名',b.MakerCode '创客编号',FORMAT(a.UseAmount/2,2) '申请提现临额',b.CertId '身份证号',b.SettleBankCardNo '银行卡号',b.SettleBankName '银行名称',b.Mobile '手机号',(CASE WHEN a.AmountType=1 THEN '临额提现' ELSE '' end) '交易类型',null '是否成功(是、否)' FROM StoreHouseAmountRecord a LEFT JOIN Users b ON a.UserId=b.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");
             string SendData = "{\"Operater\":\"" + sysAdmin.Id + "\",\"SqlString\":\"" + Sql + "\",\"FileName\":\"" + FileName + "\",\"MaxCount\":\"0\"}";
             RedisDbconn.Instance.AddList("ExportQueue", SendData);
-            OtherMySqlConn.op("UPDATE StoreHouseAmountRecord SET `Status`=2 WHERE Id IN(" + Ids + ") AND `Status`=0");
             AddSysLog(Ids, "StoreHouseAmountRecord", "QuickExportExcel");
             return "success";
         }