|
|
@@ -179,12 +179,15 @@ class ServiceWorkLists extends BaseAdminDataLists implements ListsSearchInterfac
|
|
|
},
|
|
|
'serviceWorkCustomerLog' =>function(Query $query){
|
|
|
$query->field('id,work_id,content,create_time');
|
|
|
+ },
|
|
|
+ 'rechargeOrder' =>function(Query $query){
|
|
|
+ $query->field('id,work_id,tenant_id,order_type,payment_type,pay_way,pay_status,pay_time,coupon_id,coupon_price,order_total,order_amount,paid_amount,refund_status');
|
|
|
}
|
|
|
])
|
|
|
->where($this->searchWhere)
|
|
|
->where($this->queryWhere())
|
|
|
->where($this->queryDataWhere())
|
|
|
- ->field(['id', 'work_sn', 'real_name', 'mobile', 'address', 'title', 'category_type', 'goods_category_ids', 'goods_category_id', 'base_service_fee', 'service_fee', 'work_status','work_pay_status', 'service_status', 'dispatch_time', 'receive_time', 'appointment_time', 'finished_images', 'finished_time', 'master_worker_id', 'work_amount', 'work_type', 'create_time', 'update_time','lon', 'lat','appoint_approval','refund_approval','finally_door_time','property_activity_id','order_effective_id','estimated_finish_time','third_type'])
|
|
|
+ ->field(['id', 'spare_total', 'work_total','work_sn', 'real_name', 'mobile', 'address', 'title', 'category_type', 'goods_category_ids', 'goods_category_id', 'base_service_fee', 'service_fee', 'work_status','work_pay_status', 'service_status', 'dispatch_time', 'receive_time', 'appointment_time', 'finished_images', 'finished_time', 'master_worker_id', 'work_amount', 'work_type', 'create_time', 'update_time','lon', 'lat','appoint_approval','refund_approval','finally_door_time','property_activity_id','order_effective_id','estimated_finish_time','third_type'])
|
|
|
->limit($this->limitOffset, $this->limitLength)
|
|
|
->order(['id' => 'desc'])
|
|
|
->select()
|
liugc