修改自动审核处方为延迟队列

app/Amqp/Consumer/AutoPharmacistCaVerifyDelayDirectConsumer.php

@@ -5,8 +5,6 @@ declare(strict_types=1);
 namespace App\Amqp\Consumer;
 
 use App\Amqp\Producer\PrescriptionExpiredDelayDirectProducer;
-use App\Constants\HttpEnumCode;
-use App\Exception\BusinessException;
 use App\Model\OrderInquiry;
 use App\Model\OrderPrescription;
 use App\Model\OrderPrescriptionFile;
@@ -19,6 +17,9 @@ use App\Services\ImService;
 use App\Services\MessagePush;
 use App\Services\OrderPrescriptionService;
 use App\Utils\Log;
+use Hyperf\Amqp\Message\ConsumerDelayedMessageTrait;
+use Hyperf\Amqp\Message\ProducerDelayedMessageTrait;
+use Hyperf\Amqp\Message\Type;
 use Hyperf\Amqp\Producer;
 use Hyperf\Amqp\Result;
 use Hyperf\Amqp\Annotation\Consumer;
@@ -29,13 +30,20 @@ use PhpAmqpLib\Message\AMQPMessage;
 use Psr\Container\ContainerExceptionInterface;
 use Psr\Container\NotFoundExceptionInterface;
 
-/**
+#[Consumer(nums: 1)]
- * 药师自动签章审核
+class AutoPharmacistCaVerifyDelayDirectConsumer extends ConsumerMessage
- * 医生签章后，加入此队列，下载医生签章pdf，并进行药师/医院签章审核
- */
-#[Consumer(exchange: 'amqp.direct', routingKey: 'AutoPharmacistCaVerify', queue: 'auto.pharmacist.ca.verify.queue', nums: 1)]
-class AutoPharmacistCaVerifyConsumer extends ConsumerMessage
 {
+    use ProducerDelayedMessageTrait;
+    use ConsumerDelayedMessageTrait;
+
+    protected string $exchange = 'amqp.delay.direct';
+
+    protected ?string $queue = 'auto.pharmacist.ca.verify.delay.queue';
+
+    protected string $type = Type::DIRECT; //Type::FANOUT;
+
+    protected string|array $routingKey = 'AutoPharmacistCaVerify';
+
     public function consumeMessage($data, AMQPMessage $message): string
     {
         Log::getInstance("queue-AutoPharmacistCaVerify")->error("开始：" . json_encode($data, JSON_UNESCAPED_UNICODE));
@@ -234,6 +242,7 @@ class AutoPharmacistCaVerifyConsumer extends ConsumerMessage
         return Result::ACK;
     }
 
+
     /**
      * 检测执行参数
      * @param array $data
@@ -399,8 +408,9 @@ class AutoPharmacistCaVerifyConsumer extends ConsumerMessage
 
             OrderPrescriptionFile::edit($params,$data);
         }catch(\Exception $e){
-           // 失败不做处理
+            // 失败不做处理
             Log::getInstance("queue-AutoPharmacistCaVerify")->error("错误：修改处方文件表失败" . $e->getMessage());
         }
     }
+
 }

app/Amqp/Producer/AutoPharmacistCaVerifyDelayDirectProducer.php

@@ -5,15 +5,21 @@ declare(strict_types=1);
 namespace App\Amqp\Producer;
 
 use Hyperf\Amqp\Annotation\Producer;
+use Hyperf\Amqp\Message\ProducerDelayedMessageTrait;
 use Hyperf\Amqp\Message\ProducerMessage;
+use Hyperf\Amqp\Message\Type;
 
-/**
+#[Producer]
- * 药师自动签章审核
+class AutoPharmacistCaVerifyDelayDirectProducer extends ProducerMessage
- * 医生签章后，加入此队列，下载医生签章pdf，并进行药师/医院签章审核
- */
-#[Producer(exchange: 'amqp.direct', routingKey: 'AutoPharmacistCaVerify')]
-class AutoPharmacistCaVerifyProducer extends ProducerMessage
 {
+    use ProducerDelayedMessageTrait;
+
+    protected string $exchange = 'amqp.delay.direct';
+
+    protected string $type = Type::DIRECT;
+
+    protected string|array $routingKey = 'AutoPharmacistCaVerify';
+
     /**
      * @param $data
      * [

app/Services/UserDoctorService.php

@@ -5,6 +5,7 @@ namespace App\Services;
 use App\Amqp\Producer\AssignPharmacistProducer;
 use App\Amqp\Producer\AutoCompleteInquiryDelayDirectProducer;
 use App\Amqp\Producer\AutoFinishInquiryDelayDirectProducer;
+use App\Amqp\Producer\AutoPharmacistCaVerifyDelayDirectProducer;
 use App\Amqp\Producer\AutoPharmacistCaVerifyProducer;
 use App\Constants\DoctorTitleCode;
 use App\Constants\HttpEnumCode;
@@ -1413,14 +1414,6 @@ class UserDoctorService extends BaseService
                 return fail(HttpEnumCode::SERVER_ERROR, "处方开具失败");
             }
 
-
-            Db::commit();
-        } catch (\Exception $e) {
-            Db::rollBack();
-            return fail(HttpEnumCode::SERVER_ERROR, $e->getMessage());
-        }
-
-        try {
             // 检测药师自动审核配置开启状态
             if ($system_config['is_auto_phar_verify_prescription'] == 1){
                 // 添加药师自动签章审核队列
@@ -1428,8 +1421,10 @@ class UserDoctorService extends BaseService
                 $data['prescription_file_id'] = $prescription_open_result['file_id'];
                 $data['order_prescription_id'] = $order_prescription->order_prescription_id;
 
-                $message = new AutoPharmacistCaVerifyProducer($data);
+                $message = new AutoPharmacistCaVerifyDelayDirectProducer($data);
-                $producer = ApplicationContext::getContainer()->get(Producer::class);
+
+                $message->setDelayMs(1000 * 60 * 1);
+                $producer = $this->container->get(Producer::class);
                 $result = $producer->produce($message);
                 if (!$result) {
                     // 处方开具成功，添加自动签章审核队列失败
@@ -1438,12 +1433,18 @@ class UserDoctorService extends BaseService
                 }
             }
 
+            Db::commit();
+        } catch (\Exception $e) {
+            Db::rollBack();
+            return fail(HttpEnumCode::SERVER_ERROR, $e->getMessage());
+        }
+
+        try {
             // 发送消息-药师审核中
             $ImService = new ImService();
             $ImService->pharmacistVerify($order_inquiry,(string)$order_prescription->order_prescription_id,$product_name,$user_doctor['user_id'],$order_inquiry['user_id']);
-
         }catch (\Exception $e){
-
+            return success([],HttpEnumCode::HTTP_SUCCESS,"消息发送失败");
         }
 
         return success();