接口调整

application/api/controller/doctor/User.php

@@ -295,7 +295,7 @@ class User extends Apic
             'doctor_image',
 
             'avatar','nickname','gender',
-            'keshi_id','hospital','goodat','level_id','info'
+            'keshi_id','hospital','goodat','level_id','info','job_status'
         ];
 
         $data = [];
@@ -339,6 +339,7 @@ class User extends Apic
             'typing_price',
             'video_price',
             'notice_switch',
+            'jolt_switch',
         ];
 
         $data = [];

application/api/controller/doctor/Wenzhen.php

@@ -38,7 +38,7 @@ class Wenzhen extends Apic
 
         //查询
         $field = [
-            'order.id','order.order_no','order.createtime','order.status','order.ordertype','order.accept_time','order.video_time','order.book_time',
+            'order.id','order.user_id','order.doctor_id','order.order_no','order.createtime','order.status','order.ordertype','order.accept_time','order.video_time','order.book_time',
             'member.realname as member_realname','member.gender as member_gender','member.birthday as member_birthday',
             'member.marital_status','member.allergies_status','member.familymedical_status','member.chronicdisease_status',
         ];
@@ -142,6 +142,15 @@ class Wenzhen extends Apic
 
         $wenzhen_order['doctor_info'] = $doctor_info;*/
 
+        //视频订单是否能拨打
+        $wenzhen_order['video_call_switch'] = 0;
+        if($wenzhen_order['ordertype'] == 2 && $wenzhen_order['status'] == 20){
+            if(time() >= $wenzhen_order['book_time']){
+                $wenzhen_order['video_call_switch'] = 1;
+            }
+        }
+
+
         $this->success(1,$wenzhen_order);
     }
 
@@ -320,11 +329,22 @@ class Wenzhen extends Apic
             'finish_time' => $nowtime,
         ];
 
+        Db::startTrans();
+        //给医生结算钱
+        /*$logtype = $wenzhen_order['ordertype'] == 1 ? 111 : 112;
+        $rs_wallet = model('walletdoctor')->lockChangeAccountRemain($this->auth->id,'money',$wenzhen_order['total_fee'],$logtype,$remark='问诊订单','wenzhen_order',$order_id);
+        if($rs_wallet['status'] === false){
+            Db::rollback();
+            $this->error($rs_wallet['msg']);
+        }*/
+
         $update_rs = Db::name('wenzhen_order')->where('id',$order_id)->where('status',$old_status)->update($update);
         if(!$update_rs){
+            Db::rollback();
             $this->error('操作失败');
         }
 
+        Db::commit();
         $this->success(1,'操作成功');
     }
 
@@ -343,7 +363,7 @@ class Wenzhen extends Apic
         }
 
         if($wenzhen_order['status'] != 30){
-            $this->error('已完成订单才能反馈');
+            //$this->error('已完成订单才能反馈');
         }
 
         //修改订单
@@ -356,15 +376,7 @@ class Wenzhen extends Apic
 
         Db::startTrans();
 
-        //医生
-        $logtype = $wenzhen_order['ordertype'] == 1 ? 111 : 112;
-        $rs_wallet = model('walletdoctor')->lockChangeAccountRemain($this->auth->id,'money',$wenzhen_order['total_fee'],$logtype,$remark='问诊订单','wenzhen_order',$order_id);
-        if($rs_wallet['status'] === false){
-            Db::rollback();
-            $this->error($rs_wallet['msg']);
-        }
-
-        $update_rs = Db::name('wenzhen_order')->where('id',$order_id)->where('status',30)->update($update);
+        $update_rs = Db::name('wenzhen_order')->where('id',$order_id)->update($update);
         if(!$update_rs){
             $this->error('反馈失败');
             Db::rollback();

application/common/library/Authdoctor.php

@@ -40,6 +40,7 @@ class Authdoctor
         'goodat',
         'level_id',
         'info',
+        'job_status'
     ];