admin update

admin/control/ordersendlist.php

@@ -739,7 +739,7 @@ class ordersendlistControl extends SystemControl
         if(in_array($_GET['except_state'], ['0', '1'])) {
             $cond['except_state'] = $_GET['except_state'];
         }
-        $list = $mod_except->getExceptionList($cond, 200);
+        $list = $mod_except->getExceptionList($cond, 200, 0, 'refill_exception.*,refill_order.order_time,refill_order.card_no');
 
         $merchant_list = $this->merchants();
         foreach ($merchant_list as  $value) {

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

@@ -166,8 +166,10 @@
                 <th class="align-left">机构名称</th>
                 <th class="align-left">通道名称</th>
                 <th class="align-left">订单号</th>
+                <th class="align-left">充值卡号</th>
                 <th class="align-left">异常事件</th>
                 <th class="align-left">异常信息</th>
+                <th class="align-left">订单日期</th>
                 <th class="align-left">生成日期</th>
                 <th class="align-left">更新日期</th>
                 <th class="align-center">异常状态</th>
@@ -188,8 +190,10 @@
                         <td class="align-left"><?php echo $output['merchant_list'][$order['mchid']]['company_name']; ?></td>
                         <td class="align-left"><?php echo $order['store_name']; ?></td>
                         <td class="align-left"><?php echo $order['order_sn']; ?></td>
+                        <td class="align-left"><?php echo $order['card_no']; ?></td>
                         <td class="align-left"><?php echo $order['title']; ?></td>
                         <td class="align-left"><?php echo $order['except_desc']; ?></td>
+                        <td class="align-left"><?php echo date('Y-m-d H:i:s', $order['order_time']) ?? '/'; ?></td>
                         <td class="align-left"><?php echo date('Y-m-d H:i:s', $order['add_time']) ?? '/'; ?></td>
                         <td class="align-left"><?php echo !empty($order['oper_time']) ? date('Y-m-d H:i:s', $order['oper_time']) : '/'; ?></td>
                         <td class="align-center">

data/model/refill_exception.model.php

@@ -20,7 +20,10 @@ class refill_exceptionModel extends Model
 
     public function getExceptionList($condition, $pagesize = '',$total = 0, $field = '*', $order = 'add_time desc', $limit = '', $master = false)
     {
-        $list = $this->field($field)->where($condition)->page($pagesize,$total)->order($order)->limit($limit)->master($master)->select();
+        $list = $this->table('refill_exception,refill_order')
+            ->field($field)->where($condition)
+            ->join('inner')->on('refill_exception.order_id=refill_order.order_id')
+            ->page($pagesize,$total)->order($order)->limit($limit)->master($master)->select();
         if (empty($list)) return [];
         return $list;
     }
@@ -41,4 +44,4 @@ class refill_exceptionModel extends Model
         $item = $this->field('*')->where(['order_sn' => $order_sn])->find();
         return !empty($item);
     }
-}
+}