待测试

Areas/Admin/Controllers/MainServer/MerchantDepositReturnsController.cs

@@ -93,6 +93,8 @@ namespace MySystem.Areas.Admin.Controllers
                 if (Status == 3) dic["StatusName"] = "处理中";
                 if (Status == 1) dic["StatusName"] = "成功";
                 if (Status == 2) dic["StatusName"] = "失败";
+                if (Status == 4) dic["StatusName"] = "通过";
+                if (Status == 5) dic["StatusName"] = "未通过";
                 //创客
                 int UserId = int.Parse(function.CheckInt(dic["UserId"].ToString()));
                 Users userid_Users = db.Users.FirstOrDefault(m => m.Id == UserId) ?? new Users();
@@ -290,8 +292,21 @@ namespace MySystem.Areas.Admin.Controllers
                 string SeoDescription = dr[1].ToString(); // 退押订单编号
                 string AlipayAccountNo = dr[2].ToString(); // 支付宝帐号
                 string ReturnAmount = dr[3].ToString(); // 退还金额
+                var s = dr[4].ToString();
                 int Status = int.Parse(dr[4].ToString()); // 审核结果
-                var merchantDepositReturns = db.MerchantDepositReturns.FirstOrDefault(m => m.Id == Id) ?? new MerchantDepositReturns();
+                var merchantDepositReturns = db.MerchantDepositReturns.FirstOrDefault(m => m.Id == Id && m.Status == 0) ?? new MerchantDepositReturns();
+                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;
@@ -317,6 +332,7 @@ namespace MySystem.Areas.Admin.Controllers
             foreach (string subid in idlist)
             {
                 int id = int.Parse(subid);
+                var merchantDepositReturns = db.MerchantDepositReturns.FirstOrDefault(m => m.Id == id && m.Status == 4) ?? new MerchantDepositReturns();
                 Ids += Id + ",";
             }
             DataTable dt = OtherMySqlConn.dtable("UPDATE MerchantDepositReturns SET `Status`=3  WHERE Id IN(" + Ids.TrimEnd(',') + ")");

Areas/Admin/Controllers/MainServer/PosMerchantInfoListController.cs

@@ -450,19 +450,20 @@ 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.PosMerchantInfo.Add(new PosMerchantInfo()
-                {
-                    CreateDate = DateTime.Now,
-                    UpdateDate = DateTime.Now,
-
-                });
+                string KqMerNo = dr[0].ToString(); // 商户编号
+                var posMerchantInfo = db.PosMerchantInfo.FirstOrDefault(m => m.KqMerNo == KqMerNo) ?? new PosMerchantInfo();
+                posMerchantInfo.StandardStatus = -2;
+                Ids += posMerchantInfo.Id + ",";
                 db.SaveChanges();
             }
             AddSysLog("0", "PosMerchantInfo", "Import");
+            string text = string.Format("导入人工已退，商户Id: '" + Ids.TrimEnd(',') + "'，操作人: '" + SysUserName + "_" + SysRealName + "'，Time'" + DateTime.Now + "'");
+            function.WriteLog(text, "导入人工已退");
+            RedisDbconn.Instance.AddList("ToAlipayAccountQueue", Ids.TrimEnd(','));
             return "success";
         }
         #endregion

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

@@ -73,6 +73,8 @@
                                 <option value="3">处理中</option>
                                 <option value="2">失败</option>
                                 <option value="1">成功</option>
+                                <option value="4">通过</option>
+                                <option value="5">未通过</option>
                             </select>
                         </div>
                     </div>

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

@@ -4,33 +4,40 @@
 }
 <!DOCTYPE html>
 <html>
+
 <head>
     <meta charset="utf-8">
     <title>达标商户列表</title>
     <meta name="renderer" content="webkit">
     <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
-    <meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=0">
+    <meta name="viewport"
+        content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=0">
     <link rel="stylesheet" href="/layuiadmin/layui/css/layui.css" media="all">
     <link rel="stylesheet" href="/layuiadmin/style/admin.css" media="all">
     <script src="/admin/js/jquery-1.10.1.min.js"></script>
     <style>
