Merge branch 'rmaster' of 39.97.239.116:gyfl/xyzshop into rmaster

admin/control/merchant.php

@@ -771,29 +771,6 @@ class merchantControl extends SystemControl
         showMessage('操作成功', '');
     }
 
-    public function notify_manual_merchantOp()
-    {
-        $order_id = $_GET['order_id'];
-        $type = $_GET['type'];
-
-        $mod_order = Model('vr_order');
-        $order_info = $mod_order->getOrderInfo(['order_id' => $order_id]);
-
-        if ((time() - $order_info['order_time']) < 3600) {
-            showMessage('订单时间未超过1小时', 'index.php?act=refill_order&op=index');
-        }
-
-        if ($type == 'success') {
-            refill\util::manual_success($order_id);
-        } elseif ($type == 'cancel') {
-            refill\util::manual_cancel($order_id);
-        } else {
-            showMessage('手动操作类型错误', 'index.php?act=refill_order&op=index');
-        }
-
-        showMessage('操作成功', '');
-    }
-
     public function providerStatsOp()
     {
         $provider_model = Model('refill_provider');
@@ -955,7 +932,8 @@ class merchantControl extends SystemControl
         $type = $_GET['type'] ?? $_POST['type'];
         $form = $_GET['form'] ?? $_POST['form'];
         $rkey = $this->speed_key($type, $form);
-        $quality = ['common' => 1, 'fast' => 2, 'card' => 3, 'third' => 4, 'slow' => 5 , 'slow6' => 6, 'slow2' => 7];
+        $quality = ['common' => \refill\Quality::Normal, 'fast' => \refill\Quality::Quick, 'card' => \refill\Quality::CardKey,
+            'third' => \refill\Quality::ThirdShop, 'slow' => \refill\Quality::SlowTwentyFour , 'slow6' => \refill\Quality::SlowSix, 'slow2' => \refill\Quality::SlowTwo];
         if (chksubmit()) {
             $pids = $_POST['pid'];
             $names = $_POST['name'];

admin/control/ordersendlist.php

@@ -97,75 +97,6 @@ class ordersendlistControl extends SystemControl
         Tpl::showpage('refill.order.send.index');
     }
 
-    private function scard_type(int $card_type)
-    {
-        if ($card_type == 1) { //中石油
-            return '中石油';
-        } elseif ($card_type == 2) { //中石化
-            return '中石化';
-        } elseif ($card_type == 4) { //中国移动
-            return '中国移动';
-        } elseif ($card_type == 5) { //中国联通
-            return '中国联通';
-        } elseif ($card_type == 6) { //中国电信
-            return '中国电信';
-        } elseif ($card_type == 7) { //中国电信
-            return '增值业务';
-        } else {
-            return 'unknown';
-        }
-    }
-
-    private function quality_format($quality) {
-        switch ($quality) {
-            case 1:
-                $text = "普充";
-                break;
-            case 2:
-                $text = "快充";
-                break;
-            case 3:
-                $text = "卡密";
-                break;
-            case 4:
-                $text = "三方";
-                break;
-            case 5:
-                $text = "慢充二十四小时";
-                break;
-            case 6:
-                $text = "慢充六小时";
-                break;
-            case 7:
-                $text = "慢充两小时";
-                break;
-            default:
-                return '其他';
-                break;
-        }
-        return $text;
-    }
-
-    private function elapse_time($seconds)
-    {
-        $minutes = intval($seconds / 60);
-        $second = intval($seconds % 60);
-        if ($minutes >= 60) {
-            $minute = $minutes % 60;
-            $hours = intval($minutes / 60);
-            $result = "{$minute}m{$second}s";
-        } elseif ($minutes > 0) {
-            $result = "{$minutes}m{$second}s";
-        } else {
-            $result = "{$second}s";
-        }
-
-        if (isset($hours)) {
-            $result = "{$hours}h{$minute}m";
-        }
-        return $result;
-    }
-
     private function refill_stat($condition, $times)
     {
         $stat_order = function ($condition) {

admin/control/provider_group.php

@@ -248,23 +248,6 @@ class provider_groupControl extends SystemControl
         }
     }
 
-    private function scard_type(int $card_type)
-    {
-        if ($card_type == mtopcard\PetroChinaCard) { //中石油
-            return '中石油';
-        } elseif ($card_type == mtopcard\SinopecCard) { //中石化
-            return '中石化';
-        } elseif ($card_type == mtopcard\ChinaMobileCard) { //中国移动
-            return '中国移动';
-        } elseif ($card_type == mtopcard\ChinaUnicomCard) { //中国联通
-            return '中国联通';
-        } elseif ($card_type == mtopcard\ChinaTelecomCard) { //中国电信
-            return '中国电信';
-        } else {
-            return 'unknown';
-        }
-    }
-
     public function merchant_sel_groupOp()
     {
         $mchid = $_GET['mchid'] ?? $_POST['mchid'];

admin/control/refill_order.php

@@ -1,5 +1,5 @@
 <?php
-
+require_once(BASE_HELPER_PATH . '/mtopcard/mtopcard.php');
 class refill_orderControl extends SystemControl
 {
     public function __construct()
@@ -10,7 +10,7 @@ class refill_orderControl extends SystemControl
     public function indexOp()
     {
         $fShowStat = $_GET['fShowStat'];
-        $this->refill_order($fShowStat==1);
+        $this->refill_order($fShowStat == 1);
     }
 
     public function refill_order($fShowStat = false)
@@ -36,7 +36,7 @@ class refill_orderControl extends SystemControl
             $fSingle = true;
         }
         if (!empty($_GET['no_mchid'])) {
-            $no_mchid = explode(',',$_GET['no_mchid']);
+            $no_mchid = explode(',', $_GET['no_mchid']);
             $condition['refill_order.mchid'] = ['not in', $no_mchid];
         }
 
@@ -69,8 +69,7 @@ class refill_orderControl extends SystemControl
         }
 
         $fToday = false;
-        if (!$fSingle)
-        {
+        if (!$fSingle) {
             $start_unixtime = intval(strtotime($_GET['query_start_time']));
             $end_unixtime = intval(strtotime($_GET['query_end_time']));
 
@@ -98,7 +97,7 @@ class refill_orderControl extends SystemControl
                 }
             }
         }
