Merge branch 'li_huaweicloud' into testing

protected/controllers/ImsSaleController.php

@@ -421,7 +421,8 @@ class ImsSaleController extends Controller
             if($result['data']){
                 $classId=$result['data'][0]['clazzId'];
 
-                $studentHttp= http('order/coach/all/student/by/'.$orderId.'/'.$classId.'/'.$type, 'get', $this->authUsername);
+                //$studentHttp= http('order/coach/all/student/by/'.$orderId.'/'.$classId.'/'.$type, 'get', $this->authUsername);
+                $studentHttp= http('order/coach/all/student/by/'.$orderId.'/'.$classId.'/'.$type, 'get', $this->authUsername,array('stuName'=>''));
                 $students=formatResponse($studentHttp);
                 if($students['status']==1){
                     $result['students']=$students['data'];
@@ -436,9 +437,11 @@ class ImsSaleController extends Controller
         $orderId=Req::post('orderId');
         $type=Req::post('type');
         $classId=Req::post('classId');
+        $stuName=Req::post('studentName')?Req::post('studentName'):'';
         $result['status']=0;
 
-        $studentHttp= http('order/coach/all/student/by/'.$orderId.'/'.$classId.'/'.$type, 'get', $this->authUsername);
+       // $studentHttp= http('order/coach/all/student/by/'.$orderId.'/'.$classId.'/'.$type, 'get', $this->authUsername);
+        $studentHttp= http('order/coach/all/student/by/'.$orderId.'/'.$classId.'/'.$type, 'get', $this->authUsername,array('stuName'=>$stuName));
         $students=formatResponse($studentHttp);
         if($students['status']==1){
             $result['status']=1;
@@ -3002,7 +3005,8 @@ class ImsSaleController extends Controller
             if($result['data']){
                 $classId=$result['data'][0]['clazzId'];
 
-                $studentHttp= http('order-trial-delete/coach/student-list/'.$orderId.'/'.$classId, 'get', $this->authUsername);
+               // $studentHttp= http('order-trial-delete/coach/student-list/'.$orderId.'/'.$classId, 'get', $this->authUsername);
+                $studentHttp= http('order-trial-delete/coach/student-list/'.$orderId.'/'.$classId, 'get', $this->authUsername,array('stuName'=>''));
                 $students=formatResponse($studentHttp);
                 if($students['status']==1){
                     $result['students']=$students['data'];
@@ -3015,9 +3019,11 @@ class ImsSaleController extends Controller
     public function actionGetDeleteStudentByClassIdOrderId(){
         $orderId=Req::post('orderId');
         $classId=Req::post('classId');
+        $studentName=Req::post('studentName')?Req::post('studentName'):'';
         $result['status']=0;
-
-        $studentHttp= http('order-trial-delete/coach/student-list/'.$orderId.'/'.$classId, 'get', $this->authUsername);
+        $url='order-trial-delete/coach/student-list/'.$orderId.'/'.$classId;
+       // $studentHttp= http('order-trial-delete/coach/student-list/'.$orderId.'/'.$classId, 'get', $this->authUsername);
+        $studentHttp= http($url, 'get', $this->authUsername,array('stuName'=>$studentName));
         $students=formatResponse($studentHttp);
         if($students['status']==1){
             $result['status']=1;