|
@@ -177,7 +177,7 @@ class Usercenter extends Api
|
|
|
'order.order_status' => ['IN',[30,40]],//已取消
|
|
|
];
|
|
|
$list = Db::name('lesson_order')->alias('order')
|
|
|
- ->field('order.id,order.order_amount,order.paytype,order.package_order_id,order.package_remark,order.cancel_reason,
|
|
|
+ ->field('order.id,order.order_amount,order.paytype,order.package_order_id,order.package_remark,order.cancel_reason,order.usernumber,order.jointype,
|
|
|
lesson.name,lesson.name_en,
|
|
|
slot.starttime,slot.hours,slot.address,slot.coach_ids,
|
|
|
coach.nickname as coach_text'
|
|
@@ -208,6 +208,13 @@ class Usercenter extends Api
|
|
|
$order['package_endtime'] = $package_order['endtime'];
|
|
|
}*/
|
|
|
|
|
|
+ //预约情况
|
|
|
+ $yuyue = $order['usernumber'] . ($order['jointype'] == 1 ? ' 人预约' : ' 人候补');
|
|
|
+ $yuyue_en = $order['usernumber'] . ($order['jointype'] == 1 ? ' Booked' : ' Waitlisted');
|
|
|
+ $yuyue = $this->lang == 'en' ? $yuyue_en : $yuyue;
|
|
|
+
|
|
|
+ $order['coach_text'] = $yuyue.' '.$order['coach_text'];
|
|
|
+
|
|
|
}
|
|
|
|
|
|
//$list = $this->list_lang($list,['package_name']);
|