diff --git a/app/Services/OrderServicePackageService.php b/app/Services/OrderServicePackageService.php index 24dcf6c..e30fbb6 100644 --- a/app/Services/OrderServicePackageService.php +++ b/app/Services/OrderServicePackageService.php @@ -731,6 +731,10 @@ class OrderServicePackageService extends BaseService if (empty($system_inquiry_config)) { return fail(HttpEnumCode::SERVER_ERROR, "订单创建失败"); } + + // 检测问诊是否服务包首次问诊 + $OrderServicePackageService = new OrderServicePackageService(); + $is_first = $OrderServicePackageService->isFirstInquiryServicePackage($order_no); }catch (\Throwable $e){ return fail(HttpEnumCode::HTTP_ERROR, $e->getMessage()); } @@ -925,9 +929,16 @@ class OrderServicePackageService extends BaseService } // 加入未接诊取消订单延迟队列 - $time = 60 * 60 * 72; - if (\Hyperf\Config\config('app_env') == "dev"){ - $time = 60 * 10; + if ($is_first){ + $time = 60 * 60 * 72; + if (\Hyperf\Config\config('app_env') == "dev"){ + $time = 60 * 10; + } + }else{ + $time = 60 * 60 * 24; + if (\Hyperf\Config\config('app_env') == "dev"){ + $time = 60 * 10; + } } $data = array(); @@ -964,25 +975,29 @@ class OrderServicePackageService extends BaseService // 等待医生接诊 $imService->waitDoctorInquiry($order_inquiry, $user_doctor['user_id'], $order_inquiry['user_id']); - // 检测问诊是否服务包首次问诊 - $OrderServicePackageService = new OrderServicePackageService(); - $is_first = $OrderServicePackageService->isFirstInquiryServicePackage($order_no); if ($is_first){ // 首次 // 发送站内、订阅失败发送短信消息-医生有新服务包订单 $MessagePush = new MessagePush($user_doctor['user_id'], $order_inquiry['inquiry_no']); $MessagePush->doctorHaveNewServicePackage(); + + // 加入xx时间未接诊通知队列 + $data = array(); + $data['order_inquiry_id'] = $order_inquiry['order_inquiry_id']; + + $time = 1000 * 60 * 60 * 24; }else{ // 发送站内、订阅失败-医生有新的服务包问诊订单 $MessagePush = new MessagePush($user_doctor['user_id'], $order_inquiry['inquiry_no']); $MessagePush->doctorHaveNewServicePackageInquiry(); + + // 加入xx时间未接诊通知队列 + $data = array(); + $data['order_inquiry_id'] = $order_inquiry['order_inquiry_id']; + + $time = 1000 * 60 * 60 * 2; } - // 加入xx时间未接诊通知队列 - $data = array(); - $data['order_inquiry_id'] = $order_inquiry['order_inquiry_id']; - - $time = 1000 * 60 * 60 * 24; $message = new DoctorNotYetInquiryDelayDirectProducer($data); $message->setDelayMs($time); $producer = $this->container->get(Producer::class);