|
@@ -30,7 +30,7 @@ class Order extends Api
|
|
|
$st = 'servicetype';
|
|
$st = 'servicetype';
|
|
|
$p = 'package';
|
|
$p = 'package';
|
|
|
$field = $o.'.id,check_code,orderno,server_time,server_info,server_images,'.$o.'.status,user_mobile,'.$o.'.user_car_number,'.
|
|
$field = $o.'.id,check_code,orderno,server_time,server_info,server_images,'.$o.'.status,user_mobile,'.$o.'.user_car_number,'.
|
|
|
- $o.'.createtime,cancel_time,cancel_reason,pay_fee,appen_fee,finish_time,'.$st.'.title as `service_title`,paytype,'.$p.'.title as `service_title`';
|
|
|
|
|
|
|
+ $o.'.createtime,cancel_time,cancel_reason,pay_fee,appen_fee,finish_time,'.$st.'.title as `service_title`,paytype,'.$p.'.title as `package_title`';
|
|
|
$where[$o.'.user_id'] = $this->auth->id;
|
|
$where[$o.'.user_id'] = $this->auth->id;
|
|
|
$where[$o.'.company_id'] = $this->auth->company_id;
|
|
$where[$o.'.company_id'] = $this->auth->company_id;
|
|
|
if (!empty($status)) {
|
|
if (!empty($status)) {
|
|
@@ -125,7 +125,7 @@ class Order extends Api
|
|
|
$where[$o.'.user_id'] = $this->auth->id;
|
|
$where[$o.'.user_id'] = $this->auth->id;
|
|
|
$where[$o.'.id'] = $id;
|
|
$where[$o.'.id'] = $id;
|
|
|
$field = $o.'.id,check_code,orderno,server_time,server_info,server_images,'.$o.'.status,user_mobile,'.$o.'.user_car_number,'.
|
|
$field = $o.'.id,check_code,orderno,server_time,server_info,server_images,'.$o.'.status,user_mobile,'.$o.'.user_car_number,'.
|
|
|
- $o.'.createtime,cancel_time,cancel_reason,pay_fee,appen_fee,finish_time,'.$st.'.title as `service_title`,paytype,'.$p.'.title as `service_title`';
|
|
|
|
|
|
|
+ $o.'.createtime,cancel_time,cancel_reason,pay_fee,appen_fee,finish_time,'.$st.'.title as `service_title`,paytype,'.$p.'.title as `package_title`';
|
|
|
$result = $this->model->alias($o)->field($field)
|
|
$result = $this->model->alias($o)->field($field)
|
|
|
->join($st,$st.'.id = '.$o.'.servicetype_id','LEFT')
|
|
->join($st,$st.'.id = '.$o.'.servicetype_id','LEFT')
|
|
|
->join($p,$p.'.id = '.$o.'.package_id','LEFT')
|
|
->join($p,$p.'.id = '.$o.'.package_id','LEFT')
|
