Merge branch 'rmaster' into rperform

admin/control/refill_order.php

@@ -323,7 +323,7 @@ class refill_orderControl extends SystemControl
         $condition['refill_order.order_time'] = ['egt', $order_time];
         $condition['refill_order.mchid'] = $mchid;
 
-        $field = 'refill_order.commit_time,refill_order.notify_time,refill_order.channel_name,vr_order.order_state';
+        $field = 'refill_order.order_sn,refill_order.commit_time,refill_order.notify_time,refill_order.channel_name,vr_order.order_state';
         $order_list = $model_refill_order->getMerchantOrderList($condition, 1000, $field);
 
         foreach ($order_list as $order_id => $order_info) {

admin/control/refill_order_manual.php

@@ -23,7 +23,7 @@ class refill_order_manualControl extends SystemControl
                 $merchants[$value['mchid']] = $value;
             }
 
-            $order_list = $model_refill_order->getMerchantOrderList($condition, 50, 'refill_order.*,vr_order.order_state', 'refill_order.order_time desc');
+            $order_list = $model_refill_order->getMerchantOrderList($condition, 50, 'refill_order.*,vr_order.order_state', 'refill_order.order_time desc','',true);
             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'];

admin/include/menu.php

@@ -98,7 +98,7 @@ $arr = array(
 					array('args'=>'index,refill_order,merchant',			'text'=>'订单列表'),
 					array('args'=>'index,provider,merchant',				'text'=>'通道列表'),
 					array('args'=>'index,provider_group,merchant',			'text'=>'通道组管理'),
-					array('args'=>'index,ordersendlist,merchant',			'text'=>'问题订单监控'),
+					array('args'=>'index,ordersendlist,merchant',			'text'=>'订单监控'),
 					array('args'=>'index,orderstats,merchant',				'text'=>'对账管理'),
 					array('args'=>'stats,card_key,merchant',				'text'=>'卡密管理'),
 					array('args'=>'index,refill_stock,merchant',			'text'=>'库存管理'),

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

@@ -74,7 +74,7 @@
 
     }
     .db-right {
-        padding-right: 98px!important;
+        padding-right: 134px!important;
     border-bottom: 1px solid #ccc;
 
     }
@@ -523,7 +523,6 @@
                 order_sn:db_click
             }, function(data) {
                 data = JSON.parse(data)
-           
                 if (data.state == 1) {
                     
                 var dbclick = data.data
@@ -533,6 +532,7 @@
                     var item = dbclick[i];
                     html += `
                     <tr>
+                                         <td class="db-center">${item.order_sn}</td>
                                          <td class="db-center">${item.commit_time_text}</td>
                                          <td class="db-center">${item.notify_time_text}</td>
                                          <td class="db-center">${item.diff_time_text}</td>
@@ -550,7 +550,7 @@
                    content: `<table>
                    <thead>
                              <tr>
-
+                                        <th class="db-right">订单号</th>
                                          <th class="db-right">下单日期</th>
                                          <th class="db-right">回调日期</th>
                                          <th class="db-right">耗时</th>

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

@@ -48,7 +48,7 @@
         margin-left: 6px;
     }
     .db-right {
-        padding-right: 98px!important;
+        padding-right: 134px!important;
     border-bottom: 1px solid #ccc;
 
     }
@@ -356,6 +356,7 @@
                     var item = dbclick[i];
                     html += `
                     <tr>
+                                        <td class="db-center">${item.order_sn}</td>
                                          <td class="db-center">${item.commit_time_text}</td>
                                          <td class="db-center">${item.notify_time_text}</td>
                                          <td class="db-center">${item.diff_time_text}</td>
@@ -373,7 +374,7 @@
                    content: `<table>
                    <thead>
                              <tr>
-
+                                         <th class="db-right">订单号</th>
                                          <th class="db-right">下单日期</th>
                                          <th class="db-right">回调日期</th>
                                          <th class="db-right">耗时</th>

data/model/refill_order.model.php

@@ -1,51 +1,51 @@
-<?php
-
-use const mtopcard\PetroChinaCard;
-use const mtopcard\PhoneCard;
-use const mtopcard\SinopecCard;
-
-defined('InShopNC') or exit('Access Invalid!');
-
-
-class refill_orderModel extends Model
-{
-    public function getOrderInfo($condition = [], $fields = '*', $master = false, $lock = false)
-    {
-        $order_info = $this->table('refill_order')->field($fields)->where($condition)->order('')->master($master)->lock($lock)->find();
-        if (empty($order_info)) {
-            return [];
-        }
-        return $order_info;
-    }
-
-    public function add_refill($params)
-    {
-        return $this->table('refill_order')->insert($params);
-    }
-
-    public function edit($order_id,$data)
-    {
-        return $this->table('refill_order')->where(['order_id' => $order_id])->update($data);
-    }
-
-    public function getMerchantOrderList($condition, $pagesize = '', $field = '*', $order = 'refill_order.order_id desc', $limit = '')
-    {
-        $list = $this->table('refill_order,vr_order')->field($field)
-            ->where($condition)->join('inner')->on('refill_order.order_id=vr_order.order_id')->page($pagesize)->order($order)->limit($limit)->select();
-        if (empty($list)) return [];
-        return $list;
-    }
-
-    public function getOrderStatsList($condition, $pagesize = '', $field = '*', $order = 'time_stamp desc', $limit = '')
-    {
-        $list = $this->table('refill_stats')->field($field)
-            ->where($condition)->page($pagesize)->order($order)->limit($limit)->select();
-        if (empty($list)) return [];
-        return $list;
-    }
-
-    public function first_item()
-    {
-        return $this->table('refill_order')->field('order_time')->where(['order_id' => ['gt',0]])->order('order_id asc')->find();
-    }
-}
+<?php
+
+use const mtopcard\PetroChinaCard;
+use const mtopcard\PhoneCard;
+use const mtopcard\SinopecCard;
+
+defined('InShopNC') or exit('Access Invalid!');
+
+
+class refill_orderModel extends Model
+{
+    public function getOrderInfo($condition = [], $fields = '*', $master = false, $lock = false)
+    {
+        $order_info = $this->table('refill_order')->field($fields)->where($condition)->order('')->master($master)->lock($lock)->find();
+        if (empty($order_info)) {
+            return [];
+        }
+        return $order_info;
+    }
+
+    public function add_refill($params)
+    {
+        return $this->table('refill_order')->insert($params);
+    }
+
+    public function edit($order_id,$data)
+    {
+        return $this->table('refill_order')->where(['order_id' => $order_id])->update($data);
+    }
+
+    public function getMerchantOrderList($condition, $pagesize = '', $field = '*', $order = 'refill_order.order_id desc', $limit = '', $master = false)
+    {
+        $list = $this->table('refill_order,vr_order')->field($field)
+            ->where($condition)->join('inner')->on('refill_order.order_id=vr_order.order_id')->page($pagesize)->order($order)->limit($limit)->master($master)->select();
+        if (empty($list)) return [];
+        return $list;
+    }
+
+    public function getOrderStatsList($condition, $pagesize = '', $field = '*', $order = 'time_stamp desc', $limit = '')
+    {
+        $list = $this->table('refill_stats')->field($field)
+            ->where($condition)->page($pagesize)->order($order)->limit($limit)->select();
+        if (empty($list)) return [];
+        return $list;
+    }
+
+    public function first_item()
+    {
+        return $this->table('refill_order')->field('order_time')->where(['order_id' => ['gt',0]])->order('order_id asc')->find();
+    }
+}