|
|
@@ -498,10 +498,11 @@ class Usercenter extends Api
|
|
|
$this->success(1,$list);
|
|
|
}
|
|
|
|
|
|
- //课程预约，即将到来3天，售课
|
|
|
+ //课程预约，即将到来24小时，售课
|
|
|
public function lesson_order_near(){
|
|
|
$starttime = strtotime(date('Y-m-d')); //今天早上
|
|
|
- $todaytime = strtotime(date('Y-m-d')) + 86400*3 - 1; //后天晚上
|
|
|
+// $todaytime = strtotime(date('Y-m-d')) + 86400*3 - 1; //后天晚上
|
|
|
+ $todaytime = time() + 86400; //未来24小时
|
|
|
|
|
|
$map = [
|
|
|
'order.user_id' => $this->auth->id,
|
|
|
@@ -528,7 +529,7 @@ class Usercenter extends Api
|
|
|
//hours转换
|
|
|
$order['hours'] = floatval($order['hours']);
|
|
|
|
|
|
- //24小时内可以申请取消
|
|
|
+ //距离开课大于24小时可以申请取消
|
|
|
if($order['jointype'] == 1 && $order['starttime'] - time() > 86400){
|
|
|
$order['can_cancel'] = 1;
|
|
|
}else{
|
|
|
@@ -547,7 +548,7 @@ class Usercenter extends Api
|
|
|
|
|
|
//预约情况
|
|
|
$yuyue = $order['usernumber'] .' 人预约' . ($order['jointype'] == 1 ? '' : '(候补)');
|
|
|
- $yuyue_en = $order['usernumber'] . ($order['jointype'] == 1 ? ' Booked' : ' Candidate');
|
|
|
+ $yuyue_en = $order['usernumber'] . ($order['jointype'] == 1 ? ' Booked' : ' Waited');
|
|
|
$yuyue = $this->lang == 'en' ? $yuyue_en : $yuyue;
|
|
|
|
|
|
$order['coach_text'] = $yuyue.' '.$order['coach_text'];
|
|
|
@@ -615,7 +616,7 @@ class Usercenter extends Api
|
|
|
|
|
|
//预约情况
|
|
|
$yuyue = $order['usernumber'] .' 人预约' . ($order['jointype'] == 1 ? '' : '(候补)');
|
|
|
- $yuyue_en = $order['usernumber'] . ($order['jointype'] == 1 ? ' Booked' : 'Candidate');
|
|
|
+ $yuyue_en = $order['usernumber'] . ($order['jointype'] == 1 ? ' Booked' : 'Waited');
|
|
|
$yuyue = $this->lang == 'en' ? $yuyue_en : $yuyue;
|
|
|
|
|
|
$order['coach_text'] = $yuyue.' '.$order['coach_text'];
|
lizhen_gitee