预约订单显示使用的配套名，使用的试课名

application/admin/controller/Lessonorder.php

@@ -58,7 +58,7 @@ class Lessonorder extends Backend
             list($where, $sort, $order, $offset, $limit) = $this->buildparams();
 
             $list = $this->model
-                    ->with(['user','slot','lesson','coach'])
+                    ->with(['user','slot','lesson','coach','packageorder','lessonpackage','trylessonorder','trylesson'])
                     ->where($where)
                     ->where('lessonorder.order_status !=0 or lessonorder.jointype = 2') //已支付的 或 候补单
                     ->order($sort, $order)
@@ -70,6 +70,8 @@ class Lessonorder extends Backend
 				$row->getRelation('slot')->visible(['starttime','endtime']);
 				$row->getRelation('lesson')->visible(['name','name_en','type']);
 				$row->getRelation('coach')->visible(['nickname']);
+				$row->getRelation('lessonpackage')->visible(['name','name_en']);
+				$row->getRelation('trylesson')->visible(['name','name_en']);
             }
 
             $result = array("total" => $list->total(), "rows" => $list->items(), "extend"=>[ 'slot_id' => $slot_id ]);

application/admin/controller/Lessonslot.php

@@ -580,20 +580,23 @@ class Lessonslot extends Backend
         $starttime = strtotime('this week Monday'); // 获取本周一的时间戳
         $endtime   = $starttime + 86400*7;
 
-        $list = Db::name('lesson_slot')->where('is_show',1)->where('starttime','BETWEEN',[$starttime,$endtime])->order('starttime asc')->select();
+        $list = Db::name('lesson_slot')->where('starttime','BETWEEN',[$starttime,$endtime])->order('starttime asc')->select();
         if(empty($list)){
             $this->error('本周还没有课程表');
         }
 
         foreach($list as $key => &$val){
             unset($val['id']);
-            $val['starttime'] = $val['starttime'] + 86400*7;
-            $val['endtime']   = $val['endtime'] + 86400*7;
+            $val['starttime'] = $val['starttime'] + (86400*7);
+            $val['endtime']   = $val['endtime'] + (86400*7);
+            $val['bookednum'] = 0;
             $val['status'] = 0;
             $val['notice_status'] = 0;
             $val['finishtime'] = 0;
             $val['cancel_reason'] = '';
             $val['cancel_time'] = 0;
+            $val['is_show'] = 0;
+            $val['cancel_notice_status'] = 0;
         }
 
         Db::name('lesson_slot')->insertAll($list);

application/admin/lang/en/lessonorder.php

@@ -44,5 +44,7 @@ return [
     'Lesson.type'            => 'Lesson Type',
     'Lesson.type 1'          => 'Public',
     'Lesson.type 2'          => 'Private',
-    'Coach.nickname'   => 'Instructor'
+    'Coach.nickname'   => 'Instructor',
+    'lessonpackage.name' => 'Plans',
+    'trylesson.name'     => 'Trial',
 ];

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

@@ -45,4 +45,7 @@ return [
     'Lesson.type 1'          => '普通课',
     'Lesson.type 2'          => '私教课',
     'Coach.nickname'     => '教练',
+    'Coach.nickname'     => '教练',
+    'lessonpackage.name' => '配套名',
+    'trylesson.name'     => '试课名',
 ];

application/admin/model/Lessonorder.php

@@ -119,4 +119,28 @@ class Lessonorder extends Model
     {
         return $this->belongsTo('Coach', 'slot.coach_ids', 'id', [], 'LEFT')->setEagerlyType(0);
     }
+
+
+    public function packageorder()
+    {
+        return $this->belongsTo('Packageorder', 'package_order_id', 'id', [], 'LEFT')->setEagerlyType(0);
+    }
+
+
+    public function lessonpackage()
+    {
+        return $this->belongsTo('Lessonpackage', 'packageorder.package_id', 'id', [], 'LEFT')->setEagerlyType(0);
+    }
+
+
+    public function trylessonorder()
+    {
+        return $this->belongsTo('Trylessonorder', 'trylesson_order_id', 'id', [], 'LEFT')->setEagerlyType(0);
+    }
+
+
+    public function trylesson()
+    {
+        return $this->belongsTo('Trylesson', 'trylessonorder.trylesson_id', 'id', [], 'LEFT')->setEagerlyType(0);
+    }
 }

public/assets/js/backend/lessonorder.js

@@ -51,9 +51,14 @@ 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'),"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: '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: 'package_order_id', title: __('Package_order_id')},
+                        {field: 'lessonpackage.name', title: __('lessonpackage.name')},
+                        {field: 'package_remark', title: __('Package_remark'), operate: 'LIKE'},
+                        {field: 'trylesson_order_id', title: __('Trylesson_order_id')},
+                        {field: 'trylesson.name', title: __('trylesson.name')},
                         {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},
                         {field: 'finishtime', title: __('Finishtime'), operate:'RANGE', addclass:'datetimerange', autocomplete:false, formatter: Table.api.formatter.datetime},
@@ -61,11 +66,9 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
 //                        {field: 'usernumber_hours', title: __('Usernumber_hours'), operate:'BETWEEN'},
                         {field: 'usernumber_sign', title: __('Usernumber_sign')},
                         {field: 'userremark', title: __('Userremark'), operate: 'LIKE'},
-                        {field: 'package_order_id', title: __('Package_order_id')},
-                        {field: 'package_remark', title: __('Package_remark'), operate: 'LIKE'},
+
                         {field: 'cancel_reason', title: __('Cancel_reason'), operate: 'LIKE'},
                         {field: 'cancel_time', title: __('Cancel_time'), operate:'RANGE', addclass:'datetimerange', autocomplete:false, formatter: Table.api.formatter.datetime},
-                        {field: 'trylesson_order_id', title: __('Trylesson_order_id')},