预约订单，候补

application/admin/controller/Lessonorder.php

@@ -55,7 +55,7 @@ class Lessonorder extends Backend
             $list = $this->model
                     ->with(['user','slot','lesson','coach'])
                     ->where($where)
-                    ->where('lessonorder.order_status','NEQ',0)
+                    ->where('lessonorder.order_status !=0 or lessonorder.jointype = 2') //已支付的 或 候补单
                     ->order($sort, $order)
                     ->paginate($limit);
 

application/admin/lang/en/lessonorder.php

@@ -13,11 +13,15 @@ return [
     'Order_status 20'  => 'signed',
     'Order_status 30'  => 'canceled',
     'Order_status 40'  => 'returned',
+    'Jointype'         => 'Booking Method',
+    'Jointype 1'       => 'reservation',
+    'Jointype 2'       => 'candidate',
     'Paytype'          => 'Pay type',
     'Paytype 1'        => 'package',
     'Paytype 2'        => 'Online payment',
     'Paytype 3'        => 'Purchase package',
     'Paytype 4'        => 'Try lesson',
+    'Paytype 5'        => 'Candidate',
     'Paytime'          => 'Pay time',
     'Createtime'       => 'Create time',
     'Updatetime'       => 'Update time',

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

@@ -13,11 +13,15 @@ return [
     'Order_status 20'    => '已点名',
     'Order_status 30'    => '已取消',
     'Order_status 40'    => '已退课',
+    'Jointype'           => '预约类型',
+    'Jointype 1'         => '预约',
+    'Jointype 2'         => '候补',
     'Paytype'            => '支付类型',
-    'Paytype 1'          => '课程套餐',
+    'Paytype 1'          => '课程配套',
     'Paytype 2'          => '线上付款',
     'Paytype 3'          => '购买套餐中',
     'Paytype 4'          => '试课订单',
+    'Paytype 5'          => '候补',
     'Paytime'            => '在线支付时间',
     'Createtime'         => '创建时间',
     'Updatetime'         => '更新时间',

application/admin/model/Lessonorder.php

@@ -41,7 +41,7 @@ class Lessonorder extends Model
 
     public function getPaytypeList()
     {
-        return ['1' => __('Paytype 1'), '2' => __('Paytype 2'), '3' => __('Paytype 3'), '4' => __('Paytype 4')];
+        return ['1' => __('Paytype 1'), '2' => __('Paytype 2'), '3' => __('Paytype 3'), '4' => __('Paytype 4'), '5' => __('Paytype 5')];
     }
 
 

public/assets/js/backend/lessonorder.js

@@ -42,7 +42,8 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                         {field: 'coach.nickname', title: __('Coach.nickname'), operate: 'LIKE'},
                         {field: 'order_amount', title: __('Order_amount'), operate:'BETWEEN'},
                         {field: 'order_status', title: __('Order_status'), searchList: {"0":__('Order_status 0'),"10":__('Order_status 10'),"20":__('Order_status 20'),"30":__('Order_status 30'),"40":__('Order_status 40')}, formatter: Table.api.formatter.status},
-                        {field: 'paytype', title: __('Paytype'), searchList: {"1":__('Paytype 1'),"2":__('Paytype 2'),"3":__('Paytype 3'),"4":__('Paytype 4')}, formatter: Table.api.formatter.normal},
+                        {field: 'paytype', title: __('Paytype'), searchList: {"1":__('Paytype 1'),"2":__('Paytype 2'),"3":__('Paytype 3'),"4":__('Paytype 4'),"5":__('Paytype 5')}, formatter: Table.api.formatter.normal},
+                        {field: 'jointype', title: __('Jointype'), searchList: {"1":__('Jointype 1'),"2":__('Jointype 2')}, formatter: Table.api.formatter.normal},
                         {field: 'paytime', title: __('Paytime'), 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: 'updatetime', title: __('Updatetime'), operate:'RANGE', addclass:'datetimerange', autocomplete:false, formatter: Table.api.formatter.datetime},