Quellcode durchsuchen

待测试,添加权限按钮

DuGuYang vor 3 Jahren
Ursprung
Commit
98bb74939b

+ 29 - 3
Areas/Admin/Controllers/MainServer/MerchantDepositReturnsController.cs

@@ -283,15 +283,40 @@ 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];
-                string Id = dr[0].ToString(); // 记录Id
+                int Id = int.Parse(dr[0].ToString()); // 记录Id
                 string SeoDescription = dr[1].ToString(); // 退押订单编号
                 string AlipayAccountNo = dr[2].ToString(); // 支付宝帐号
                 string ReturnAmount = dr[3].ToString(); // 退还金额
-                string Status = dr[3].ToString(); // 审核结果
+                int Status = int.Parse(dr[4].ToString()); // 审核结果
+                var merchantDepositReturns = db.MerchantDepositReturns.FirstOrDefault(m => m.Id == Id) ?? new MerchantDepositReturns();
+                merchantDepositReturns.Status = Status;
+                merchantDepositReturns.UpdateDate = DateTime.Now;
+                merchantDepositReturns.SeoTitle = SysUserName + "-" + SysRealName;
+            }
+            db.SaveChanges();
+            return "success";
+        }
+        #endregion
+
+
+        #region 提交代付平台
+
+        /// <summary>
+        /// 提交代付平台
+        /// </summary>
+        /// <returns></returns>
+        public string Cash(string Id)
+        {
+            string[] idlist = Id.Split(new char[] { ',' });
+            var Ids = "";
+            AddSysLog(Id, "UserCashRecord", "cash");
+            db.SaveChanges();
+            foreach (string subid in idlist)
+            {
+                int id = int.Parse(subid);
                 Ids += Id + ",";
             }
             DataTable dt = OtherMySqlConn.dtable("UPDATE MerchantDepositReturns SET `Status`=3  WHERE Id IN(" + Ids.TrimEnd(',') + ")");
@@ -300,6 +325,7 @@ namespace MySystem.Areas.Admin.Controllers
             RedisDbconn.Instance.AddList("ToAlipayAccountQueue", Ids.TrimEnd(','));
             return "success";
         }
+
         #endregion
 
         #region 导出Excel

+ 8 - 4
Areas/Admin/Views/MainServer/MerchantDepositReturns/Index.cshtml

@@ -54,8 +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="OrderNo" placeholder="" autocomplete="off">
                         </div>
                     </div>
                     <div class="layui-inline">
@@ -119,17 +118,22 @@
                         <button class="layui-btn" data-type="ImportData"><i
                             class="layui-icon layui-icon-upload layuiadmin-button-btn"></i>退押结果导入</button>
                     }
+                    @if (RightInfo.Contains("," + right + "_cash,"))
+                    {
+                        <button class="layui-btn" data-type="Cash"><i
+                            class="layui-icon layui-icon-up layuiadmin-button-btn"></i>提交到代付平台</button>
+                    }
                 </div>
 
                 <table id="LAY-list-manage" lay-filter="LAY-list-manage"></table>
                 <script type="text/html" id="table-list-tools">
                     @if (RightInfo.Contains("," + right + "_edit,"))
                     {
-                                    <a class="layui-btn layui-btn-normal layui-btn-xs" lay-event="edit"><i class="layui-icon layui-icon-edit"></i>编辑</a>
+                                        <a class="layui-btn layui-btn-normal layui-btn-xs" lay-event="edit"><i class="layui-icon layui-icon-edit"></i>编辑</a>
                     }
                     @if (RightInfo.Contains("," + right + "_delete,"))
                     {
-                                    <a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="del"><i class="layui-icon layui-icon-delete"></i>删除</a>
+                                        <a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="del"><i class="layui-icon layui-icon-delete"></i>删除</a>
                     }
                     @if (RightInfo.Contains("," + right + "_edit,"))
                     {

+ 33 - 3
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: 'SeoDescription', 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 }
 
@@ -321,7 +321,7 @@ layui.config({
                 cancel: function () {
                 }
             });
-            $("#excelTemp").html('<a href="/excelfile/模板文件.xlsx">点击下载退押结果模板</a>');
+            $("#excelTemp").html('<a href="/users/退押结果模板.xlsx">点击下载退押结果模板</a>');
         }
         , ExportExcel: function () {
             var userdata = '';
@@ -399,8 +399,38 @@ layui.config({
                     });
                 });
             }
-        }
+        },Cash: 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/MerchantDepositReturns/Cash?r=" + Math.random(1),
+                        data: "Id=" + ids,
+                        dataType: "text",
+                        success: function (data) {
+                            layer.close(index);
+                            if (data == "success") {
+                                layer.msg('提交成功,请等待代付平台处理');
+                                table.reload('LAY-list-manage');
+                            } else {
+                                layer.msg(data);
+                            }
+                        }
+                    });
+                });
+            }
+        },
     };
+    
 
     $('.layui-btn').on('click', function () {
         var type = $(this).data('type');