|
|
@@ -245,8 +245,7 @@ class ServiceOrderController extends BaseApiController
|
|
|
return $this->fail(ServiceOrderLogic::getError());
|
|
|
}
|
|
|
if($result->master_worker_id!=0){
|
|
|
- $order = ServiceOrderLogic::orderPayInfo($params);
|
|
|
- $workDetail = ServiceWorkAppointmentLog::where(['work_id'=>$order['work_id']])->order('id desc')->findOrEmpty();
|
|
|
+ $workDetail = ServiceWorkAppointmentLog::where(['work_id'=>$result['id']])->order('id desc')->findOrEmpty();
|
|
|
$masterDetail = MasterWorkerLogic::detail(['id'=>$result['master_worker_id']]);
|
|
|
// 修改预约时间通知【给用户的通知】
|
|
|
$res = event('Notice', [
|
|
|
@@ -262,7 +261,7 @@ class ServiceOrderController extends BaseApiController
|
|
|
'scene_id' => 118,
|
|
|
'params' => [
|
|
|
'user_id' => $result['master_worker_id'],
|
|
|
- 'order_id' => $order['work_id'],
|
|
|
+ 'order_id' => $result['id'],
|
|
|
'thing4' => $result['title'],
|
|
|
'time5' => date('Y-m-d H:i:s',$workDetail['last_appointment_time']),
|
|
|
'time6' => date('Y-m-d H:i:s',$workDetail['this_appointment_time']),
|
whitefang