-        if(!empty($_GET['export'])) {
+        if (!empty($_GET['export'])) {
             $this->RefillOrderExport($condition);
         }
         $merchants = [];
@@ -148,12 +147,11 @@ class refill_orderControl extends SystemControl
     {
         $i = 0;
         $result = [];
-        while (true)
-        {
+        while (true) {
             $start = $i * 1000;
             $order_list = Model('')->table('refill_order,vr_order')->field('refill_order.*,vr_order.order_state')
                 ->where($condition)->join('inner')->on('refill_order.order_id=vr_order.order_id')->order('refill_order.order_time desc')->limit("{$start},1000")->select();
-            if(empty($order_list)) {
+            if (empty($order_list)) {
                 break;
             }
             $i++;
@@ -164,50 +162,51 @@ class refill_orderControl extends SystemControl
         $this->createExcel($result);
     }
 
-    private function createExcel($data = array()){
+    private function createExcel($data = array())
+    {
         Language::read('export');
         import('libraries.excel');
         $excel_obj = new Excel();
         $excel_data = array();
         //设置样式
-        $excel_obj->setStyle(array('id'=>'s_title','Font'=>array('FontName'=>'宋体','Size'=>'12','Bold'=>'1')));
+        $excel_obj->setStyle(array('id' => 's_title', 'Font' => array('FontName' => '宋体', 'Size' => '12', 'Bold' => '1')));
         //header
-        $excel_data[0][] = array('styleid'=>'s_title','data'=> '商户号');
-        $excel_data[0][] = array('styleid'=>'s_title','data'=> '客户订单号');
-        $excel_data[0][] = array('styleid'=>'s_title','data'=> '平台单号');
-        $excel_data[0][] = array('styleid'=>'s_title','data'=> '面额');
-        $excel_data[0][] = array('styleid'=>'s_title','data'=> '充值卡号');
-        $excel_data[0][] = array('styleid'=>'s_title','data'=> '充值卡类型');
-        $excel_data[0][] = array('styleid'=>'s_title','data'=> '下单日期');
-        $excel_data[0][] = array('styleid'=>'s_title','data'=> '完成日期');
-        $excel_data[0][] = array('styleid'=>'s_title','data'=> '官方流水号');
-        $excel_data[0][] = array('styleid'=>'s_title','data'=> '订单状态');
-        $excel_data[0][] = array('styleid'=>'s_title','data'=> '扣款金额');
+        $excel_data[0][] = array('styleid' => 's_title', 'data' => '商户号');
+        $excel_data[0][] = array('styleid' => 's_title', 'data' => '客户订单号');
+        $excel_data[0][] = array('styleid' => 's_title', 'data' => '平台单号');
+        $excel_data[0][] = array('styleid' => 's_title', 'data' => '面额');
+        $excel_data[0][] = array('styleid' => 's_title', 'data' => '充值卡号');
+        $excel_data[0][] = array('styleid' => 's_title', 'data' => '充值卡类型');
+        $excel_data[0][] = array('styleid' => 's_title', 'data' => '下单日期');
+        $excel_data[0][] = array('styleid' => 's_title', 'data' => '完成日期');
+        $excel_data[0][] = array('styleid' => 's_title', 'data' => '官方流水号');
+        $excel_data[0][] = array('styleid' => 's_title', 'data' => '订单状态');
+        $excel_data[0][] = array('styleid' => 's_title', 'data' => '扣款金额');
         //data
-        foreach ((array)$data as $k=>$v){
+        foreach ((array)$data as $k => $v) {
             $tmp = array();
-            $tmp[] = array('data'=>$v['mchid']);
-            $tmp[] = array('data'=>$v['mch_order']);
-            $tmp[] = array('data'=>$v['order_sn']);
-            $tmp[] = array('data'=>$v['refill_amount']);
-            $tmp[] = array('data'=>$v['card_no']);
-            $tmp[] = array('data'=>$this->scard_type($v['card_type']));
-            $tmp[] = array('data'=>date('Y-m-d H:i:s',$v['order_time']));
-            if(empty($v['notify_time'])) {
-                $tmp[] = array('data'=>'');
-            }else{
-                $tmp[] = array('data'=>date('Y-m-d H:i:s',$v['notify_time']));
+            $tmp[] = array('data' => $v['mchid']);
+            $tmp[] = array('data' => $v['mch_order']);
+            $tmp[] = array('data' => $v['order_sn']);
+            $tmp[] = array('data' => $v['refill_amount']);
+            $tmp[] = array('data' => $v['card_no']);
+            $tmp[] = array('data' => $this->scard_type($v['card_type']));
+            $tmp[] = array('data' => date('Y-m-d H:i:s', $v['order_time']));
+            if (empty($v['notify_time'])) {
+                $tmp[] = array('data' => '');
+            } else {
+                $tmp[] = array('data' => date('Y-m-d H:i:s', $v['notify_time']));
             }
 
-            $tmp[] = array('data'=>$v['official_sn']);
-            $tmp[] = array('data'=>orderState($v));
-            $tmp[] = array('data'=>$v['mch_amount']);
+            $tmp[] = array('data' => $v['official_sn']);
+            $tmp[] = array('data' => orderState($v));
+            $tmp[] = array('data' => $v['mch_amount']);
             $excel_data[] = $tmp;
         }
-        $excel_data = $excel_obj->charset($excel_data,CHARSET);
+        $excel_data = $excel_obj->charset($excel_data, CHARSET);
         $excel_obj->addArray($excel_data);
-        $excel_obj->addWorksheet($excel_obj->charset(L('exp_od_order'),CHARSET));
-        $excel_obj->generateXML($excel_obj->charset(L('exp_od_order'),CHARSET).date('Y-m-d-H',time()));
+        $excel_obj->addWorksheet($excel_obj->charset(L('exp_od_order'), CHARSET));
+        $excel_obj->generateXML($excel_obj->charset(L('exp_od_order'), CHARSET) . date('Y-m-d-H', time()));
         exit;
     }
 
@@ -253,4 +252,20 @@ class refill_orderControl extends SystemControl
         echo json_encode($result);
         exit;
     }
+
+    public function refill_third_infoOP()
+    {
+        $order_id = $_GET['order_id'];
+        $model_refill_order = Model('refill_order');
+        $order_info = $model_refill_order->getOrderInfo(['order_id' => $order_id]);
+        if (empty($model_refill_order) || $order_info['card_type'] != mtopcard\ThirdRefillCard) {
+            $res = ['state' => -1, 'msg' => '订单不存在或类型错误'];
+            exit(json_encode($res));
+        }
+        $third_refill = Model('thrid_refill');
+        $data = $third_refill->getThird($order_id);
+        $data['card_info'] = $data['card_info'] ?? '';
+        $res = ['state' => 1, 'data' => $data];
+        exit(json_encode($res));
+    }
 }

admin/control/refill_order_manual.php

@@ -1,7 +1,73 @@
 <?php
 
 
-class refill_order_manual
+class refill_order_manualControl extends SystemControl
 {
+    public function __construct()
+    {
+        parent::__construct();
+    }
 
+    public function indexOp()
+    {
+        $model_refill_order = Model('refill_order');
+        $condition['inner_status'] = 0;
+        $order_list = [];
+        if (!empty($_GET['order_sn'])) {
+            $condition['refill_order.order_sn'] = $_GET['order_sn'];
+            $merchants = [];
+            $merchant_list = Model('')->table('merchant')->limit(1000)->select();
+            foreach ($merchant_list as $key => $value) {
+                $merchants[$value['mchid']] = $value;
+            }
+
+            $order_list = $model_refill_order->getMerchantOrderList($condition, 50, 'refill_order.*,vr_order.order_state', 'refill_order.order_time desc');
+            foreach ($order_list as $order_id => $order_info) {
+                $order_list[$order_id]['card_type_text'] = $this->scard_type($order_info['card_type']);
+                $order_list[$order_id]['mch_name'] = $merchants[$order_info['mchid']]['company_name'];
+                if ($order_info['notify_time'] > 0) {
+                    $diff_time = $order_info['notify_time'] - $order_info['order_time'];
+                } else {
+                    $diff_time = time() - $order_info['order_time'];
+                }
+                $order_list[$order_id]['diff_time_text'] = $this->elapse_time($diff_time);
+                $order_list[$order_id]['diff_time'] = $diff_time;
+                $order_list[$order_id]['quality_text'] = $this->quality_format($order_info['quality']);
+                $order_list[$order_id]['org_quality_text'] = $this->quality_format($order_info['org_quality']);
+            }
+        }
+        Tpl::output('order_list', $order_list);
+        Tpl::showpage('refill.order.manual.index');
+    }
+
+    public function notify_manual_merchantOp()
+    {
+        $order_id = $_GET['order_id'];
+        $type = $_GET['type'];
+
+        $mod_order = Model('vr_order');
+        $order_info = $mod_order->getOrderInfo(['order_id' => $order_id]);
+
+        if ((time() - $order_info['order_time']) < 3600) {
+            showMessage('订单时间未超过1小时', 'index.php?act=refill_order&op=index');
+        }
+
+        $mod_refill = Model('refill_order');
+        $logic_vr_order = Logic("vr_order");
+        $order_info = Model('vr_order')->getOrderInfo(['order_id' => $order_id]);
+
+        if ($type == 'success') {
+            $logic_vr_order->changeOrderStateSuccess($order_id);
+            $mod_refill->edit(['order_id' => $order_id], ['notify_state' =>1, 'notify_time' => time()]);
+            QueueClient::push("NotifyMerchantComplete", ['order_id' => $order_id, 'manual' => true]);
+        } elseif ($type == 'cancel') {
+            $logic_vr_order->changeOrderStateCancel($order_info, '', "充值失败");
+            $mod_refill->edit(['order_id' => $order_id], ['notify_state' =>1, 'notify_time' => time()]);
+            QueueClient::push("NotifyMerchantComplete", ['order_id' => $order_id, 'manual' => true]);
+        } else {
+            showMessage('手动操作类型错误', 'index.php?act=refill_order&op=index');
+        }
+
+        showMessage('操作成功');
+    }
 }

admin/control/refill_successful.php

@@ -95,7 +95,8 @@ class refill_successfulControl extends SystemControl
         ksort($card_typeData);
         $result['card_type'] = $card_typeData;
 
-        $quality_txt = [1=>'普充', 2=>'快充', 3=>'卡密', 4=>'三方', 5=>'慢充二十四小时', 6=>'慢充六小时', 7=>'慢充两小时'];
+        $quality_txt = [\refill\Quality::Normal=>'普充', \refill\Quality::Quick=>'快充', \refill\Quality::CardKey=>'卡密',
+            \refill\Quality::ThirdShop=>'三方', \refill\Quality::SlowTwentyFour=>'慢充二十四小时', \refill\Quality::SlowSix=>'慢充六小时', \refill\Quality::SlowTwo=>'慢充两小时'];
         foreach (array_unique($qualitys) as $quality) {
             $qualityData[$quality] = $quality_txt[$quality];
         }
@@ -104,23 +105,4 @@ class refill_successfulControl extends SystemControl
         echo(json_encode($result));
         exit;
     }
-
-    private function scard_type(int $card_type)
-    {
-        if ($card_type == 1) { //中石油
-            return '中石油';
-        } elseif ($card_type == 2) { //中石化
-            return '中石化';
-        } elseif ($card_type == 4) { //中国移动
-            return '中国移动';
-        } elseif ($card_type == 5) { //中国联通
-            return '中国联通';
-        } elseif ($card_type == 6) { //中国电信
-            return '中国电信';
-        } elseif ($card_type == 7) { //中国电信
-            return '增值业务';
-        } else {
-            return 'unknown';
-        }
-    }
 }

admin/include/menu.php

@@ -103,6 +103,7 @@ $arr = array(
 					array('args'=>'stats,card_key,merchant',				'text'=>'卡密管理'),
 					array('args'=>'index,refill_stock,merchant',			'text'=>'库存管理'),
 					array('args'=>'index,refill_successful,merchant',		'text'=>'成功率监控'),
+					array('args'=>'index,refill_order_manual,merchant',		'text'=>'订单手动处理'),
 				)
 			),
 			4 => array(

admin/templates/default/merchant.edit.php

@@ -63,8 +63,9 @@
             </tr>
             <tr class="noborder">
                 <td class="vatop">
-                    <input name="oil_quality" <?php if($output['merchant']['oil_quality'] == 1){ echo 'checked';}?> value="1" type="radio">普通
-                    <input name="oil_quality" <?php if($output['merchant']['oil_quality'] == 5){ echo 'checked';}?> value="5" type="radio">慢充
+                    <input name="oil_quality" <?php if($output['merchant']['oil_quality'] == 1){ echo 'checked';}?> value="1" type="radio">无流水
+                    <input name="oil_quality" <?php if($output['merchant']['oil_quality'] == 5){ echo 'checked';}?> value="5" type="radio">有流水
+                    <input name="oil_quality" <?php if($output['merchant']['oil_quality'] == 20){ echo 'checked';}?> value="20" type="radio">无流水 + 有流水
                 </td>
             </tr>
             <tr>

admin/templates/default/provider.amount.control.php

@@ -88,8 +88,8 @@
                 <li><a href="index.php?act=merchant&op=provider_amount_control&type=2&form=slow6" class="classA" data-type="2-slow6"><span>慢充六小时话费单量控制</span></a></li>
                 <li><a href="index.php?act=merchant&op=provider_amount_control&type=2&form=slow2" class="classA" data-type="2-slow2"><span>慢充两小时话费单量控制</span></a></li>
 
-                <li><a href="index.php?act=merchant&op=provider_amount_control&type=1&form=common" class="classA" data-type="1-common"><span>普通油卡单量控制</span></a></li>
-                <li><a href="index.php?act=merchant&op=provider_amount_control&type=1&form=slow" class="classA" data-type="1-slow"><span>慢充油卡单量控制</span></a></li>
+                <li><a href="index.php?act=merchant&op=provider_amount_control&type=1&form=common" class="classA" data-type="1-common"><span>无流水油卡单量控制</span></a></li>
+                <li><a href="index.php?act=merchant&op=provider_amount_control&type=1&form=slow" class="classA" data-type="1-slow"><span>有流水油卡单量控制</span></a></li>
             </ul>
         </div>
     </div>

admin/templates/default/provider.index.php

@@ -15,8 +15,8 @@
                 <li><a href="index.php?act=merchant&op=provider_amount_control&type=2&form=slow6"><span>慢充六小时话费单量控制</span></a></li>
                 <li><a href="index.php?act=merchant&op=provider_amount_control&type=2&form=slow2"><span>慢充两小时话费单量控制</span></a></li>
 
-                <li><a href="index.php?act=merchant&op=provider_amount_control&type=1&form=common"><span>普通油卡单量控制</span></a></li>
-                <li><a href="index.php?act=merchant&op=provider_amount_control&type=1&form=slow"><span>慢充油卡单量控制</span></a></li>
+                <li><a href="index.php?act=merchant&op=provider_amount_control&type=1&form=common"><span>无流水油卡单量控制</span></a></li>
+                <li><a href="index.php?act=merchant&op=provider_amount_control&type=1&form=slow"><span>有流水油卡单量控制</span></a></li>
             </ul>
         </div>
     </div>

admin/templates/default/refill.order.index.php

@@ -20,7 +20,6 @@
     }
     
 </style>
-
 <?php defined('InShopNC') or exit('Access Invalid!'); ?>
 <div class="page">
     <div class="fixed-bar">
@@ -77,14 +76,6 @@
                 </td>
                 <th><label>不包含客户</label></th>
                 <td>
-                <!-- <select name="no_mchid" class="querySelect">
-                        <option value=""><?php echo $lang['nc_please_choose']; ?></option>
-                        <?php foreach($output['merchant_list'] as $merchant){?>
-                            <option value="<?php echo $merchant['mchid']?>"
-                                    <?php if ($_GET['no_mchid'] == $merchant['mchid']){ ?>selected<?php } ?>><?php echo $merchant['company_name'] == '' ? $merchant['name'] : $merchant['company_name'];?>
-                            </option>
-                        <?php }?>
-                    </select> -->
                     <div id="selest_nc"></div>
                 </td>
             </tr>
@@ -362,12 +353,9 @@
                     <td class="w144 align-center">
                         <a href="index.php?act=merchant&op=notify_merchant&order_id=<?php echo $order['order_id']; ?>">
                                 回调</a>
-                        |
-                        <a href="index.php?act=merchant&op=notify_manual_merchant&type=cancel&order_id=<?php echo $order['order_id']; ?>">
-                            手动失败</a>
-                        |
-                        <a href="index.php?act=merchant&op=notify_manual_merchant&type=success&order_id=<?php echo $order['order_id']; ?>">
-                            手动成功</a>
+                        <!-- |
+                        <a href="#" class="examine" data-order="<?php echo $order['order_id']; ?>">
+                            查看</a> -->
                     </td>
 
                 </tr>
@@ -394,8 +382,32 @@
 <link rel="stylesheet" type="text/css"
       href="<?php echo RESOURCE_SITE_URL; ?>/js/jquery-ui/themes/ui-lightness/jquery.ui.css"/>
 <script type="text/javascript" src="<?php echo ADMIN_TEMPLATES_URL;?>/js/xm-select.js"></script>
+<script type="text/javascript" src="<?php echo RESOURCE_SITE_URL;?>/refill/layer.js"></script>
 <script type="text/javascript">
     $(function () {
+        //查看
+        // $('.examine').click(function() {
+        //     let sq = $(this).attr('data-order')
+        //     console.log(sq);
+        //     $.get('index.php?act=refill_order&op=refill_third_info&order_id=',
+
+        //      function(data) {
+        //         let selectStr = ''
+            
+        //             for(let i = 0; i < data.length; i++) {
+        //                 selectStr += ``
+        //             }
+                
+                
+        //         console.log(data);
+        //     }) 
+        //     layer.open({
+        //         title: "订单列表",
+        //         area: ['700px', '450px'],
+        //         content: ''
+
+        //     });
+        // })
         // 获取不包含客户
         let selest_nc
         let default_no_mch = $('input[name="default_no_mch"]').val().split(',');

admin/templates/default/refill.order.manual.index.php

@@ -0,0 +1,178 @@
+<style>
+    th label { display: inline-block;width: 60px; }
+    .lineLi {
+        min-width: 150px;
+        font-size: 12px;
+        color:#000;
+    }
+    #prompt ul .noLineLi {
+        background:none; 
+    }
+    #prompt div {
+        display:inline-block;
+        background:none
+    }
+    #prompt ul .lineLi {
+        color:#000;
+    }
+    #selest_nc {
+        width:220px
+    }
+    th {
+        width: 10px;
+    }
+    .txt2 {
+        position: relative;
+    }
+    .btn-search {
+        position: absolute;
+        left: 332px;
+        margin-top: 3px;
+    }
+    
+</style>
+
+<?php defined('InShopNC') or exit('Access Invalid!'); ?>
+<div class="page">
+    <div class="fixed-bar">
+        <div class="item-title">
+            <h3>订单列表</h3>
+            <ul class="tab-base">
+                <li><a href="JavaScript:void(0);" class="current"><span>管理</span></a></li>
+            </ul>
+        </div>
+    </div>
+    <div class="fixed-empty"></div>
+    <form method="get" action="index.php" name="formSearch" id="formSearch">
+        <input type="hidden" name="act" value="refill_order_manual"/>
+        <input type="hidden" name="op" value="index"/>
+        <table class="tb-type1 noborder search" style="min-width:1400px">
+            <tbody>
+            <tr>
+                <th><label>我方订单号</label></th>
+                <td><input class="txt2" type="text" name="order_sn" value="<?php echo $_GET['order_sn']; ?>"/></td>
+                <a href="javascript:void(0);" id="ncsubmit" class="btn-search"
+                       title="<?php echo $lang['nc_query']; ?>">&nbsp;
+                </a>
+            </tr>
+            <tr>
+                <td>
+                   
+                </td>
+            </tr>
+            </tbody>
+        </table>
+    </form>
+    <table class="table tb-type2 nobdb" style="min-width:1400px">
+        <thead>
+        <tr class="thead">
+            <th class="align-center">编号</th>
+            <th class="align-center">订单号</th>
+            <th class="align-center">机构编号</th>
+            <th class="align-center">机构名称</th>
+            <th class="align-center">充值卡号</th>
+            <th class="align-center">充值卡类型</th>
+            <th class="align-center">充值额度</th>
+            <th class="align-right">下单日期</th>
+            <th class="align-right">耗时</th>
+            <th class="align-center">订单状态</th>
+            <th class="align-center">运营商流水号</th>
+            <th class="align-center">备注</th>
+            <th class="align-center">商家单号</th>
+            <th class="align-center">渠道单号</th>
+            <th class="align-center">渠道名称</th>
+            <th class="align-center">次数</th>
+            <th class="align-center">质量</th>
+            <th class="align-center">初始质量</th>
+<!--            <th class="align-center">扣款金额</th>-->
+            <th class="align-center"><?php echo $lang['nc_handle']; ?></th>
+        </tr>
+        </thead>
+        <tbody id="tbody">
+        <?php if (count($output['order_list']) > 0) { ?>
+            <?php
+            foreach ($output['order_list'] as $key => $order) { ?>
+                <tr class="hover trFlex">
+                    <td class="align-center"><?php echo $key+1;?></td>
+                    <td class="align-left"><?php echo $order['order_sn']; ?></td>
+                    <td class="align-center"><?php echo $order['mchid']; ?></td>
+                    <td class="align-center"><?php echo $order['mch_name']; ?></td>
+                    <td class="align-left"><?php echo $order['card_no']; ?></td>
+                    <td class="align-center"><?php echo $order['card_type_text']; ?></td>
+                    <td class="align-center"><?php echo $order['refill_amount']; ?></td>
+                    <td class="align-right"><?php echo date('Y-m-d H:i:s', $order['order_time']); ?></td>
+                    <td class="align-right">
+                        <?php if(empty($order['notify_time'])) {
+                            if($order['diff_time'] >= 1800 && $order['diff_time'] <= 3600) {
+                        ?>
+                                <span style="color: #fd9d0e"><?php echo $order['diff_time_text']?></span>
+                            <?php }elseif($order['diff_time'] > 3600) {?>
+                                <span style="color: #f30707"><?php echo $order['diff_time_text']?></span>
+                            <?php }else{?>
+                                <?php echo $order['diff_time_text']?>
+                            <?php }?>
+                        <?php }else{?>
+                         <?php echo $order['diff_time_text']?>
+                        <?php }?>
+                    </td>
+                    <td class="align-center"><?php echo orderState($order); ?></td>
+                    <td class="align-left"><?php echo $order['official_sn']; ?></td>
+                    <td class="align-left"><?php echo $order['err_msg']; ?></td>
+                    <td class="align-left"><?php echo $order['mch_order']; ?></td>
+                    <td class="align-left" class="ch_trade_no"><?php echo $order['ch_trade_no']; ?></td>
+                    <td class="align-center"><?php echo $order['channel_name']; ?></td>
+                    <td class="align-center"><?php echo $order['commit_times']; ?></td>
+                    <td class="align-center"><?php echo $order['quality_text']; ?></td>
+                    <td class="align-center"><?php echo $order['org_quality_text']; ?></td>
+<!--                    <td class="align-center">--><?php //echo $order['mch_amount']; ?><!--</td>-->
+                    <td class="w144 align-center">
+                        <a href="index.php?act=refill_order_manual&op=notify_manual_merchant&type=cancel&order_id=<?php echo $order['order_id']; ?>">
+                            手动失败</a>
+                        |
+                        <a href="index.php?act=refill_order_manual&op=notify_manual_merchant&type=success&order_id=<?php echo $order['order_id']; ?>">
+                            手动成功</a>
+                    </td>
+
+                </tr>
+            <?php } ?>
+        <?php } else { ?>
+            <tr class="no_data">
+                <td colspan="19"><?php echo $lang['nc_no_record']; ?></td>
+            </tr>
+        <?php } ?>
+        </tbody>
+        <tfoot>
+        <tr class="tfoot">
+            <td colspan="19" id="dataFuncs">
+                <div class="pagination"> <?php echo $output['show_page']; ?> </div>
+            </td>
+        </tr>
+        </tfoot>
+    </table>
+</div>
+<script type="text/javascript" src="<?php echo RESOURCE_SITE_URL; ?>/laydate/laydate.js"></script>
+<script type="text/javascript" src="<?php echo RESOURCE_SITE_URL; ?>/js/jquery-ui/jquery.ui.js"></script>
+<script type="text/javascript" src="<?php echo RESOURCE_SITE_URL; ?>/js/jquery-ui/i18n/zh-CN.js"
+        charset="utf-8"></script>
+<link rel="stylesheet" type="text/css"
+      href="<?php echo RESOURCE_SITE_URL; ?>/js/jquery-ui/themes/ui-lightness/jquery.ui.css"/>
+<script type="text/javascript" src="<?php echo ADMIN_TEMPLATES_URL;?>/js/xm-select.js"></script>
+<script type="text/javascript" src="<?php echo RESOURCE_SITE_URL;?>/refill/layer.js"></script>
+<script type="text/javascript">
+    $(function () {
+        
+        $('#ncsubmit').click(function () {
+            $('input[name="op"]').val('index');
+           
+            $('#formSearch').submit();
+        });
+        // 表格hover时背景
+        $('.trFlex').each(function () {
+            $(this).hover(function () {
+                $(this)[0].style.backgroundColor = '#cbe9f3'
+            },function() {
+                $(this)[0].style.backgroundColor = '#fff'
+            })
+        })
+    })
+</script>