-        .layui-input-inline{
+        .layui-input-inline {
             width: 175px !important;
         }
-        .layui-form-label{
+
+        .layui-form-label {
             width: 85px !important;
         }
-        .layui-inline{
+
+        .layui-inline {
             margin-right: 0px !important;
-        }        
-        .w100{
+        }
+
+        .w100 {
             width: 100px !important;
         }
-        .ml50{
+
+        .ml50 {
             margin-left: 50px !important;
         }
     </style>
 </head>
+
 <body>
     <div class="layui-fluid">
         <div class="layui-card">
@@ -40,22 +47,22 @@
                     <div class="layui-inline">
                         <label class="layui-form-label">身份证号</label>
                         <div class="layui-input-inline">
-                            <input class="layui-input" type="text" name="MerIdcardNo" 
-                                placeholder="请输入身份证号" autocomplete="off">
+                            <input class="layui-input" type="text" name="MerIdcardNo" placeholder="请输入身份证号"
+                                autocomplete="off">
                         </div>
                     </div>
                     <div class="layui-inline">
                         <label class="layui-form-label">手机号</label>
                         <div class="layui-input-inline">
-                            <input class="layui-input" type="text" name="MerchantMobile" 
-                                placeholder="请输入手机号" autocomplete="off">
+                            <input class="layui-input" type="text" name="MerchantMobile" placeholder="请输入手机号"
+                                autocomplete="off">
                         </div>
                     </div>
                     <div class="layui-inline">
                         <label class="layui-form-label">机具号</label>
                         <div class="layui-input-inline">
-                            <input class="layui-input" type="text" name="KqSnNo" 
-                                placeholder="请输入机具号" autocomplete="off">
+                            <input class="layui-input" type="text" name="KqSnNo" placeholder="请输入机具号"
+                                autocomplete="off">
                         </div>
                     </div>
                     <div class="layui-inline ml50">
@@ -71,6 +78,11 @@
                                 <i class="layui-icon layui-icon-export layuiadmin-button-btn"></i>批量通过
                             </button>
                         }
+                        @if (RightInfo.Contains("," + right + "_import,"))
+                        {
+                            <button class="layui-btn" data-type="ImportData"><i
+                                class="layui-icon layui-icon-upload layuiadmin-button-btn"></i>导入人工已退</button>
+                        }
                     </div>
                 </div>
             </div>
@@ -80,8 +92,34 @@
             </div>
         </div>
     </div>
+    <div id="excelForm" style="display:none; padding:20px;">
+        <div class="layui-tab-item layui-show">
+            <div class="layui-form-item">
+                <label class="layui-form-label">模板下载</label>
+                <div class="layui-form-mid layui-word-aux" id="excelTemp">
+                </div>
+            </div>
+            <div class="layui-form-item">
+                <label class="layui-form-label">excel文件</label>
+                <div class="layui-form-mid layui-word-aux">
+                    <div class="layui-upload">
+                        <input type="file" id="ExcelFile" name="ExcelFile" value="">
+                    </div>
+                    <div class="mt10" id="ExcelFileList">
+                    </div>
+                </div>
+            </div>
+        </div>
+        <div class="layui-form-item ml10">
+            <div class="layui-input-block">
+                <button type="button" class="layui-btn" onclick="ConfirmImport()">立即导入</button>
+            </div>
+        </div>
+    </div>
 
     <script src="/layuiadmin/layui/layui.js"></script>
-    <script src="/layuiadmin/modules_main/PosMerchantInfosList_Admin.js?r=@DateTime.Now.ToString("yyyyMMddHHmmss")"></script>
+    <script
+        src="/layuiadmin/modules_main/PosMerchantInfosList_Admin.js?r=@DateTime.Now.ToString("yyyyMMddHHmmss")"></script>
 </body>
+
 </html>

wwwroot/layuiadmin/modules_main/MerchantDepositReturns_Admin.js

@@ -64,7 +64,7 @@ layui.config({
     $('#ExcelFile').change(function (e) {
         var files = e.target.files;
         excel.importExcel(files, {}, function (data) {
-            ExcelData = data[0].sheet1;
+            ExcelData = data[0].Sheet1;
         });
     });
 
@@ -321,7 +321,7 @@ layui.config({
                 cancel: function () {
                 }
             });
-            $("#excelTemp").html('<a href="/users/退押结果模板.xlsx">点击下载退押结果模板</a>');
+            $("#excelTemp").html('<a href="/users/退押结果模版.xlsx">点击下载退押结果模版</a>');
         }
         , ExportExcel: function () {
             var userdata = '';

wwwroot/layuiadmin/modules_main/PosMerchantInfosList_Admin.js

@@ -2,7 +2,7 @@ var ExcelData;
 function ConfirmImport() {
     $.ajax({
         type: "POST",
-        url: "/Admin/PosMerchantInfo/Import?r=" + Math.random(1),
+        url: "/Admin/PosMerchantInfoList/Import?r=" + Math.random(1),
         data: "ExcelData=" + encodeURIComponent(JSON.stringify(ExcelData)),
         dataType: "text",
         success: function (data) {
@@ -91,7 +91,7 @@ layui.config({
     $('#ExcelFile').change(function (e) {
         var files = e.target.files;
         excel.importExcel(files, {}, function (data) {
-            ExcelData = data[0].sheet1;
+            ExcelData = data[0].Sheet1;
         });
     });
 
@@ -103,7 +103,7 @@ layui.config({
         if (field == "Sort") {
             $.ajax({
                 type: "POST",
-                url: "/Admin/PosMerchantInfo/Sort?r=" + Math.random(1),
+                url: "/Admin/PosMerchantInfoList/Sort?r=" + Math.random(1),
                 data: "Id=" + data.Id + "&Sort=" + value,
                 dataType: "text",
                 success: function (data) {
@@ -143,7 +143,7 @@ layui.config({
             var index = layer.confirm('确定要删除吗？删除后不能恢复！', function (index) {
                 $.ajax({
                     type: "POST",
-                    url: "/Admin/PosMerchantInfo/Delete?r=" + Math.random(1),
+                    url: "/Admin/PosMerchantInfoList/Delete?r=" + Math.random(1),
                     data: "Id=" + data.Id,
                     dataType: "text",
                     success: function (data) {
@@ -192,7 +192,7 @@ layui.config({
 
                         $.ajax({
                             type: "POST",
-                            url: "/Admin/PosMerchantInfo/Edit?r=" + Math.random(1),
+                            url: "/Admin/PosMerchantInfoList/Edit?r=" + Math.random(1),
                             data: userdata,
                             dataType: "text",
                             success: function (data) {
@@ -241,7 +241,7 @@ layui.config({
                         });
                         $.ajax({
                             type: "POST",
-                            url: "/Admin/PosMerchantInfo/SycnTradeAmountDo?r=" + Math.random(1),
+                            url: "/Admin/PosMerchantInfoList/SycnTradeAmountDo?r=" + Math.random(1),
                             data: userdata,
                             dataType: "text",
                             success: function (data) {
@@ -310,7 +310,7 @@ layui.config({
                 var index = layer.confirm('确定要删除吗？删除后不能恢复！', function (index) {
                     $.ajax({
                         type: "POST",
-                        url: "/Admin/PosMerchantInfo/Delete?r=" + Math.random(1),
+                        url: "/Admin/PosMerchantInfoList/Delete?r=" + Math.random(1),
                         data: "Id=" + ids,
                         dataType: "text",
                         success: function (data) {
@@ -365,7 +365,7 @@ layui.config({
 
                         $.ajax({
                             type: "POST",
-                            url: "/Admin/PosMerchantInfo/Add?r=" + Math.random(1),
+                            url: "/Admin/PosMerchantInfoList/Add?r=" + Math.random(1),
                             data: userdata,
                             dataType: "text",
                             success: function (data) {
@@ -389,11 +389,12 @@ layui.config({
                 type: 1,
                 title: '导入',
                 maxmin: false,
-                area: ['460px', '180px'],
+                area: ['460px', '280px'],
                 content: $('#excelForm'),
                 cancel: function () {
                 }
             });
+            $("#excelTemp").html('<a href="/users/人工已退模版.xlsx">点击下载人工已退模版</a>');
         }
         , ExportExcel: function () {
             var userdata = '';
@@ -405,7 +406,7 @@ layui.config({
             });
             $.ajax({
                 type: "GET",
-                url: "/Admin/PosMerchantInfo/ExportExcel?r=" + Math.random(1),
+                url: "/Admin/PosMerchantInfoList/ExportExcel?r=" + Math.random(1),
                 data: userdata,
                 dataType: "json",
                 success: function (data) {
@@ -461,7 +462,7 @@ layui.config({
                 var index = layer.confirm('确定要开启吗？', function (index) {
                     $.ajax({
                         type: "POST",
-                        url: "/Admin/PosMerchantInfo/Open?r=" + Math.random(1),
+                        url: "/Admin/PosMerchantInfoList/Open?r=" + Math.random(1),
                         data: "Id=" + ids,
                         dataType: "text",
                         success: function (data) {
@@ -490,7 +491,7 @@ layui.config({
                 var index = layer.confirm('确定要关闭吗？', function (index) {
                     $.ajax({
                         type: "POST",
-                        url: "/Admin/PosMerchantInfo/Close?r=" + Math.random(1),
+                        url: "/Admin/PosMerchantInfoList/Close?r=" + Math.random(1),
                         data: "Id=" + ids,
                         dataType: "text",
                         success: function (data) {