|
@@ -452,23 +452,24 @@ class Usercenter extends Api
|
|
|
$this->success(1,$list);
|
|
|
}
|
|
|
|
|
|
- //课程预约,预约记录,试课
|
|
|
+ //我的试课订单
|
|
|
public function trylesson_order(){
|
|
|
$map = [
|
|
|
'order.user_id' => $this->auth->id,
|
|
|
+ 'order.order_status' => ['in',[10,20]],
|
|
|
];
|
|
|
|
|
|
$list = Db::name('trylesson_order')->alias('order')
|
|
|
- ->field('order.id,order.order_amount,order.paytime,order.order_status,
|
|
|
+ ->field('order.id,order.order_amount,order.paytime,order.order_status,order.starttime,order.endtime,
|
|
|
trylesson.name,trylesson.name_en')
|
|
|
->join('trylesson','order.trylesson_id = trylesson.id','LEFT')
|
|
|
- ->where($map)->order('order.paytime desc')
|
|
|
+ ->where($map)->order('order.order_status asc,order.endtime asc')
|
|
|
->autopage()->select();
|
|
|
$list = $this->list_lang($list,['name']);
|
|
|
|
|
|
foreach($list as $key => &$order){
|
|
|
//显示时间
|
|
|
- $order['showtime_text'] = date('Y-m-d H:i',$order['paytime']);
|
|
|
+ $order['showtime_text'] = date('m月d,Y',$order['starttime']).'-'.date('m月d,Y',$order['endtime']);
|
|
|
}
|
|
|
|
|
|
$this->success(1,$list);
|