diff --git a/app/Amqp/Consumer/AssignDoctorConsumer.php b/app/Amqp/Consumer/AssignDoctorConsumer.php index 6bc901c..78c0bec 100644 --- a/app/Amqp/Consumer/AssignDoctorConsumer.php +++ b/app/Amqp/Consumer/AssignDoctorConsumer.php @@ -4,6 +4,7 @@ declare(strict_types=1); namespace App\Amqp\Consumer; +use App\Amqp\Producer\CancelUnInquiryOrdersDelayDirectProducer; use App\Amqp\Producer\CancelUnpayOrdersDelayDirectProducer; use App\Constants\HttpEnumCode; use App\Model\OrderInquiry; @@ -152,7 +153,7 @@ class AssignDoctorConsumer extends ConsumerMessage // 加入未接诊取消订单延迟队列 $data = array(); $data['order_inquiry_id'] = $order_inquiry['order_inquiry_id']; - $message = new CancelUnpayOrdersDelayDirectProducer($data); + $message = new CancelUnInquiryOrdersDelayDirectProducer($data); // 快速/购药-5分钟 $message->setDelayMs(1000 * 60 * 5); $producer = $this->container->get(Producer::class); diff --git a/app/Controller/TestController.php b/app/Controller/TestController.php index 7a38517..7b6521d 100644 --- a/app/Controller/TestController.php +++ b/app/Controller/TestController.php @@ -435,32 +435,16 @@ class TestController extends AbstractController } public function test_10(){ - $ImService = new ImService(); - - // 获取订单医生数据 - $params = array(); - $params['doctor_id'] = "494429911331946496"; - $user_doctor = UserDoctor::getOne($params); - - - // 自定义消息 - $cloud_custom_data = array(); - $cloud_custom_data['order_inquiry_id'] = "498932680833085441"; - $cloud_custom_data['is_system'] = 1; - $cloud_custom_data['inquiry_type'] = 1; - $cloud_custom_data['message_rounds'] = 0; - - // 消息内容 - $message_content_data = array(); - $message_content_data['message_type'] = 1; - $message_content_data['content'] = "--等待医生接诊--"; - $message_content_data['desc'] = "温馨提示:您可继续补充问诊内容,便于更快确认病情,医生均在临床一线工作,还请耐心等待,医生接诊会第一时间短信通知您。"; - $message_content = [ - 'Data' => json_encode($message_content_data,JSON_UNESCAPED_UNICODE), - ]; - - $ImService->sendMessage("494429911046733824", "498932257254518784", $message_content, "TIMCustomElem", $cloud_custom_data); - + $data = array(); + $data['order_inquiry_id'] = "499163900703698944"; + $message = new CancelUnpayOrdersDelayDirectProducer($data); + $message->setDelayMs(1000 * 5); + $producer = $this->container->get(Producer::class); + $res = $producer->produce($message); + if (!$res) { + Db::rollBack(); + return fail(HttpEnumCode::SERVER_ERROR, "订单创建失败"); + } } diff --git a/app/Services/InquiryService.php b/app/Services/InquiryService.php index 454b13f..986c169 100644 --- a/app/Services/InquiryService.php +++ b/app/Services/InquiryService.php @@ -2,6 +2,7 @@ namespace App\Services; +use App\Amqp\Producer\CancelUnInquiryOrdersDelayDirectProducer; use App\Amqp\Producer\CancelUnPayInquiryOrderDelayProducer; use App\Amqp\Producer\CancelUnpayOrdersDelayDirectProducer; use App\Constants\DoctorTitleCode; @@ -276,7 +277,7 @@ class InquiryService extends BaseService if (!empty($request_params['doctor_id']) && ($request_params['inquiry_type'] == 1 || $request_params['inquiry_type'] == 3)){ $data = array(); $data['order_inquiry_id'] = $order_inquiry['order_inquiry_id']; - $message = new CancelUnpayOrdersDelayDirectProducer($data); + $message = new CancelUnInquiryOrdersDelayDirectProducer($data); $message->setDelayMs(1000 * 60 * 5); $producer = $this->container->get(Producer::class); $res = $producer->produce($message);