支付订单管理

application/admin/controller/Payorder.php

@@ -23,6 +23,7 @@ class Payorder extends Backend
         parent::_initialize();
         $this->model = new \app\admin\model\Payorder;
         $this->view->assign("orderStatusList", $this->model->getOrderStatusList());
+        $this->view->assign("tableNameList", $this->model->getTableNameList());
     }
 
 
@@ -53,6 +54,7 @@ class Payorder extends Backend
             $list = $this->model
                     ->with(['user'])
                     ->where($where)
+                    ->where('payorder.order_status',1)
                     ->order($sort, $order)
                     ->paginate($limit);
 

application/admin/lang/zh-cn/payorder.php

@@ -6,14 +6,17 @@ return [
     'Out_trade_no'       => '订单号',
     'Order_amount'       => '订单金额',
     'Createtime'         => '下单时间',
-    'Notifytime'         => '回调时间',
+    'Notifytime'         => '支付时间',
     'Pay_type'           => '支付方式',
     'Platform'           => '支付平台',
     'Order_status'       => '状态',
     'Order_status 0'     => '待支付',
     'Order_status 1'     => '已支付 ',
-    'Table_name'         => '订单表名',
-    'Table_id'           => '订单表主键',
+    'Table_name'         => '订单类型',
+    'Table_name package_order'         => '配套',
+    'Table_name lesson_order'         => '售课',
+    'Table_name trylesson_order'         => '试课',
+    'Table_id'           => '订单ID',
     'Args'               => '扩展参数',
     'Payment_request_id' => 'hitpay请求id',
     'Payment_id'         => 'hitpay支付id',

application/admin/model/Payorder.php

@@ -26,7 +26,8 @@ class Payorder extends Model
     // 追加属性
     protected $append = [
         'notifytime_text',
-        'order_status_text'
+        'order_status_text',
+        'table_name_text'
     ];
     
 
@@ -36,6 +37,11 @@ class Payorder extends Model
         return ['0' => __('Order_status 0'), '1' => __('Order_status 1')];
     }
 
+    public function getTableNameList()
+    {
+        return ['package_order' => __('Table_name package_order'), 'lesson_order' => __('Table_name lesson_order'), 'trylesson_order' => __('Table_name trylesson_order')];
+    }
+
 
     public function getNotifytimeTextAttr($value, $data)
     {
@@ -51,6 +57,14 @@ class Payorder extends Model
         return isset($list[$value]) ? $list[$value] : '';
     }
 
+
+    public function getTableNameTextAttr($value, $data)
+    {
+        $value = $value ? $value : (isset($data['table_name']) ? $data['table_name'] : '');
+        $list = $this->getTableNameList();
+        return isset($list[$value]) ? $list[$value] : '';
+    }
+
     protected function setNotifytimeAttr($value)
     {
         return $value === '' ? null : ($value && !is_numeric($value) ? strtotime($value) : $value);

public/assets/js/backend/payorder.js

@@ -35,18 +35,18 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
 
                         {field: 'out_trade_no', title: __('Out_trade_no'), operate: 'LIKE'},
                         {field: 'order_amount', title: __('Order_amount'), operate:'BETWEEN'},
-                        {field: 'createtime', title: __('Createtime'), operate:'RANGE', addclass:'datetimerange', autocomplete:false, formatter: Table.api.formatter.datetime},
+//                        {field: 'createtime', title: __('Createtime'), operate:'RANGE', addclass:'datetimerange', autocomplete:false, formatter: Table.api.formatter.datetime},
                         {field: 'notifytime', title: __('Notifytime'), operate:'RANGE', addclass:'datetimerange', autocomplete:false, formatter: Table.api.formatter.datetime},
-                        {field: 'pay_type', title: __('Pay_type'), operate: 'LIKE'},
-                        {field: 'platform', title: __('Platform'), operate: 'LIKE'},
-                        {field: 'order_status', title: __('Order_status'), searchList: {"0":__('Order_status 0'),"1":__('Order_status 1')}, formatter: Table.api.formatter.status},
-                        {field: 'table_name', title: __('Table_name'), operate: 'LIKE'},
+//                        {field: 'pay_type', title: __('Pay_type'), operate: 'LIKE'},
+//                        {field: 'platform', title: __('Platform'), operate: 'LIKE'},
+//                        {field: 'order_status', title: __('Order_status'), searchList: {"0":__('Order_status 0'),"1":__('Order_status 1')}, formatter: Table.api.formatter.status},
+                        {field: 'table_name', title: __('Table_name'), searchList: {"package_order":__('Table_name package_order'),"lesson_order":__('Table_name lesson_order'),"trylesson_order":__('Table_name trylesson_order')}, formatter: Table.api.formatter.status},
                         {field: 'table_id', title: __('Table_id')},
-                        {field: 'args', title: __('Args'), operate: 'LIKE'},
-                        {field: 'payment_request_id', title: __('Payment_request_id'), operate: 'LIKE'},
-                        {field: 'payment_id', title: __('Payment_id'), operate: 'LIKE'},
+//                        {field: 'args', title: __('Args'), operate: 'LIKE'},
+//                        {field: 'payment_request_id', title: __('Payment_request_id'), operate: 'LIKE'},
+//                        {field: 'payment_id', title: __('Payment_id'), operate: 'LIKE'},
 
-                        {field: 'operate', title: __('Operate'), table: table, events: Table.api.events.operate, formatter: Table.api.formatter.operate}
+//                        {field: 'operate', title: __('Operate'), table: table, events: Table.api.events.operate, formatter: Table.api.formatter.operate}
                     ]
                 ]
             });