课程预约

application/api/controller/Usercenter.php

@@ -83,6 +83,7 @@ class Usercenter extends Api
     }
 
     //上课记录，预约点了名的
+    //前端用不到了
     public function lesson_order_finish(){
         $map = [
             'order.user_id' => $this->auth->id,
@@ -423,6 +424,7 @@ class Usercenter extends Api
     }
 
     //过期课程。就是过了上课时间，没签到的
+    //前端用不到了
     public function lesson_order_signout(){
         $map = [
             'order.user_id' => $this->auth->id,
@@ -475,7 +477,6 @@ class Usercenter extends Api
 
         $map = [
             'order.user_id' => $this->auth->id,
-            'order.order_status' => 10,
             'slot.starttime' => ['BETWEEN',[$starttime,$todaytime]],
         ];
 
@@ -489,7 +490,9 @@ class Usercenter extends Api
             ->join('lesson_slot slot','order.slot_id = slot.id','LEFT')
             ->join('lesson','order.lesson_id = lesson.id','LEFT')
             ->join('coach','slot.coach_ids = coach.id','LEFT')
-            ->where($map)->order('slot.starttime desc,order.id desc')
+            ->where($map)
+            ->where('order.order_status = 10 or order.jointype = 2') //已支付的 或 候补单
+            ->order('slot.starttime desc,order.id desc')
             ->autopage()->select();
         $list = $this->list_lang($list,['name']);
 
@@ -544,7 +547,6 @@ class Usercenter extends Api
     public function lesson_order(){
         $map = [
             'order.user_id' => $this->auth->id,
-            'order.order_status' => 10
         ];
         $list = Db::name('lesson_order')->alias('order')
             ->field([
@@ -556,7 +558,9 @@ class Usercenter extends Api
             ->join('lesson_slot slot','order.slot_id = slot.id','LEFT')
             ->join('lesson','order.lesson_id = lesson.id','LEFT')
             ->join('coach','slot.coach_ids = coach.id','LEFT')
-            ->where($map)->order('slot.starttime desc,order.id desc')
+            ->where($map)
+            ->where('order.order_status = 10 or order.jointype = 2') //已支付的 或 候补单
+            ->order('slot.starttime desc,order.id desc')
             ->autopage()->select();
         $list = $this->list_lang($list,['name']);
 
@@ -763,7 +767,7 @@ class Usercenter extends Api
             ->join('lesson','order.lesson_id = lesson.id','LEFT')
             ->where($map)
             ->where($map2)
-            ->order('order.createtime desc')
+            ->order('order.id desc')
             ->select();
         $lesson = $this->list_lang($list,['name']);
         if(!empty($list)){