合并分支 'Branch_liuzhen' 到 'master'

订单接口修改



查看合并请求 !7

@@ -299,18 +299,6 @@ class Order extends Api
                     'id' => '',
                     'id' => '',
                     'token' => ''
                     'token' => ''
                 ];
                 ];
-                if($v['status'] == 2) {
-                    $v['user'] = [
-                        'id' => $this->user['rongyun_id'],
-                        'token' => $this->user['rongyun_token']
-                    ];
-                    $teacher_id = Db::name('teacher')->where('id',$v['teacher_id'])->value('user_id');
-                    $teacher = Db::name('user')->field('rongyun_id,rongyun_token')->where('id',$teacher_id)->find();
-                    $v['teacher'] = [
-                        'id' => $teacher['rongyun_id'],
-                        'token' => $teacher['rongyun_token']
-                    ];
-                }
             }
             }
         }else{
         }else{
             $this->error('类型有误');
             $this->error('类型有误');
@@ -327,6 +315,18 @@ class Order extends Api
                 $v['is_comment'] = 1;
                 $v['is_comment'] = 1;
             }
             }
             $v['expirationtime'] = date('Y-m-d H:i',$v['expirationtime']);
             $v['expirationtime'] = date('Y-m-d H:i',$v['expirationtime']);
+            if($v['status'] == 2) {
+                $v['user'] = [
+                    'id' => $this->user['rongyun_id'],
+                    'token' => $this->user['rongyun_token']
+                ];
+                $teacher_id = Db::name('teacher')->where('id',$v['teacher_id'])->value('user_id');
+                $teacher = Db::name('user')->field('rongyun_id,rongyun_token')->where('id',$teacher_id)->find();
+                $v['teacher'] = [
+                    'id' => $teacher['rongyun_id'],
+                    'token' => $teacher['rongyun_token']
+                ];
+            }
         }
         }
         $this->success('success',$data);
         $this->success('success',$data);
     }
     }