课程预约

application/api/controller/Usercenter.php

@@ -501,7 +501,7 @@ class Usercenter extends Api
             $order['hours'] = floatval($order['hours']);
 
             //24小时内可以申请取消
-            if($order['starttime'] - time() > 86400){
+            if($order['jointype'] == 1 && $order['starttime'] - time() > 86400){
                 $order['can_cancel'] = 1;
             }else{
                 $order['can_cancel'] = 0;
@@ -519,7 +519,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' : ' candidate');
             $yuyue = $this->lang == 'en' ? $yuyue_en : $yuyue;
 
             $order['coach_text'] = $yuyue.'|'.$order['coach_text'];
@@ -569,7 +569,7 @@ class Usercenter extends Api
             $order['hours'] = floatval($order['hours']);
 
             //24小时内可以申请取消
-            if($order['starttime'] - time() > 86400){
+            if($order['jointype'] == 1 && $order['starttime'] - time() > 86400){
                 $order['can_cancel'] = 1;
             }else{
                 $order['can_cancel'] = 0;