From 982020aad9dbaa61468db815c23f95db5d278fc5 Mon Sep 17 00:00:00 2001
From: mzeros <mzuins@126.com>
Date: Mon, 9 Dec 2024 18:08:31 +0800
Subject: [PATCH] =?UTF-8?q?build(dependencies):=20=E6=9B=B4=E6=96=B0=20php?=
 =?UTF-8?q?spreadsheet=20=E7=89=88=E6=9C=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 将 phpspreadsheet 依赖从 ^3.4 升级到 ^3.6
- 优化了订单列表问题
- 优化了读取文件代码
---
 app/admin/view/queue/index.html        |    5 +
 app/order/controller/Order.php         |   88 +-
 app/order/view/order/index.html        | 1047 ++++++++++++++++--------
 app/order/view/order/index_search.html |    3 +-
 app/order/view/order/info.html         |    2 +-
 app/order/view/order/pay.html          |   49 +-
 app/order/view/order/setYes.html       |    2 +-
 app/task/controller/Task.php           |   17 +
 composer.json                          |    2 +-
 public/card/order_card.xlsx            |  Bin 0 -> 8997 bytes
 10 files changed, 837 insertions(+), 378 deletions(-)
 create mode 100644 public/card/order_card.xlsx

diff --git a/app/admin/view/queue/index.html b/app/admin/view/queue/index.html
index bd1c0f5..06a98c5 100644
--- a/app/admin/view/queue/index.html
+++ b/app/admin/view/queue/index.html
@@ -50,7 +50,12 @@
 {block name='script'}
 <script>
     $(function () {
+
+
+
+
         $('#QueueTable').layTable({
+
             even: true, height: 'full',
             sort: {field: 'loops_time desc,id', type: 'desc'},
             // 扩展数据处理，需要返回原 items 数据
diff --git a/app/order/controller/Order.php b/app/order/controller/Order.php
index eef3c0f..9879b1e 100644
--- a/app/order/controller/Order.php
+++ b/app/order/controller/Order.php
@@ -229,13 +229,25 @@ class Order extends Controller
 
             $this->success('获取数据列表成功', $result);
         } else {
-
-            // 新版本中 QueryHelper 对象支持 Layui 表格数据加载
-//            $query->order('create_at desc')->layTable(function(QueryHelper $query){
-                // 前置操作，处理 HTML 模型
+//            // 新版本中 QueryHelper 对象支持 Layui 表格数据加载
+//            $query->layTable(function(QueryHelper $query){
+//                // 前置操作，处理 HTML 模型
 //            });
 
-            $res= $query->order('create_at desc')->page();
+            // 新版本中 QueryHelper 对象支持 Layui 表格数据加载
+            $query->order('create_at desc')->layTable(function(QueryHelper $query){
+                $this->clist = OrderService::instance()->getChannelList(true);
+                $this->mlist = OrderService::instance()->getMerchantList(true);
+                $this->plist = OrderService::instance()->getProductList(true);
+                $this->pkeylist = OrderService::instance()->getProductKeyList(true);
+                $this->search = $this->getConfig();
+
+            },function(QueryHelper $query){
+//                $vo['isp_name'] = $this->isp[$vo['isp']];
+                // 后置操作，处理表格数据
+            });
+
+//            $res= $query->order('create_at desc')->page();
 
         }
 
@@ -1277,9 +1289,12 @@ class Order extends Controller
         } else {
             $this->error('请上传文件');
         }
+//        var_dump($data);die;
 
         if (str_contains($data['file']['name'], '.xls')) {
             $file = 'card/order_card.xlsx';
+        } elseif (str_contains($data['file']['name'], '.xlsx')) {
+            $file = 'card/order_card.xlsx';
         } else {
             $file = 'card/order_card.txt';
         }
@@ -1287,11 +1302,16 @@ class Order extends Controller
         if (is_file($file)) {
             @unlink($file);
         }
+        $file =dirname(__DIR__, 3).'/public/'.$file;
+//        var_dump($s);die;
+;
+//        $file=$data['file']['tmp_name'];
         copy($data['file']['tmp_name'], $file);
 
         if (is_file($file)) {
 
             $data = $this->read($file);
+//            var_dump($data);die;
 
             $yes = 0;
             $no = 0;
@@ -1376,30 +1396,19 @@ class Order extends Controller
             }
             return $result;
         }
-        include('../excel/PHPExcel.php');
-
-        $objRead = new \PHPExcel_Reader_Excel2007();
-        if (!$objRead->canRead($file)) {
-            $objRead = new \PHPExcel_Reader_Excel5();
-            if (!$objRead->canRead($file)) {
-                Export::alert('file not exists!');
-            }
-        }
-        $sheet = 0;
-        $offset = 0;
-
-        $obj = $objRead->load($file);
-        $currSheet = $obj->getSheet($sheet);
-        $columnH = $currSheet->getHighestColumn();
+        $spreadsheet = IOFactory::load($file);
+        $sheet = $spreadsheet->getActiveSheet();               // 获取表格
+        $highestRow = $sheet->getHighestRow();                 // 取得总行数
+        $columnH = $sheet->getHighestColumn();
         $columnCnt = array_search($columnH, $this->cell);
-        $rowCnt = $currSheet->getHighestRow();
+        $rowCnt = $sheet->getHighestRow();
 
         $data = array();
         for ($_row = 1; $_row <= $rowCnt; $_row++) {
             for ($_column = 0; $_column <= $columnCnt; $_column++) {
                 $cellId = $this->cell[$_column].$_row;
                 //$cellValue = $currSheet->getCell($cellId)->getValue();
-                $cellValue = $currSheet->getCell($cellId)->getCalculatedValue();
+                $cellValue = $sheet->getCell($cellId)->getCalculatedValue();
                 if ($cellValue instanceof \PHPExcel_RichText) {
                     $cellValue = $cellValue->__toString();
                 }
@@ -1408,6 +1417,41 @@ class Order extends Controller
         }
 
         return $data;
+
+
+//
+//        include('../excel/PHPExcel.php');
+//
+//        $objRead = new \PHPExcel_Reader_Excel2007();
+//        if (!$objRead->canRead($file)) {
+//            $objRead = new \PHPExcel_Reader_Excel5();
+//            if (!$objRead->canRead($file)) {
+//                Export::alert('file not exists!');
+//            }
+//        }
+//        $sheet = 0;
+//        $offset = 0;
+//
+//        $obj = $objRead->load($file);
+//        $currSheet = $obj->getSheet($sheet);
+//        $columnH = $currSheet->getHighestColumn();
+//        $columnCnt = array_search($columnH, $this->cell);
+//        $rowCnt = $currSheet->getHighestRow();
+//
+//        $data = array();
+//        for ($_row = 1; $_row <= $rowCnt; $_row++) {
+//            for ($_column = 0; $_column <= $columnCnt; $_column++) {
+//                $cellId = $this->cell[$_column].$_row;
+//                //$cellValue = $currSheet->getCell($cellId)->getValue();
+//                $cellValue = $currSheet->getCell($cellId)->getCalculatedValue();
+//                if ($cellValue instanceof \PHPExcel_RichText) {
+//                    $cellValue = $cellValue->__toString();
+//                }
+//                $data[$_row][$this->cell[$_column]] = $cellValue;
+//            }
+//        }
+//
+//        return $data;
     }
 
     # 批量上传充值文件
diff --git a/app/order/view/order/index.html b/app/order/view/order/index.html
index 4e3e212..b3172df 100644
--- a/app/order/view/order/index.html
+++ b/app/order/view/order/index.html
@@ -3,344 +3,694 @@
 
 <a class='layui-btn layui-btn-sm layui-btn-primary' id="upload" style="margin: 10px;">批量手动充值</a>
 <a id="restart" class='layui-btn layui-btn-sm layui-btn-primary'>将暂停中订单重新启动</a>
-<a id="errorToTiancheng" class='layui-btn layui-btn-sm layui-btn-primary' style="display: none;">八达通失败订单转到天成</a>
-
-
-{if input('set_callback') == 1}
-<a data-confirm="确定要把已勾选的订单置成功吗？" data-action="{:url('set')}" data-rule="order_id#{key};status#2;data_type#{$data_type}" data-csrf="{:systoken('set')}" class='layui-btn layui-btn-sm'>批量置成功</a>
-
-<a data-confirm="确定要把已勾选的订单置失败吗？" data-action="{:url('set')}" data-rule="order_id#{key};status#3;data_type#{$data_type}" data-csrf="{:systoken('set')}" class='layui-btn layui-btn-sm layui-btn-danger'>批量置失败</a>
-
-<a data-confirm="确定要把已勾选的订单重新启动吗？" data-action="{:url('set_restart')}" data-rule="order_id#{key}" data-csrf="{:systoken('set_restart')}" class='layui-btn layui-btn-sm'>批量重新启动</a>
-
-{/if}
-
+<a id="errorToTiancheng" class='layui-btn layui-btn-sm layui-btn-primary'
+   style="display: none;">八达通失败订单转到天成</a>
 
 
 {/block}
 
 
-
 {block name="content"}
-<div class="layui-tab layui-tab-card think-bg-white table-block">
 
-    <div class="layui-tab-content think-box-shadow table-block table-block">
-        {include file='order/index_search'}
-        {include file='order/statement'}
+<div class="think-box-shadow">
+    {include file='order/index_search'}
 
+    {include file='order/statement'}
 
-        <div style="min-width:1rem;overflow-x:auto;" class="tableAll">
-        <table class="layui-table margin-top-10" lay-skin="line" id="order-table-data-list">
-            {notempty name='list'}
-            <thead>
-            <tr>
-                <th class='list-table-check-td think-checkbox leftfix'>
-                    <label><input data-auto-none data-check-target='.list-check-box' type='checkbox'></label>
-                </th>
-                <th class='text-left nowrap leftfixx' width="">序号</th>
-                <th class='text-left nowrap' width="">商户</th>
-                <th class='text-left nowrap' width="">系统订单号</th>
-                <th class='text-left nowrap' width="">商户订单号</th>
-                <th class='text-left nowrap' width="">充值账号</th>
-                <th class='text-left nowrap' width="">总面值</th>
-                <th class='text-left nowrap' width="">数量</th>
-                <th class='text-left nowrap' width="">单面值</th>
-                <th class='text-left nowrap' width="">官方流水号</th>
-                <th class='text-left nowrap' width="">订单状态</th>
-                <th class='text-left nowrap' width="">下单时间</th>
-                <th class='text-left nowrap' width="">耗时</th>
-                <th class='text-left nowrap' width="">同步结果</th>
-                <th class='text-left nowrap '>充值结果</th>
-                <th class='text-left nowrap rightfix'>订单操作</th>
-            </tr>
-            </thead>
-            {/notempty}
-            <tbody>
-            {foreach $list as $key=>$vo}
-            <tr>
-                <td class='list-table-check-td think-checkbox leftfix' >
-                    <label><input class="list-check-box" value='{$vo.id}' type='checkbox'></label>
-                </td>
-                <td class='text-left nowrap leftfixx'><span>{$vo.index|default=''}</span></td>
-                <td class='text-left nowrap'>{$vo.minfo.name|default=''}
-                    ( <span class="color-desc">{$vo.minfo.id|default=''}</span>
-                    {eq name='vo.minfo.status' value='0'}/<span class="color-red">禁</span>{/eq}
-                    {eq name='vo.minfo.is_deleted' value='1'}/<span class="color-red">删</span>{/eq} )
-
-                    {if $vo.project_id}
-                    <br />
-                    通道：{$vo.project.name|default=''}
-                    ( <span class="color-desc">{$vo.project.id|default=''}</span>
-                    {eq name='vo.project.status' value='0'}/<span class="color-red">禁</span>{/eq} )
-                    {/if}
-
-                    <br />
-                    渠道：{$vo.cinfo.name|default=''} ( <span class="color-desc">{$vo.cinfo.id|default=''}</span>{eq name='vo.cinfo.status' value='0'}/<span class="color-red">禁</span>{/eq}{eq name='vo.cinfo.is_deleted' value='1'}/<span class="color-red">删</span>{/eq} )
-
-                    <br />
-                    {if $vo.pinfo}
-                    商品：{$vo.pinfo.name|default=''}
-                    ( <span class="color-desc">{$vo.pinfo.id|default=''}</span>
-                    {eq name='vo.pinfo.status' value='0'}/<span class="color-red">禁</span>{/eq}
-                    {eq name='vo.pinfo.is_deleted' value='1'}/<span class="color-red">删</span>{/eq} )
-                    {else/}
-                    商品：
-                    {/if}
-                </td>
-
-                <td class='text-left nowrap'>
-                    {eq name='$vo.apply_refund' value='1'}<button type="button" class="layui-btn layui-bg-red layui-btn-xs" style="border: none;margin-right: 5px;cursor: auto">拦</button>{/eq}
-                    {eq name='$vo.apply_refund' value='2'}<button type="button" class="layui-btn layui-bg-red layui-btn-xs" style="border: none;margin-right: 5px;cursor: auto">忙</button>{/eq}
-                    {eq name='$vo.apply_refund' value='3'}<span>C</span>{/eq}
-                    <span>{$vo.order_id|default=''}</span>
-                    {if $vo.num > 0}
-                    <br />
-                    <span>复冲次数：{$vo.num|default=''}</span>
-                    {/if}
-                </td>
-
-                <td class='text-left nowrap'>
-
-                    <span>{$vo.merchant_order_id|default=''}</span>
-
-                </td>
-
-                <td class='text-left nowrap'><span>{$vo.account|default=''}</span>{if $vo.product_key == 'dhcz' && $vo.isp > 0}<br />{$isp[$vo.isp]}{/if}</td>
-                <td class='text-left nowrap'><span>{$vo.cash|number_format=###, 2, '.', ''}</span>{if $vo.show_set == 1} / {$vo.actual_cash|number_format=###, 2, '.', ''} / {$vo.product_cash|number_format=###, 2, '.', ''}{/if}</td>
-                <td class='text-left nowrap'><span>{$vo.buy_num|default=''}</span></td>
-                <td class='text-left nowrap'><span>{$vo.one_cash|default=''}</span></td>
-                <td class='text-left nowrap'><span>{$vo.s_number|default=''}</span></td>
-                <td class='text-left nowrap'>
-
-                    {if $vo.other}
-                    <table class="layui-table margin-top-10" lay-skin="line">
-                        <thead>
-                        <tr>
-                            <th class='text-left nowrap' width="">渠道名</th>
-                            <th class='text-left nowrap' width="">订单号</th>
-                            <th class='text-left nowrap' width="">充值状态</th>
-                        </tr>
-                        </thead>
-                        <tbody>
-                        {foreach $vo.other as $k=>$v}
-                        <tr>
-                            <td class='text-left nowrap' width="">
-                                {$v.cinfo.name|default=''} ( <span class="color-desc">{$v.cinfo.id|default=''}</span>{eq name='v.cinfo.status' value='0'}/<span class="color-red">禁</span>{/eq}{eq name='v.cinfo.is_deleted' value='1'}/<span class="color-red">删</span>{/eq} )
-                            </td>
-                            <td class='text-left nowrap' width=""><span>{$v.channel_order_id|default=''}</span></td>
-                            <td class='text-left nowrap' width="">
-                                {eq name='v.status' value='-8'}<span data-modal="{:url('info')}?id={$vo.id}&data_type={$data_type}" class="color-span color-span-gray">重提排队中</span>{/eq}
-                                {eq name='v.status' value='-6'}<span data-modal="{:url('info')}?id={$v.id}&data_type=3" class="color-span color-span-gray">冻结中</span>{/eq}
-                                {eq name='v.status' value='-5'}<span data-modal="{:url('info')}?id={$v.id}&data_type=3" class="color-span color-span-gray">暂停中</span>{/eq}
-                                {eq name='v.status' value='-4'}<span data-modal="{:url('info')}?id={$v.id}&data_type=3" class="color-span color-span-gray">复充排队中</span>{/eq}
-                                {eq name='v.status' value='-3'}<span data-modal="{:url('info')}?id={$v.id}&data_type=3" class="color-span color-span-gray">排队中</span>{/eq}
-                                {eq name='v.status' value='-2'}<span data-modal="{:url('info')}?id={$v.id}&data_type=3" class="color-span color-span-red">失败，需手动处理</span>{/eq}
-                                {eq name='v.status' value='-1'}<span data-modal="{:url('info')}?id={$v.id}&data_type=3" class="color-span color-span-gray">队列中</span>{/eq}
-                                {eq name='v.status' value='1'}<span data-modal="{:url('info')}?id={$v.id}&data_type=3" class="color-span color-span-gray">下单</span>{/eq}
-                                {eq name='v.status' value='2'}<span data-modal="{:url('info')}?id={$v.id}&data_type=3" class="color-span color-span-green">充值成功</span>{/eq}
-                                {eq name='v.status' value='3'}<span data-modal="{:url('info')}?id={$v.id}&data_type=3" class="color-span color-span-red">充值失败</span>{/eq}
-                                {eq name='v.status' value='4'}<span data-modal="{:url('info')}?id={$v.id}&data_type=3" class="color-span color-span-blue">处理中</span>{/eq}
-                                {eq name='v.status' value='5'}<span data-modal="{:url('info')}?id={$v.id}&data_type=3" class="color-span color-span-red">存疑</span>{/eq}
-                                {eq name='v.status' value='6'}<span data-modal="{:url('info')}?id={$v.id}&data_type=3" class="color-span color-span-blue">处理中</span>{/eq}
-                                {eq name='v.status' value='7'}<span
-                                    class="color-span color-span-blue"
-                                    data-modal="{:url('info')}?id={$v.id}&data_type=3">提卡成功待处理</span>{/eq}
-                            </td>
-                        </tr>
-                        {/foreach}
-
-                        <tr>
-                            <td class='text-left nowrap' width="">
-                                {$vo.cinfo.name|default=''} ( <span class="color-desc">{$vo.cinfo.id|default=''}</span>{eq name='vo.cinfo.status' value='0'}/<span class="color-red">禁</span>{/eq}{eq name='vo.cinfo.is_deleted' value='1'}/<span class="color-red">删</span>{/eq} )
-                            </td>
-                            <td class='text-left nowrap' width=""><span>{$vo.channel_order_id|default=''}</span></td>
-                            <td class='text-left nowrap' width="">
-                                {eq name='vo.status' value='-8'}<span data-modal="{:url('info')}?id={$vo.id}&data_type={$data_type}" class="color-span color-span-gray">重提排队中</span>{/eq}
-                                {eq name='vo.status' value='-6'}<span data-modal="{:url('info')}?id={$vo.id}&data_type={$data_type}" class="color-span color-span-gray">冻结中</span>{/eq}
-                                {eq name='vo.status' value='-5'}<span data-modal="{:url('info')}?id={$vo.id}&data_type={$data_type}" class="color-span color-span-gray">暂停中</span>{/eq}
-                                {eq name='vo.status' value='-4'}<span data-modal="{:url('info')}?id={$vo.id}&data_type={$data_type}" class="color-span color-span-gray">复充排队中</span>{/eq}
-                                {eq name='vo.status' value='-3'}<span data-modal="{:url('info')}?id={$vo.id}&data_type={$data_type}" class="color-span color-span-gray">排队中</span>{/eq}
-                                {eq name='vo.status' value='-2'}<span data-modal="{:url('info')}?id={$vo.id}&data_type={$data_type}" class="color-span color-span-red">失败，需手动处理</span>{/eq}
-                                {eq name='vo.status' value='-1'}<span data-modal="{:url('info')}?id={$vo.id}&data_type={$data_type}" class="color-span color-span-gray">队列中</span>{/eq}
-                                {eq name='vo.status' value='1'}<span data-modal="{:url('info')}?id={$vo.id}&data_type={$data_type}" class="color-span color-span-gray">下单</span>{/eq}
-                                {eq name='vo.status' value='2'}<span data-modal="{:url('info')}?id={$vo.id}&data_type={$data_type}" class="color-span color-span-green">充值成功</span>{/eq}
-                                {eq name='vo.status' value='3'}<span data-modal="{:url('info')}?id={$vo.id}&data_type={$data_type}" class="color-span color-span-red">充值失败</span>{/eq}
-                                {eq name='vo.status' value='4'}<span data-modal="{:url('info')}?id={$vo.id}&data_type={$data_type}" class="color-span color-span-blue">处理中</span>{/eq}
-                                {eq name='vo.status' value='5'}<span data-modal="{:url('info')}?id={$vo.id}&data_type={$data_type}" class="color-span color-span-red">存疑</span>{/eq}
-                                {eq name='vo.status' value='6'}<span data-modal="{:url('info')}?id={$vo.id}&data_type={$data_type}" class="color-span color-span-blue">处理中</span>{/eq}
-                                {eq name='vo.status' value='7'}<span
-                                    class="color-span color-span-blue"
-                                    data-modal="{:url('info')}?id={$vo.id}&data_type={$data_type}">提卡成功待处理</span>{/eq}
-                            </td>
-                        </tr>
-
-                        </tbody>
-                    </table>
-
-                    {else}
-                    {eq name='vo.status' value='-8'}<span data-modal="{:url('info')}?id={$vo.id}&data_type={$data_type}" class="color-span color-span-gray">重提排队中</span>{/eq}
-                    {eq name='vo.status' value='-6'}<span data-modal="{:url('info')}?id={$vo.id}&data_type={$data_type}" class="color-span color-span-gray">冻结中</span>{/eq}
-                    {eq name='vo.status' value='-5'}<span data-modal="{:url('info')}?id={$vo.id}&data_type={$data_type}" class="color-span color-span-gray">暂停中</span>{/eq}
-                    {eq name='vo.status' value='-4'}<span data-modal="{:url('info')}?id={$vo.id}&data_type={$data_type}" class="color-span color-span-gray">复充排队中</span>{/eq}
-                    {eq name='vo.status' value='-3'}<span data-modal="{:url('info')}?id={$vo.id}&data_type={$data_type}" class="color-span color-span-gray">排队中</span>{/eq}
-                    {eq name='vo.status' value='-2'}<span data-modal="{:url('info')}?id={$vo.id}&data_type={$data_type}" class="color-span color-span-red">失败，需手动处理</span>{/eq}
-                    {eq name='vo.status' value='-1'}<span data-modal="{:url('info')}?id={$vo.id}&data_type={$data_type}" class="color-span color-span-gray">队列中</span>{/eq}
-                    {eq name='vo.status' value='1'}<span data-modal="{:url('info')}?id={$vo.id}&data_type={$data_type}" class="color-span color-span-gray">下单</span>{/eq}
-                    {eq name='vo.status' value='2'}<span data-modal="{:url('info')}?id={$vo.id}&data_type={$data_type}" class="color-span color-span-green">充值成功</span>{/eq}
-                    {eq name='vo.status' value='3'}<span data-modal="{:url('info')}?id={$vo.id}&data_type={$data_type}" class="color-span color-span-red">充值失败</span>{/eq}
-                    {eq name='vo.status' value='4'}<span data-modal="{:url('info')}?id={$vo.id}&data_type={$data_type}" class="color-span color-span-blue">处理中</span>{/eq}
-                    {eq name='vo.status' value='5'}<span data-modal="{:url('info')}?id={$vo.id}&data_type={$data_type}" class="color-span color-span-red">存疑</span>{/eq}
-                    {eq name='vo.status' value='6'}<span data-modal="{:url('info')}?id={$vo.id}&data_type={$data_type}" class="color-span color-span-blue">处理中</span>{/eq}
-                    {eq name='vo.status' value='7'}<span class="color-span color-span-blue" data-modal="{:url('info')}?id={$vo.id}&data_type={$data_type}">提卡成功待处理</span>{/eq}
-                    {/if}
-
-
-                    {if $vo.card}
-                    <br />
-                    卡号：<span>{$vo.card.cnum|default=''}</span>
-                    <br />
-                    失败：<span>{$vo.card_error|default=''}</span>次
-                    {/if}
-                </td>
-                <td class='text-left nowrap'><span>{$vo.create_at}</span></td>
-                <td class='text-left nowrap' style="display:none;">请求：<span>{$vo.create_at|format_datetime}</span><br />回调：<span>{$vo.channel_callback_at|format_datetime}</span></td>
-                <td class='text-left nowrap'><span>{$vo.time|default=''}</span></td>
-                <td class='text-left nowrap'><span>{$vo.merchant_callback_msg|default=''}</span></td>
-                <td class='text-left'><span>{$vo.msg|default=''}</span></td>
-                <td class='text-left nowrap rightfix' style="border-left: 2px #EEEEEE solid !important;">
-
-                    <!--{if $vo.show_set == 1 || $vo.status == -2 || $vo.status == 5}-->
-                    {if $vo.show_set == 1}
-                    <a> 已发回调通知次数：{$vo.merchant_callback_num}次</a>
-                    {/if}
-                    <br />
-
-                    {if $vo.status == 4}
-                    <a class="layui-btn layui-btn-xs" data-confirm="确定要冻结吗？冻结的订单无法向下游推送回调" data-action="{:url('set')}?order_id={$vo.id}&status=-6&data_type={$data_type}" data-value="id#{$vo.id}">冻结</a>
-
-                    {elseif $vo.status == -6}
-                    <a class="layui-btn layui-btn-xs" data-confirm="确定要取消冻结吗？取消后的订单变成处理中，可以继续向下游推送回调" data-action="{:url('set')}?order_id={$vo.id}&status=4&data_type={$data_type}" data-value="id#{$vo.id}">取消冻结</a>
-                    {/if}
-
-                    {if $vo.suoka_status == 1}
-                    <a class="layui-btn layui-btn-xs" data-action="{:url('suoka')}?order_id={$vo.id}&type=1&data_type={$data_type}"
-                       data-confirm="确定要锁卡吗"
-                       data-value="id#{$vo.id}">锁卡</a>
-                    {elseif $vo.suoka_status == 2}
-                    <a class="layui-btn layui-btn-xs" data-action="{:url('suoka')}?order_id={$vo.id}&type=0&data_type={$data_type}"
-                       data-confirm="确定要解锁吗"
-                       data-value="id#{$vo.id}">解锁</a>
-                    {/if}
-
-                    {if $vo.set_black_status == 1}
-                    <a class="layui-btn layui-btn-xs layui-btn-danger" data-action="{:url('setBlack')}?order_id={$vo.id}&black_status=2&data_type={$data_type}"
-                       data-confirm="确定要把这个用户拉入黑名单吗？"
-                       data-value="id#{$vo.id}">拉黑</a>
-                    {elseif $vo.set_black_status ==2}
-                    <a class="layui-btn layui-btn-xs" data-action="{:url('setBlack')}?order_id={$vo.id}&black_status=1&data_type={$data_type}"
-                       data-confirm="确定要把这个用户拉出黑名单吗"
-                       data-value="id#{$vo.id}">已拉黑，解禁</a>
-                    {/if}
-
-
-
-                    {if $vo.card_status == 1}
-                    <a class="layui-btn layui-btn-xs layui-btn-normal"  data-title="设置卡密"  data-modal='{:url("setCard")}?order_id={$vo.id}&status=2&data_type={$data_type}' data-csrf="{:systoken('pass')}">置成功</a>
-
-                    {elseif $vo.card_status == 3}
-                    <a class="layui-btn layui-btn-xs layui-btn-normal"  data-csrf="{:systoken('pass')}"
-                       data-modal='{:url("setKami")}?order_id={$vo.id}&status=2&data_type={$data_type}'
-                       data-title="手动置成功">置成功</a>
-
-                    {else}
-                    <a class="layui-btn layui-btn-xs layui-btn-normal"  data-title="手动置成功"  data-modal='{:url("setYes")}?order_id={$vo.id}&status=2&data_type={$data_type}' data-csrf="{:systoken('pass')}">置成功</a>
-                    <!--<a class="layui-btn layui-btn-xs" data-confirm="确定要置成功吗？" data-action="{:url('set')}?order_id={$vo.id}&status=2&data_type={$data_type}" data-value="id#{$vo.id}">置成功</a>-->
-                    {/if}
-
-                    <a class="layui-btn layui-btn-xs layui-btn-danger" data-confirm="确定要置失败吗？" data-action="{:url('set')}?order_id={$vo.id}&status=3&data_type={$data_type}" data-value="id#{$vo.id}">置失败</a>
-                    <!--
-                    <a class="layui-btn layui-btn-xs layui-btn-danger" data-confirm="确定要置疑似吗？" data-action="{:url('set')}?order_id={$vo.id}&status=5&data_type={$data_type}" data-value="id#{$vo.id}">置疑似</a>
-                    -->
-
-                    {if $vo.status == 5}
-                    <a class="layui-btn layui-btn-xs layui-btn-danger" data-confirm="确定要复充吗？" data-action="{:url('order')}?order_id={$vo.id}&data_type={$data_type}" data-value="id#{$vo.id}">复充</a>
-
-                    {elseif ($vo.status == -5)}
-                    <a class="layui-btn layui-btn-xs layui-btn-danger" data-confirm="确定要重提吗？" data-action="{:url('set_restart')}?order_id={$vo.id}&data_type={$data_type}" data-value="id#{$vo.id}">重提</a>
-
-                    {elseif ($vo.status == 2 || $vo.status == 3 || $vo.status == 5)}
-                    <a class="layui-btn layui-btn-xs layui-btn-danger" data-confirm="确定要手动发起回调通知吗？" data-action="{:url('call')}?order_id={$vo.id}&data_type={$data_type}" data-value="id#{$vo.id}">发回调</a>
-                    {/if}
-
-                    {if $vo.actual_cash <= 0 && $vo.status == 2}
-                    <a class="layui-btn layui-btn-xs layui-btn-danger" data-confirm="确定要手动发起手动扣款吗？" data-action="{:url('kou')}?order_id={$vo.id}&data_type={$data_type}" data-value="id#{$vo.id}">手动扣款</a>
-                    {/if}
-                    {if $vo.status== 5}
-                    <a class="layui-btn layui-btn-xs layui-btn-danger" data-confirm="确定要取消订单吗？" data-action="{:url('cancel')}?order_id={$vo.id}&data_type={$data_type}" data-value="id#{$vo.id}">取消订单</a>
-                    {/if}
-
-                    {if $vo.show_refund == 1}
-                    <a class="layui-btn layui-btn-xs layui-btn-danger" data-confirm="确定要申请拦截订单吗？" data-action="{:url('apply_refund')}?order_id={$vo.id}&data_type={$data_type}&apply_refund_type=1" data-value="id#{$vo.id}">申请拦截</a>
-                    {elseif $vo.show_refund == 2}
-
-                    {/if}
-                    <!--{/if}-->
-
-                    <!-- {/if} -->
-                </td>
-            </tr>
-            {/foreach}
-            </tbody>
-        </table>
-            {empty name='list'}<span style="height: 52vh;font-size: 2em;padding-top: 40px" class="notdata">没有记录哦</span>{else}{$pagehtml|raw|default=''}{/empty}
-        </div>
-
-
-    </div>
+    <table id="OrderList" data-target-search="form.form-search"></table>
 </div>
-<style type="text/css">
+{/block}
 
-    .layui-badge {
-        line-height: 19px;/
-        box-shadow: 0 0px 0px 0 rgba(0,0,0,0.15);
-    }
-    .tableAll{
-        height: 60vh;
-        overflow-x: auto;
-        position: relative;
-        padding-bottom: 10px;
-    }
+{block name='script'}
+<script type="text/html" id="toolbarDemo">
+    <div class="layui-btn-container" id="buttonContainer" style="display:none;">
+        <button class="layui-btn layui-btn-sm" lay-event="setSuccess">批量置成功</button>
+        <button class="layui-btn layui-btn-sm layui-btn-danger" lay-event="setFail">批量置失败</button>
+        <button class="layui-btn layui-btn-sm layui-btn-normal" lay-event="setRestart">批量重新启动</button>
+    </div>
+</script>
+<script type="text/html" id="toolbar">
+    {{# if(d.show_set == 1 || d.status == -2 || d.status == 5){  }}
+    {{# if(d.show_set == 1){ }}
+    <a> 已发回调通知次数：{{d.merchant_callback_num}}次</a>
+    {{# } }}
+    <br/>
+
+    {{# if (d.status == 4){ }}
+    <a class="layui-btn layui-btn-xs" data-confirm="确定要冻结吗？冻结的订单无法向下游推送回调"
+       data-action="{:url('set')}?order_id={{d.id}}&status=-6&data_type={$data_type}" data-value="id#{{d.id}}">冻结</a>
+
+    {{# }else if(d.status == -6){ }}
+    <a class="layui-btn layui-btn-xs" data-confirm="确定要取消冻结吗？取消后的订单变成处理中，可以继续向下游推送回调"
+       data-action="{:url('set')}?order_id={{d.id}}&status=4&data_type={$data_type}"
+       data-value="id#{{d.id}}">取消冻结</a>
+    {{# } }}
+
+    {{# if(d.suoka_status == 1){ }}
+    <a class="layui-btn layui-btn-xs" data-action="{:url('suoka')}?order_id={{d.id}}&type=1&data_type={$data_type}"
+       data-confirm="确定要锁卡吗"
+       data-value="id#{{d.id}}">锁卡</a>
+    {{# }else if(d.suoka_status == 2){ }}
+    <a class="layui-btn layui-btn-xs" data-action="{:url('suoka')}?order_id={{d.id}}&type=0&data_type={$data_type}"
+       data-confirm="确定要解锁吗"
+       data-value="id#{{d.id}}">解锁</a>
+    {{# } }}
+
+    {{# if(d.set_black_status == 1){ }}
+    <a class="layui-btn layui-btn-xs layui-btn-danger"
+       data-action="{:url('setBlack')}?order_id={{d.id}}&black_status=2&data_type={$data_type}"
+       data-confirm="确定要把这个用户拉入黑名单吗？"
+       data-value="id#{{d.id}}">拉黑</a>
+    {{# }else if(d.set_black_status ==2){ }}
+    <a class="layui-btn layui-btn-xs"
+       data-action="{:url('setBlack')}?order_id={{d.id}}&black_status=1&data_type={$data_type}"
+       data-confirm="确定要把这个用户拉出黑名单吗"
+       data-value="id#{{d.id}}">已拉黑，解禁</a>
+    {{# } }}
+
+
+    {{# if(d.card_status == 1){ }}
+    <a class="layui-btn layui-btn-xs layui-btn-normal" data-title="设置卡密"
+       data-modal='{:url("setCard")}?order_id={{d.id}}&status=2&data_type={$data_type}' data-csrf="{:systoken('pass')}">置成功</a>
+
+    {{# }else if(d.card_status == 3){ }}
+    <a class="layui-btn layui-btn-xs layui-btn-normal" data-csrf="{:systoken('pass')}"
+       data-modal='{:url("setKami")}?order_id={{d.id}}&status=2&data_type={$data_type}'
+       data-title="手动置成功">置成功</a>
+
+    {{# }else{ }}
+    <a class="layui-btn layui-btn-xs layui-btn-normal" data-title="手动置成功"
+       data-modal='{:url("setYes")}?order_id={{d.id}}&status=2&data_type={$data_type}' data-csrf="{:systoken('pass')}">置成功</a>
+
+    {{# } }}
+
+    <a class="layui-btn layui-btn-xs layui-btn-danger" data-confirm="确定要置失败吗？"
+       data-action="{:url('set')}?order_id={{d.id}}&status=3&data_type={$data_type}" data-value="id#{{d.id}}">置失败</a>
+
+
+    {{# if(d.status == 5){ }}
+    <a class="layui-btn layui-btn-xs layui-btn-danger" data-confirm="确定要复充吗？"
+       data-action="{:url('order')}?order_id={{d.id}}&data_type={$data_type}" data-value="id#{{d.id}}">复充</a>
+
+    {{# }else if (d.status == -5){ }}
+    <a class="layui-btn layui-btn-xs layui-btn-danger" data-confirm="确定要重提吗？"
+       data-action="{:url('set_restart')}?order_id={{d.id}}&data_type={$data_type}" data-value="id#{{d.id}}">重提</a>
+
+    {{# }else if (d.status == 2 || d.status == 3 || d.status == 5){ }}
+    <a class="layui-btn layui-btn-xs layui-btn-danger" data-confirm="确定要手动发起回调通知吗？"
+       data-action="{:url('call')}?order_id={{d.id}}&data_type={$data_type}" data-value="id#{{d.id}}">发回调</a>
+    {{# } }}
+
+    {{# if (d.actual_cash <= 0 && d.status == 2){ }}
+    <a class="layui-btn layui-btn-xs layui-btn-danger" data-confirm="确定要手动发起手动扣款吗？"
+       data-action="{:url('kou')}?order_id={{d.id}}&data_type={$data_type}" data-value="id#{{d.id}}">手动扣款</a>
+    {{# } }}
+    {{# if(d.status== 5){ }}
+    <a class="layui-btn layui-btn-xs layui-btn-danger" data-confirm="确定要取消订单吗？"
+       data-action="{:url('cancel')}?order_id={{d.id}}&data_type={$data_type}" data-value="id#{{d.id}}">取消订单</a>
+    {{# } }}
+
+    {{# if(d.show_refund == 1){ }}
+    <a class="layui-btn layui-btn-xs layui-btn-danger" data-confirm="确定要申请拦截订单吗？"
+       data-action="{:url('apply_refund')}?order_id={{d.id}}&data_type={$data_type}&apply_refund_type=1"
+       data-value="id#{{d.id}}">申请拦截</a>
+    {{# } }}
+
+    {{# } }}
+
+</script>
+
+
+<script>
+
+    $(function () {
+        function GetQueryString(name) {
+            try {
+                var currentUrl = window.location.href;
+                var temp = currentUrl.split('?');
+
+                if (temp.length > 1) {
+                    var params = temp[1].split('&');
+                    for (var i = 0; i < params.length; i++) {
+                        var param = params[i].split('=');
+                        if (decodeURIComponent(param[0]) === name) {
+                            return decodeURIComponent(param[1]);
+                        }
+                    }
+                }
+            } catch (error) {
+                console.error('Error parsing query string:', error);
+            }
+
+            return null;
+        }
+
+
+        // 获取 URL 参数
+        var set_callback = GetQueryString('set_callback'); // 替换为实际参数名
+        console.log(set_callback);
+
+
+        // 动态创建 layui.table 表格
+        $('#OrderList').layTable({
+
+
+            url: '{:sysuri()}',
+            toolbar: '#toolbarDemo',
+
+            // console: console.log(),
+
+            where: {set_callback: set_callback},
+            // totalRow: true, // 开启合计行
+
+
+            even: true, height: 'full',
+            sort: {field: 'id', type: 'desc'},
+            lineStyle: 'height: auto;',
+            limits: [10, 20, 30, 50, 60, 70, 80, 90, 100, 150, 200, 500],
+
+            cols: [[
+                {checkbox: true, field: 'id', fixed: 'left'},
+                // {field: 'index', title: '序号', width: 70, sort: true, align: 'center', fixed: 'left',totalRow: '合计：'},
+                {field: 'index', title: '序号', width: 70, sort: true, align: 'center', fixed: 'left'},
+
+                {
+                    field: 'minfo', title: '商户', minWidth: 100, fixed: 'left', templet: function (d) {
+                        // console.log(d);
+                        d.d_msg = '<b>{{d.minfo.name}}</b>( <span class="color-desc">{{d.minfo.id}}</span> )';
+                        if (d.minfo.status === 0) {
+                            d.d_msg = '商家：<b>{{d.minfo.name}}</b>( <span class="color-desc">{{d.minfo.id}}</span> ) <span class="layui-badge think-bg-red">禁</span>';
+                        } else if (d.minfo.is_deleted === 1) {
+                            d.d_msg = '商家：<b>{{d.minfo.name}}</b>( <span class="color-desc">{{d.minfo.id}}</span> ) <span class="layui-badge think-bg-red">删</span>';
+                        }
+
+                        if (d.project_id) {
+                            d.d_msg += '<br>通道：<b>{{d.project.name}}</b>( <span class="color-desc">{{d.project.id}}</span> )';
+                            if (d.project.status === 0) {
+                                d.d_msg += '<span class="color-red">禁</span>';
+                            }
+                        }
+                        d.d_msg += '<br>渠道：<b>{{d.cinfo.name}}</b>( <span class="color-desc">{{d.cinfo.id}}</span> )';
+                        if (d.pinfo) {
+                            d.d_msg += '<br>商品：<b>{{d.pinfo.name}}</b>( <span class="color-desc">{{d.pinfo.id}}</span> )';
+                            if (d.pinfo.status === 0) {
+                                d.d_msg += '<span class="color-red">禁</span>';
+                            } else if (d.pinfo.is_deleted === 1) {
+                                d.d_msg += '<span class="color-red">删</span>';
+                            }
+                        }
+                        return laytpl(d.d_msg).render(d);
+                    }
+                },
+                {
+                    field: 'order', title: '订单号', minWidth: 270, fixed: 'left', templet: function (d) {
+                        d.one = '<span class="layui-badge think-bg-blue">系</span>';
+                        d.green = '<span class="layui-badge layui-bg-green">商</span>';
+                        d.d_msg = '{{-d.one}}<b>{{d.order_id}}</b>';
+                        if (d.apply_refund === 1) {
+                            d.d_msg = '{{-d.one}}<b>{{d.order_id}}</b><span class="layui-badge layui-bg-red">拦</span>';
+                        }
+                        if (d.num > 0) {
+                            d.d_msg += '<br><span class="layui-badge layui-bg-gray">复</span>复充次数: <b>{{d.num}}</b>';
+                        }
+
+                        d.d_msg += '<br>{{-d.green}}<b>{{d.merchant_order_id}}</b>';
+                        return laytpl(d.d_msg).render(d);
+                    }
+                },
+                {
+                    field: 'account', title: '充值账号', align: 'center', minWidth: 150, templet: function (d) {
+
+                        d.d_msg = '<b>{{d.account}}</b>';
+                        if (d.product_key === 'dhcz' && d.isp > 0) {
+                            if (d.isp === 1) {
+                                d.d_msg += '<br>{$isp[1]}';
+                            } else if (d.isp === 2) {
+                                d.d_msg += '<br>{$isp[2]}';
+                            } else if (d.isp === 3) {
+                                d.d_msg += '<br>{$isp[3]}';
+                            }
+
+                        }
+
+
+                        return laytpl(d.d_msg).render(d);
+                    }
+                },
+                // {field: 'order_id', title: '系统订单号', minWidth: 120},
+                // {field: 'merchant_order_id', title: '系统订单号', minWidth: 120},
+                // {field: 'account', title: '充值账号',},
+                {
+                    field: 'cash', title: '总面值', align: 'center', minWidth: 120, templet: function (d) {
+
+                        if (d.cash === '' || d.cash === null || d.cash === undefined) {
+                            d.cash_num = '-';
+                        } else {
+                            // 格式化为带有两位小数的数字，并添加千位分隔符
+                            d.cash_num = parseFloat(d.cash).toLocaleString('zh-CN', {
+                                minimumFractionDigits: 2,
+                                maximumFractionDigits: 2
+                            });
+                        }
+
+
+                        d.d_msg = '<b>{{-d.cash_num}}</b>';
+                        return laytpl(d.d_msg).render(d);
+                    }
+                },
+                {field: 'buy_num', title: '数量', align: 'center', minWidth: 100},
+                {field: 'one_cash', title: '单面值', align: 'center', minWidth: 100},
+                {field: 's_number', title: '官方流水号', align: 'center', minWidth: 100},
+                {
+                    field: 'status', title: '订单状态', align: 'center',  minWidth: 500, templet: function (d) {
+                        // TODO 嵌套表格
+                        if (d.other && Array.isArray(d.other) && d.other.length > 0) {
+                            // 处理非空数组的情况
+                            let d_msg = '';
+                            d_msg += '<table style="width: 100%; border-collapse: collapse;position: relative; box-shadow: 0 4px 8px rgba(0, 0, 0, 0.2);background-color: white">';
+                            d_msg += '<thead>';
+                            d_msg += '<tr>';
+                            d_msg += '<th style=";background-color: white;padding: 12px 20px;  font-weight: bold; color: #333; text-align: center;width: 140px">渠道名</th>';
+                            d_msg += '<th style=";background-color: white;padding: 12px 20px;font-weight: bold; color: #333; text-align: center;width: 200px">订单号</th>';
+                            d_msg += '<th style=";background-color: white;padding: 12px 20px; font-weight: bold; color: #333; text-align: center;">充值状态</th>';
+                            d_msg += '</tr>';
+                            d_msg += '</thead>';
+                            d_msg += '<tbody>';
+
+                            d.other.forEach(function (subOrder) {
+                                d_msg += '<tr>';
+                                d_msg += '<td style="padding: 12px 15px; color: #666; text-align: center;background-color: white;">' + subOrder.cinfo.name + '(  <span class="color-desc">' + subOrder.cinfo.id + '</span> ';
+                                if (subOrder.status === 0) {
+                                    d_msg += '<span class="layui-badge layui-bg-red">禁</span> ) </td>';
+                                } else if (subOrder.cinfo.is_deleted === 1) {
+                                    d_msg += '<span class="layui-badge think-bg-blue">删</span> ) </td>';
+                                } else {
+                                    d_msg += ') </td>';
+                                }
+                                d_msg += '<td style="padding: 12px 15px; color: #666; text-align: center;background-color: white;">' + subOrder.channel_order_id + '</td>';
+                                d_msg += '<td style="padding: 12px 15px;color: #666; text-align: center;background-color: white;">' + getStatusText(subOrder.id, subOrder.status) + '</td>';
+                                0
+                                d_msg += '</tr>';
+                            });
+
+                            d_msg += '<tr>';
+                            d_msg += '<td style="padding: 12px 15px; color: #666; text-align: center;background-color: white;">' + d.cinfo.name + '(  <span class="color-desc">' + d.cinfo.id + '</span> ';
+                            if (d.status === 0) {
+                                d_msg += '<span class="layui-badge layui-bg-red">禁</span> ) </td>';
+                            } else if (d.cinfo.is_deleted === 1) {
+                                d_msg += '<span class="layui-badge think-bg-blue">删</span> ) </td>';
+                            } else {
+                                d_msg += ') </td>';
+                            }
+                            d_msg += '<td style="padding: 12px 15px; color: #666; text-align: center;background-color: white;">' + d.channel_order_id + '</td>';
+                            d_msg += '<td style="padding: 12px 15px; color: #666; text-align: center;background-color: white;">' + getStatusText(d.id, d.status) + '</td>';
+                            d_msg += '</tr>';
+
+                            d_msg += '</tbody>';
+                            d_msg += '</table>';
+                            return d_msg;
+
+                            // return laytpl(d_msg).render(d);
+                        } else {
+                            let d_msg = getStatusText(d.id, d.status);
+                            if (d.card !== null && d.card !== undefined && d.card.cnum !== null && d.card.cnum !== undefined) {
+                                d_msg += '<br>卡号：<span>{{d.card.cnum}}</span><br />失败：<span>{{d.card_error}}</span>次';
+                            }
+
+                            return laytpl(d_msg).render(d);
+                        }
+                    }
+                },
+
+                // {field: 'status', title: '订单状态', align: 'center', minWidth: 160, templet:'#ordeList'},
+                {field: 'create_at', title: '下单时间', align: 'center', minWidth: 100},
+                {field: 'time', title: '耗时', align: 'center', minWidth: 100},
+                {
+                    field: 'merchant_callback_msg',
+                    align: 'center',
+                    title: '同步结果',
+                    width: 100,
+                    templet: function (d) {
+                        switch (d.merchant_callback_msg) {
+                            case 'success':
+                                return '<span style="color: #16b777;">success</span>';
+                            case 'fail':
+                                return '<span style="color: #ff5722;">fail</span>';
+                            case 'error':
+                                return '<span style="color: #ff5722;">error</span>';
+
+                            default:
+                                return laytpl('<span style="color: #2f363c;">{{d.merchant_callback_msg}}</span>').render(d);
+                            // return '<span style="color: #009688;">d.merchant_callback_msg</span>';
+                        }
+                    }
+                },
+                {field: 'msg', title: '充值结果', align: 'center', minWidth: 100},
+                {field: 'right', toolbar: '#toolbar', width: 200, minWidth: 100, title: '操作面板', fixed: 'right'}
+            ]],
+            done: function (index, layero) {
+                //表头部分
+                //动态监听表头高度变化，冻结行跟着改变高度
+                $(".layui-table-header  tr").resize(function () {
+                    $(".layui-table-header  tr").each(function (index, val) {
+                        $($(".layui-table-fixed .layui-table-header table tr")[index]).height($(val).height());
+                    });
+                });
+                //初始化高度，使得冻结行表头高度一致
+                $(".layui-table-header  tr").each(function (index, val) {
+                    $($(".layui-table-fixed .layui-table-header table tr")[index]).height($(val).height());
+                });
+
+                //表体部分
+                //动态监听表体高度变化，冻结行跟着改变高度
+                $(".layui-table-body  tr").resize(function () {
+                    $(".layui-table-body  tr").each(function (index, val) {
+                        $($(".layui-table-fixed .layui-table-body table tr")[index]).height($(val).height());
+                    });
+                });
+                //初始化高度，使得冻结行表体高度一致
+                $(".layui-table-body  tr").each(function (index, val) {
+                    $($(".layui-table-fixed .layui-table-body table tr")[index]).height($(val).height());
+                });
+            }
+
+            // , height: 'full-110'
+        });
+
+        // function adjustColumnWidth() {
+        //     var cells = document.querySelectorAll('#OrderList .layui-table-cell[data-field="status"]');
+        //     var maxWidth = 0;
+        //
+        //     cells.forEach(function(cell) {
+        //         var contentWidth = getContentWidth(cell.innerText);
+        //         if (contentWidth > maxWidth) {
+        //             maxWidth = contentWidth;
+        //         }
+        //     });
+        //
+        //     cells.forEach(function(cell) {
+        //         cell.style.width = maxWidth + 'px'; // 设置最大宽度
+        //     });
+        // }
+        // function getContentWidth(text) {
+        //     var tempDiv = document.createElement('div');
+        //     tempDiv.style.visibility = 'hidden';
+        //     tempDiv.style.whiteSpace = 'nowrap';
+        //     tempDiv.style.overflow = 'hidden';
+        //     tempDiv.innerHTML = text;
+        //     document.body.appendChild(tempDiv);
+        //     var width = tempDiv.offsetWidth;
+        //     document.body.removeChild(tempDiv);
+        //     return width;
+        // }
+        if (set_callback === '1') {
+            // console.log(123);
+            $('#buttonContainer').show();
+            // 如果有其他按钮需要根据 set_callback 显示，也可以在这里添加
+        } else {
+            $('#buttonContainer').hide();
+            // 如果有其他按钮需要根据 set_callback 隐藏，也可以在这里添加
+        }
+
+        function getStatusText(ids, status) {
+            let url = "{:url('info')}?id=" + ids + "&data_type={$data_type}";
+            let d_msg = '';
+            switch (status) {
+                case -8:
+                    d_msg += '<button type="button" class="layui-btn layui-btn-sm color-span-gray layui-btn-radius" data-modal=' + url + ' >重提排队中</button>';
+                    break;
+                case -6:
+                    d_msg += '<button type="button" class="layui-btn layui-btn-sm color-span-gray layui-btn-radius" data-modal=' + url + ' >冻结中</button>';
+                    break;
+                case -5:
+                    d_msg += '<button type="button" class="layui-btn layui-btn-sm color-span-gray layui-btn-radius" data-modal=' + url + ' >暂停中</button>';
+                    break;
+                case -4:
+                    d_msg += '<button type="button" class="layui-btn layui-btn-sm color-span-gray layui-btn-radius" data-modal=' + url + ' >复充排队中</button>';
+                    break;
+                case -3:
+                    d_msg += '<button type="button" class="layui-btn layui-btn-sm  layui-btn-radius" data-modal=' + url + ' >排队中</button>';
+                    break;
+                case -2:
+                    d_msg += '<button type="button" class="layui-btn layui-btn-sm layui-btn-danger layui-btn-radius" data-modal=' + url + ' >失败，需手动处理</button>';
+                    break;
+                case -1:
+                    d_msg += '<button type="button" class="layui-btn layui-btn-sm color-span-gray layui-btn-radius" data-modal=' + url + ' >队列中</button>';
+                    break;
+                case 1:
+                    d_msg += '<button type="button" class="layui-btn layui-btn-sm color-span-gray  layui-btn-radius" data-modal=' + url + ' >下单</button>'
+                    break;
+                case 2:
+                    d_msg += '<button type="button" class="layui-btn layui-btn-sm layui-btn-radius" data-modal=' + url + ' >充值成功</button>';
+                    break;
+                case 3:
+                    d_msg += '<button type="button" class="layui-btn layui-btn-sm layui-btn-danger layui-btn-radius" data-modal=' + url + ' >充值失败</button>';
+                    break;
+                case 4:
+                    d_msg += '<button type="button" class="layui-btn layui-btn-sm layui-btn-normal layui-btn-radius" data-modal=' + url + ' >处理中</button>';
+                    break;
+                case 5:
+                    d_msg += '<button type="button" class="layui-btn layui-btn-sm layui-btn-warm layui-btn-radius" data-modal=' + url + ' >存疑</button>';
+                    break;
+                case 6:
+                    d_msg += '<button type="button" class="layui-btn layui-btn-sm layui-btn-normal layui-btn-radius" data-modal=' + url + ' >处理中</button>';
+                    break;
+                case 7:
+                    d_msg += '<button type="button" class="layui-btn layui-btn-sm layui-btn-normal layui-btn-radius" data-modal=' + url + ' >提卡成功待处理</button>';
+                    break;
+                default:
+                // 如果没有任何 case 匹配，则执行这里的代码
+            }
+
+            return d_msg;
+        }
+
+
+        $('#OrderList').trigger('toolbar', function (item) {
+            var table = layui.table;
+            var id = item.config.id;
+            var checkStatus = table.checkStatus(id);
+            switch (item.event) {
+                case 'setSuccess':
+                    var data = checkStatus.data;
+                    if (data.length === 0) {
+                        layer.msg('请选择要处理的订单');
+                        return false;
+                    }
+                    layer.confirm('确定要把已勾选的订单置成功吗？', {
+                        btn: ['确定', '取消'] // 按钮
+                    }, function (index) {
+                        var successCount = 0;
+                        var failCount = 0;
+                        var totalCount = data.length;
+                        data.forEach(function (order) {
+                            var orderId = order.order_id;
+                            var status = 2;
+                            var dataType = '{$data_type}'; // 确保 $data_type 已经定义
+
+                            // 发送请求到后端
+                            $.ajax({
+                                url: "{:url('set')}", // 替换为实际的后端接口地址
+                                type: 'POST',
+                                data: JSON.stringify({order_id: orderId, status: status, data_type: dataType}),
+                                contentType: 'application/json',
+                                headers: {
+                                    'X-CSRF-TOKEN': '{:systoken("set")}' // 添加 CSRF 令牌
+                                },
+                                success: function (response) {
+                                    if (response.code === 1) {
+                                        successCount++;
+                                    } else {
+                                        failCount++;
+                                    }
+
+                                    if (successCount + failCount === totalCount) {
+                                        showFinalMessage(successCount, failCount);
+                                    }
+                                    // layer.msg('订单 ' + orderId + ' 处理成功');
+                                    // console.log(response);
+                                },
+                                error: function (xhr, status, error) {
+                                    failCount++;
+                                    if (successCount + failCount === totalCount) {
+                                        showFinalMessage(successCount, failCount);
+                                    }
+                                    // layer.msg('订单 ' + orderId + ' 处理失败');
+                                    // console.error(error);
+                                }
+                            });
+                        });
+
+                        layer.close(index); // 关闭确认框
+                    }, function (index) {
+                        // 点击取消后的回调
+                        layer.close(index); // 关闭确认框
+                    });
+                    break;
+                case 'setFail':
+                    var data = checkStatus.data;
+                    if (data.length === 0) {
+                        layer.msg('请选择要处理的订单');
+                        return false;
+                    }
+                    layer.confirm('确定要把已勾选的订单置失败吗？', {
+                        btn: ['确定', '取消'] // 按钮
+                    }, function (index) {
+                        var successCount = 0;
+                        var failCount = 0;
+                        var totalCount = data.length;
+                        data.forEach(function (order) {
+                            var orderId = order.order_id;
+                            var status = 3;
+                            var dataType = '{$data_type}'; // 确保 $data_type 已经定义
+
+                            // 发送请求到后端
+                            $.ajax({
+                                url: "{:url('set')}", // 替换为实际的后端接口地址
+                                type: 'POST',
+                                data: JSON.stringify({order_id: orderId, status: status, data_type: dataType}),
+                                contentType: 'application/json',
+                                headers: {
+                                    'X-CSRF-TOKEN': '{:systoken("set")}' // 添加 CSRF 令牌
+                                },
+                                success: function (response) {
+                                    if (response.code === 1) {
+                                        successCount++;
+                                    } else {
+                                        failCount++;
+                                    }
+
+                                    if (successCount + failCount === totalCount) {
+                                        showFinalMessage(successCount, failCount);
+                                    }
+                                    // layer.msg('订单 ' + orderId + ' 处理成功');
+                                    // console.log(response);
+                                },
+                                error: function (xhr, status, error) {
+                                    failCount++;
+                                    if (successCount + failCount === totalCount) {
+                                        showFinalMessage(successCount, failCount);
+                                    }
+                                    // layer.msg('订单 ' + orderId + ' 处理失败');
+                                    // console.error(error);
+                                }
+                            });
+                        });
+
+                        layer.close(index); // 关闭确认框
+                    }, function (index) {
+                        // 点击取消后的回调
+                        layer.close(index); // 关闭确认框
+                    });
+                    break;
+                case 'setRestart':
+                    var data = checkStatus.data;
+                    if (data.length === 0) {
+                        layer.msg('请选择要处理的订单');
+                        return false;
+                    }
+                    layer.confirm('确定要把已勾选的订单重新启动吗？', {
+                        btn: ['确定', '取消'] // 按钮
+                    }, function (index) {
+                        var successCount = 0;
+                        var failCount = 0;
+                        var totalCount = data.length;
+                        data.forEach(function (order) {
+                            var orderId = order.order_id;
+                            var status = 3;
+                            var dataType = '{$data_type}'; // 确保 $data_type 已经定义
+
+                            // 发送请求到后端
+                            $.ajax({
+                                url: "{:url('set_restart')}", // 替换为实际的后端接口地址
+                                type: 'POST',
+                                data: JSON.stringify({order_id: orderId, status: status, data_type: dataType}),
+                                contentType: 'application/json',
+                                headers: {
+                                    'X-CSRF-TOKEN': '{:systoken("set_restart")}' // 添加 CSRF 令牌
+                                },
+                                success: function (response) {
+                                    if (response.code === 1) {
+                                        successCount++;
+                                    } else {
+                                        failCount++;
+                                    }
+
+                                    if (successCount + failCount === totalCount) {
+                                        showFinalMessage(successCount, failCount);
+                                    }
+                                    // layer.msg('订单 ' + orderId + ' 处理成功');
+                                    // console.log(response);
+                                },
+                                error: function (xhr, status, error) {
+                                    failCount++;
+                                    if (successCount + failCount === totalCount) {
+                                        showFinalMessage(successCount, failCount);
+                                    }
+                                    // layer.msg('订单 ' + orderId + ' 处理失败');
+                                    // console.error(error);
+                                }
+                            });
+                        });
+
+                        layer.close(index); // 关闭确认框
+                    }, function (index) {
+                        // 点击取消后的回调
+                        layer.close(index); // 关闭确认框
+                    });
+                    break;
+            }
+            // 对应 layui.table 写法 layui.table.on('toolbar(OplogData)',function(){ })
+        });
+
+        function showFinalMessage(successCount, failCount) {
+            if (failCount === 0) {
+                layer.msg('所有订单处理成功');
+            } else if (successCount === 0) {
+                layer.msg('所有订单处理失败');
+            } else {
+                layer.msg(`处理完成：${successCount} 成功，${failCount} 失败`);
+            }
+        }
+
+        // $('#oList').layTable({
+        //     even: true, height: 'full',
+        //     // sort: {field: 'id', type: 'desc'},
+        //     cols: [[
+        //         {checkbox: true},
+        //         // {field: 'id', title: 'ID', width: 80, sort: true, align: 'center'},
+        //         // {field: 'username', title: '操作账号', minWidth: 100, sort: true, align: 'center'},
+        //         // {field: 'node', title: '操作节点', minWidth: 120},
+        //         {field: 'status', title: '操作行为', minWidth: 120},
+        //         // {field: 'content', title: '操作描述', minWidth: 120},
+        //         // {field: 'geoip', title: '访问地址', minWidth: 100},
+        //         // {field: 'geoisp', title: '网络服务商', minWidth: 100},
+        //         // {field: 'create_at', title: '操作时间', minWidth: 170, align: 'center', sort: true},
+        //         // {toolbar: '#toolbar', title: '操作面板', align: 'center', fixed: 'right'}
+        //     ]]
+        // });
+
+
+    });
+
+
+</script>
+
+
+<script type="text/html" id="ordeList">
+    {{# console.log(d) }}
+    <table id="oList" data-target-search="form.form-search"></table>
+    <!--    {{#  if (d.card !== null && d.card !== undefined && d.card.cnum !== null && d.card.cnum !== undefined) {   }}-->
+    <!--    {{#   d.d_msg += '<br>卡号：<span>{{d.card.cnum}}</span><br />失败：<span>{{d.card_error}}</span>次';         }}-->
+    <!--    {{#  }                                                                                                     }}-->
+</script>
+
+<style type="text/css">
     .layui-table {
-        position: relative;
-        box-shadow: 0 4px 8px rgba(0, 0, 0, 0.2);
-        margin-bottom: -10px;
-        z-index: 1;
-    }
-    .layui-table thead th {
-        position: sticky;
-        top: 0;
-        background: white;
-        z-index: 10;
-    }
-    .rightfix{
-        position: sticky !important;
-        right: 0px;
-        background-color: white;
-        z-index: 9;
-    }
-    .leftfix{
-        position: sticky !important;
-        left: -2px;
-        background-color: white;
-        z-index: 9;
-    }
-    .leftfixx{
-        position: sticky !important;
-        left: 46px;
-        background-color: white !important;
-        z-index: 9;
+        table-layout: auto;
     }
 
+
     .color-span {
         padding: 2px;
         padding-left: 8px;
@@ -349,41 +699,44 @@
         font-weight: bold;
         cursor: pointer;
     }
+
     .color-span-blue {
         background-color: #2494f2 !important;
     }
+
     .color-span-green {
         background-color: #090 !important;
     }
+
     .color-span-red {
         background-color: #ec494e !important;
     }
+
     .color-span-gray {
         background-color: #666 !important;
     }
 </style>
 
 <script>
-    layui.use(['layer','jquery', 'upload'], function(){
+    layui.use(['layer', 'jquery', 'upload'], function () {
         var layer = layui.layer;
         var $ = layui.jquery;
         var upload = layui.upload;
 
 
-
         //指定允许上传的文件类型
         upload.render({
             elem: '#upload'
-            ,url: '/order/order/uploadMul.html'
-            ,accept: 'file' //普通文件
+            , url: '/order/order/uploadMul.html'
+            , accept: 'file' //普通文件
 
-            ,progress: function() {
+            , progress: function () {
                 $('#upload').html('上传中...');
             }
-            ,done: function(res){
-                if (res.code == 1) {
+            , done: function (res) {
+                if (res.code === 1) {
                     $('#upload').html('上传成功，点此继续上传');
-                    layer.msg(res.info, function() {
+                    layer.msg(res.info, function () {
                         location.reload();
                     });
                 } else {
@@ -394,52 +747,52 @@
         });
 
 
-        $('#restart').click(function() {
+        $('#restart').click(function () {
             layer.confirm('确定要将暂停中订单重新启动吗？请确定上游渠道可以正常下单', {
-                btn: ['确定','取消'] //按钮
-            }, function(){
+                btn: ['确定', '取消'] //按钮
+            }, function () {
 
                 var url = "{:url('/order/order/restart')}";
 
-                $.post(url,{}, function() {
+                $.post(url, {}, function () {
                     layer.msg('操作成功', {icon: 1});
                 })
 
-            }, function(){
+            }, function () {
 
             });
         })
 
         //这个废弃吧
-        $('#error').click(function() {
+        $('#error').click(function () {
 
             layer.confirm('确定要手动执行八达通失败订单吗？将自动处理因八达通余额不足导致的下单失败订单，重新下单', {
-                btn: ['确定','取消'] //按钮
-            }, function(){
+                btn: ['确定', '取消'] //按钮
+            }, function () {
 
                 var url = "{:url('/gateway/api.task/popenRunError')}";
 
-                $.post(url,{}, function() {
+                $.post(url, {}, function () {
                     layer.msg('操作成功', {icon: 1});
                 })
 
-            }, function(){
+            }, function () {
 
             });
         })
 
-        $('#errorToTiancheng').click(function() {
+        $('#errorToTiancheng').click(function () {
             layer.confirm('确定要手动执行八达通失败订单吗？将自动处理因八达通余额不足导致的下单失败订单，转到天成，重新下单', {
-                btn: ['确定','取消'] //按钮
-            }, function(){
+                btn: ['确定', '取消'] //按钮
+            }, function () {
 
                 var url = "{:url('/gateway/api.task/popenRunError')}";
 
-                $.post(url,{}, function() {
+                $.post(url, {}, function () {
                     layer.msg('操作成功', {icon: 1});
                 })
 
-            }, function(){
+            }, function () {
 
             });
         })
diff --git a/app/order/view/order/index_search.html b/app/order/view/order/index_search.html
index 4f50cd3..05d4fa2 100644
--- a/app/order/view/order/index_search.html
+++ b/app/order/view/order/index_search.html
@@ -1,6 +1,6 @@
 <fieldset>
     <legend>条件搜索</legend>
-    <form class="layui-form layui-form-pane form-search" action="{:request()->url()}" onsubmit="return false" method="get" autocomplete="off">
+    <form class="layui-form layui-form-pane form-search" action="{:sysuri()}" onsubmit="return false" method="get" autocomplete="off">
         <div class="layui-form-item layui-inline">
             <label class="layui-form-label">渠道</label>
             <label class="layui-input-inline">
@@ -230,6 +230,7 @@
             <button type="button" class="layui-btn layui-btn-primary" onclick="location.reload()"><i class="layui-icon">&#xe669;</i> 刷 新</button>
             {if input('set_callback') != 1}
             <button type="button" class="layui-btn layui-btn-primary" onclick="location.href=location.href+'&set_callback=1'"><i class="layui-icon">&#xe653;</i>手动回调</button>
+<!--            <button type="button" class="layui-btn layui-btn-primary" onclick="location.href=location.href+'&set_callback=1'"><i class="layui-icon">&#xe653;</i>手动回调</button>-->
             {/if}
 
             <button type="button" class="layui-btn layui-btn-primary" data-title="手动充值" data-modal="{:url('pay')}"><i class="layui-icon">&#xe653;</i>手动充值</button>
diff --git a/app/order/view/order/info.html b/app/order/view/order/info.html
index 8e146b7..b294033 100644
--- a/app/order/view/order/info.html
+++ b/app/order/view/order/info.html
@@ -37,7 +37,7 @@
                 <td class='text-left nowrap'><span class="color-desc">{$vo.channel_order_id|default=''}</span></td>
             </tr>
             <tr>
-                <td class='text-left nowrap'><span class="color-desc">上游订单号</span></td>
+                <td class='text-left nowrap'><span class="color-desc">平台侧订单号</span></td>
                 <td class='text-left nowrap'><span class="color-desc">{$vo.parent_order_id|default=''}</span></td>
             </tr>
             <tr>
diff --git a/app/order/view/order/pay.html b/app/order/view/order/pay.html
index 934fd10..322db5a 100644
--- a/app/order/view/order/pay.html
+++ b/app/order/view/order/pay.html
@@ -21,7 +21,13 @@
         <div class="layui-form-item">
             <label class="color-black font-w7" >充值文件</label>
             <div class="">
-                <button class="layui-btn layui-btn-primary" type='button' id="upload">选择充值文件</button>
+                <button type="button" class="layui-btn  layui-btn-primary layui-btn-active demo-class-accept" lay-options="{accept: 'file',exts: 'xlsx|xls'}">
+                    <i class="layui-icon layui-icon-upload"></i>
+                    选择充值文件
+                </button>
+
+
+<!--                <button class="layui-btn layui-btn-primary" type='button' id="uploads">选择充值文件</button>-->
 
             </div>
             <span class="color-desc">充值文件格式为excel表格或者txt文本文件，只需输入加油卡卡号即可，上传成功自动导入到下述充值数据中</span>
@@ -42,6 +48,8 @@
         <button class="layui-btn layui-btn-danger" type='button' data-confirm="确定要取消吗？" data-close>取消</button>
     </div>
 </form>
+
+
 <script>
 
 form.render();
@@ -57,7 +65,39 @@ function sform()
     });
 }
 
-layui.use('upload', function(){
+    layui.use(function(){
+    var upload = layui.upload;
+    var layer = layui.layer;
+    // 渲染
+    upload.render({
+    elem: '.demo-class-accept', // 绑定多个元素
+    url: '/order/order/upload.html', // 此处配置你自己的上传接口即可
+    accept: 'file', // 普通文件
+        progress: function() {
+            layer.msg('上传中');
+        },
+    done: function(res){
+        if (res.code === 1) {
+            layer.msg('上传成功,点此继续上传');
+            layer.msg(res.info);
+            var data = res.data;
+            var old = $('#content_data').val();
+            if (old) {
+                data = old + "\r\n" + data;
+            }
+            $('#content_data').val(data);
+        } else {
+            layer.msg(res.info);
+
+        }
+
+}
+});
+});
+
+
+
+layui.use('uploads', function(){
   var $ = layui.jquery
   ,upload = layui.upload;
   //指定允许上传的文件类型
@@ -66,11 +106,10 @@ layui.use('upload', function(){
     ,url: '/order/order/upload.html'
     ,accept: 'file' //普通文件
 
-    ,progress: function() {
-        $('#upload').html('上传中...');
-    }
+
     ,done: function(res){
         if (res.code == 1) {
+            layer.msg('上传成功');
             $('#upload').html('上传成功，点此继续上传');
             layer.msg(res.info);
             var data = res.data;
diff --git a/app/order/view/order/setYes.html b/app/order/view/order/setYes.html
index 561f00f..1f0f0e3 100644
--- a/app/order/view/order/setYes.html
+++ b/app/order/view/order/setYes.html
@@ -4,7 +4,7 @@
         <div class="layui-form-item">
             <label class="relative block">
                 <span class="color-green font-w7">官方流水号</span>
-                <input name="s_number" value='{s_number|default=""}' placeholder="请输入官方流水号" class="layui-input">
+                <input name="s_number" value='{$s_number|default=""}' placeholder="请输入官方流水号" class="layui-input">
             </label>
             <p class="color-desc">为空则不设置流水号</p>
         </div>
diff --git a/app/task/controller/Task.php b/app/task/controller/Task.php
index 9bcc800..81017cd 100644
--- a/app/task/controller/Task.php
+++ b/app/task/controller/Task.php
@@ -229,6 +229,23 @@ class Task extends Core
         }
     }
 
+    # 对暂停的的订单重新下单 status = -5
+    public function runStopOrder()
+    {
+        $orderService = OrderService::instance();
+        $result = $orderService->getStopOrder();
+
+        if ($result) {
+            $data = $result;
+
+            foreach ($data as $k => $v) {
+                $id = $orderService->db()->where('id', $v['id'])->update(['status' => -8]);
+
+
+            }
+        }
+    }
+
     # 对需要复冲下单的订单下单 status = -4 可以加入到计划任务中，每分钟执行一次
     public function runFcOrder()
     {
diff --git a/composer.json b/composer.json
index f0f18f0..8714360 100644
--- a/composer.json
+++ b/composer.json
@@ -32,7 +32,7 @@
     "zoujingli/wechat-developer": "^1.2",
     "zoujingli/think-plugs-admin": "^1.0",
     "webman/console": "^v1.2.35",
-    "phpoffice/phpspreadsheet": "^3.4",
+    "phpoffice/phpspreadsheet": "^3.6",
     "ext-mcrypt": "*",
     "ext-apcu": "*",
     "ext-xmlreader": "*",
diff --git a/public/card/order_card.xlsx b/public/card/order_card.xlsx
new file mode 100644
index 0000000000000000000000000000000000000000..b71733c52ca77a22166de6a845cdefa304080a92
GIT binary patch
literal 8997
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

literal 0
HcmV?d00001