追加时间转换

application/api/controller/Usercenter.php

@@ -107,8 +107,13 @@ class Usercenter extends Api
                 $order['package_name_en']   = $package_order['name_en'];
                 $order['package_starttime'] = $package_order['starttime'];
                 $order['package_endtime']   = $package_order['endtime'];
+                $order['package_showtime_text'] = date('Y-m-d H:i',$package_order['starttime']).'-'.date('Y-m-d H:i',$package_order['endtime']);
             }
 
+
+            //显示时间
+            $order['showtime_text'] = date('Y-m-d H:i',$order['starttime']);
+
         }
 
         $list = $this->list_lang($list,['package_name']);
@@ -144,6 +149,9 @@ class Usercenter extends Api
             }
             $order['coach_text'] = substr($coach_text,0,-1);
 
+            //显示时间
+            $order['showtime_text'] = date('Y-m-d H:i',$order['starttime']);
+
             //放入支付套餐
             /*if($order['paytype'] == 1){
                 $package_order = Db::name('package_order')->alias('order')
@@ -310,6 +318,9 @@ class Usercenter extends Api
                 $order['can_cancel'] = 0;
             }
 
+            //显示时间
+            $order['showtime_text'] = date('Y-m-d H:i',$order['starttime']);
+
             //放入支付套餐
             /*if($order['paytype'] == 1){
                 $package_order = Db::name('package_order')->alias('order')
@@ -357,6 +368,9 @@ class Usercenter extends Api
             }
             $order['coach_text'] = substr($coach_text,0,-1);
 
+            //显示时间
+            $order['showtime_text'] = date('Y-m-d H:i',$order['starttime']);
+
             //放入支付套餐
             /*if($order['paytype'] == 1){
                 $package_order = Db::name('package_order')->alias('order')
@@ -376,11 +390,34 @@ class Usercenter extends Api
         $this->success(1,$list);
     }
 
-    //课程预约，即将到来 or 预约记录，试课
+    //课程预约，即将到来，试课
+    public function trylesson_order_near(){
+        $map = [
+            'order.user_id' => $this->auth->id,
+            'order.order_status' => 10
+        ];
+
+        $list = Db::name('trylesson_order')->alias('order')
+            ->field('order.id,order.order_amount,order.paytime,order.order_status,
+            trylesson.name,trylesson.name_en')
+            ->join('trylesson','order.trylesson_id = trylesson.id','LEFT')
+            ->where($map)->order('order.paytime desc')
+            ->autopage()->select();
+        $list = $this->list_lang($list,['name']);
+
+        foreach($list as $key => &$order){
+            //显示时间
+            $order['showtime_text'] = date('Y-m-d H:i',$order['paytime']);
+        }
+
+        $this->success(1,$list);
+    }
+
+    //课程预约，预约记录，试课
     public function trylesson_order(){
         $map = [
             'order.user_id' => $this->auth->id,
-            'order.order_status' => ['neq',0]
+            'order.order_status' => ['gt',10]
         ];
 
         $list = Db::name('trylesson_order')->alias('order')
@@ -391,6 +428,11 @@ class Usercenter extends Api
             ->autopage()->select();
         $list = $this->list_lang($list,['name']);
 
+        foreach($list as $key => &$order){
+            //显示时间
+            $order['showtime_text'] = date('Y-m-d H:i',$order['paytime']);
+        }
+
         $this->success(1,$list);
     }