赠课记录

application/api/controller/Usercenter.php

@@ -18,12 +18,13 @@ class Usercenter extends Api
         $map = [
             'order.user_id' => $this->auth->id,
             'order.order_status' => 1,
-            'order.remain' => ['gt',0],
+            //'order.remain' => ['gt',0],
+            'order.is_gift' => 0,
         ];
         $list = Db::name('package_order')->alias('order')
             ->field('order.id,order.starttime,order.endtime,order.is_gift,order.remain,p.name,p.name_en')
             ->join('lesson_package p','order.package_id = p.id','LEFT')
-            ->where($map)->order('order.endtime asc')
+            ->where($map)->order('order.remain desc,order.endtime asc')
             ->autopage()->select();
 
         $list = $this->list_lang($list,['name']);
@@ -31,6 +32,28 @@ class Usercenter extends Api
         $this->success(1,$list);
     }
 
+    //赠课记录
+    public function package_gift(){
+        $map = [
+            'order.user_id' => $this->auth->id,
+            'order.order_status' => 1,
+            //'order.remain' => ['gt',0],
+            'order.is_gift' => 1,
+        ];
+        $list = Db::name('package_order')->alias('order')
+            ->field('order.id,order.order_no,order.starttime,order.endtime,order.is_gift,order.sessions,order.remain,
+            p.name as package_name,p.name_en as package_name_en,
+            lesson.name,lesson.name_en')
+            ->join('lesson_package p','order.package_id = p.id','LEFT')
+            ->join('lesson','order.lesson_id = lesson.id','LEFT')
+            ->where($map)->order('order.remain desc,order.endtime asc')
+            ->autopage()->select();
+
+        $list = $this->list_lang($list,['name','package_name']);
+
+        $this->success(1,$list);
+    }
+
     //上课记录，预约点了名的
     public function lesson_order_finish(){
         $map = [
@@ -168,7 +191,8 @@ class Usercenter extends Api
         $this->success(1,$list);
     }
 
-    //赠课记录
+
+
 
     //课程预约，即将到来，试课和售课