|
@@ -265,7 +265,7 @@ class Wenzhen extends Api
|
|
|
}
|
|
|
|
|
|
$field = [
|
|
|
- 'order.id','order.order_no','order.createtime','order.status','order.ordertype','order.accept_time','order.video_time','order.doctor_id','order.cancel_reason',
|
|
|
+ 'order.id','order.order_no','order.createtime','order.status','order.ordertype','order.accept_time','order.video_time','order.doctor_id','order.cancel_reason','order.comefrom',
|
|
|
'doctor.avatar as doctor_avatar','doctor.nickname as doctor_nickname',
|
|
|
];
|
|
|
$list = Db::name('wenzhen_order')->alias('order')
|
|
@@ -334,7 +334,7 @@ class Wenzhen extends Api
|
|
|
|
|
|
|
|
|
//图文订单接诊后N分钟自动结束
|
|
|
- if($val['status'] == 20){
|
|
|
+ if($val['status'] == 20 && $val['ordertype'] == 1){
|
|
|
$remain_time = $val['accept_time'] + (config('site.accept_textorder_autofinish_minute')*60) - time();
|
|
|
if($remain_time > 0){
|
|
|
$status_data_val['minute'] = Sec2Time($remain_time);
|
|
@@ -345,7 +345,11 @@ class Wenzhen extends Api
|
|
|
|
|
|
//视频订单接通后N分钟自动结束
|
|
|
if($val['status'] == 25 && $val['ordertype'] == 2){
|
|
|
- $remain_time = $val['video_time'] + (config('site.accept_videoorder_autofinish_minute')*60) - time();
|
|
|
+ $minute = config('site.firstvideo_videoorder_autofinish_minute');
|
|
|
+ if($val['comefrom'] == 2){
|
|
|
+ $minute = config('site.tv_firstvideo_videoorder_autofinish_minute');
|
|
|
+ }
|
|
|
+ $remain_time = $val['video_time'] + ($minute*60) - time();
|
|
|
if($remain_time > 0){
|
|
|
$status_data_val['minute'] = Sec2Time($remain_time);
|
|
|
$status_data_val['minute_en'] = Sec2Time_en($remain_time);
|