gdxz/hospital-applets-api
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修正部分队列执行问题

Browse Source
This commit is contained in:
wucongxing 2023-12-12 15:31:24 +08:00
parent b6012b245c
commit 0017661432
2 changed files with 17 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
app/Amqp/Consumer/AutoCompleteInquiryDelayDirectConsumer.php
View File

@ -45,14 +45,14 @@ class AutoCompleteInquiryDelayDirectConsumer extends ConsumerMessage
public function consumeMessage($data, AMQPMessage $message): string public function consumeMessage($data, AMQPMessage $message): string
{ {
Log::getInstance()->error("开始执行 自动完成问诊订单 队列：" . json_encode($data, JSON_UNESCAPED_UNICODE)); Log::getInstance("queue-AutoCompleteInquiry")->error(json_encode($data, JSON_UNESCAPED_UNICODE));
Db::beginTransaction(); Db::beginTransaction();
try { try {
// 检测入参参数 // 检测入参参数
if (empty($data['order_inquiry_id'])) { if (empty($data['order_inquiry_id'])) {
Db::rollBack(); Db::rollBack();
Log::getInstance()->error("自动完成问诊订单队列执行失败：入参错误"); Log::getInstance("queue-AutoCompleteInquiry")->error("参数错误");
return Result::DROP; return Result::DROP;
} }
@ -62,7 +62,7 @@ class AutoCompleteInquiryDelayDirectConsumer extends ConsumerMessage
$order_inquiry = OrderInquiry::getOne($params); $order_inquiry = OrderInquiry::getOne($params);
if (empty($order_inquiry)) { if (empty($order_inquiry)) {
Db::rollBack(); Db::rollBack();
Log::getInstance()->error("自动完成问诊订单队列执行失败：问诊订单数据为空"); Log::getInstance("queue-AutoCompleteInquiry")->error("问诊订单数据为空");
return Result::DROP; return Result::DROP;
} }
@ -72,23 +72,23 @@ class AutoCompleteInquiryDelayDirectConsumer extends ConsumerMessage
if ($order_inquiry['inquiry_status'] != 4) { if ($order_inquiry['inquiry_status'] != 4) {
// 问诊订单状态（1:待支付 2:待分配 3:待接诊 4:已接诊 5:已完成 6:已结束 7:已取消） // 问诊订单状态（1:待支付 2:待分配 3:待接诊 4:已接诊 5:已完成 6:已结束 7:已取消）
Db::rollBack(); Db::rollBack();
Log::getInstance()->info("自动完成问诊订单队列执行结果：无需处理"); Log::getInstance("queue-AutoCompleteInquiry")->info("无需处理");
return Result::DROP; return Result::ACK;
} }
// 检测问诊订单退款状态 // 检测问诊订单退款状态
if (!in_array($order_inquiry['inquiry_refund_status'],[0,4,5])){ if (!in_array($order_inquiry['inquiry_refund_status'],[0,4,5])){
// 问诊订单退款状态（0:无退款 1:申请退款 2:退款中 3:退款成功 4:拒绝退款 5:退款关闭 6:退款异常） // 问诊订单退款状态（0:无退款 1:申请退款 2:退款中 3:退款成功 4:拒绝退款 5:退款关闭 6:退款异常）
Db::rollBack(); Db::rollBack();
Log::getInstance()->info("自动完成问诊订单队列执行结果：订单退款中，无需处理"); Log::getInstance("queue-AutoCompleteInquiry")->info("订单退款中，无需处理");
return Result::DROP; return Result::ACK;
} }
// 订单支付状态 // 订单支付状态
if ($order_inquiry['inquiry_pay_status'] != 2){ if ($order_inquiry['inquiry_pay_status'] != 2){
Db::rollBack(); Db::rollBack();
Log::getInstance()->info("自动完成问诊订单队列执行结果：订单未支付，无需处理"); Log::getInstance("queue-AutoCompleteInquiry")->info("订单未支付，无需处理");
return Result::DROP; return Result::ACK;
} }
// 新增患者历史问诊表 // 新增患者历史问诊表
@ -104,8 +104,8 @@ class AutoCompleteInquiryDelayDirectConsumer extends ConsumerMessage
$patient_history_inquiry = PatientHistoryInquiry::addPatientHistoryInquiry($data); $patient_history_inquiry = PatientHistoryInquiry::addPatientHistoryInquiry($data);
if (empty($patient_history_inquiry)){ if (empty($patient_history_inquiry)){
Db::rollBack(); Db::rollBack();
Log::getInstance()->info("自动完成问诊订单队列执行结果：新增患者历史问诊表失败"); Log::getInstance("queue-AutoCompleteInquiry")->info("新增患者历史问诊表失败");
return Result::DROP; return Result::REQUEUE;
} }
// 获取医生数据 // 获取医生数据
@ -114,7 +114,7 @@ class AutoCompleteInquiryDelayDirectConsumer extends ConsumerMessage
$user_doctor = UserDoctor::getOne($params); $user_doctor = UserDoctor::getOne($params);
if(empty($user_doctor)){ if(empty($user_doctor)){
Db::rollBack(); Db::rollBack();
Log::getInstance()->info("自动完成问诊订单队列执行结果：缺少医生数据"); Log::getInstance("queue-AutoCompleteInquiry")->info("缺少医生数据");
return Result::DROP; return Result::DROP;
} }
@ -163,16 +163,16 @@ class AutoCompleteInquiryDelayDirectConsumer extends ConsumerMessage
$res = $producer->produce($message); $res = $producer->produce($message);
if (!$res) { if (!$res) {
Db::rollBack(); Db::rollBack();
Log::getInstance()->info("自动完成问诊订单队列执行结果：添加自动结束队列失败"); Log::getInstance("queue-AutoCompleteInquiry")->error("添加自动结束队列失败");
return Result::DROP; return Result::DROP;
} }
Db::commit(); Db::commit();
Log::getInstance()->info("自动完成问诊订单队列执行成功"); Log::getInstance("queue-AutoCompleteInquiry")->info("执行成功");
} catch (\Exception $e) { } catch (\Exception $e) {
Db::rollBack(); Db::rollBack();
Log::getInstance()->error("自动完成问诊订单执行失败：" . $e->getMessage()); Log::getInstance("queue-AutoCompleteInquiry")->error($e->getMessage());
return Result::ACK; // 重回队列 return Result::ACK; // 重回队列
} }
@ -195,10 +195,8 @@ class AutoCompleteInquiryDelayDirectConsumer extends ConsumerMessage
// 医生-发送站内消息-问诊结束 // 医生-发送站内消息-问诊结束
$MessagePush = new MessagePush($user_doctor['user_id'],$order_inquiry['order_inquiry_id']); $MessagePush = new MessagePush($user_doctor['user_id'],$order_inquiry['order_inquiry_id']);
$MessagePush->finishInquiryToDoctor(); $MessagePush->finishInquiryToDoctor();
}catch (\Throwable $e){ }catch (\Throwable $e){
Log::getInstance()->error("发送消息异常错误：" . $e->getMessage()); Log::getInstance("queue-AutoCompleteInquiry")->error($e->getMessage());
return Result::ACK; return Result::ACK;
} }

1
app/Amqp/Consumer/AutoFinishInquiryDelayDirectConsumer.php
View File

@ -26,6 +26,7 @@ use Hyperf\Amqp\Result;
use Hyperf\Amqp\Annotation\Consumer; use Hyperf\Amqp\Annotation\Consumer;
use Hyperf\Amqp\Message\ConsumerMessage; use Hyperf\Amqp\Message\ConsumerMessage;
use Hyperf\DbConnection\Db; use Hyperf\DbConnection\Db;
use Hyperf\Redis\Redis;
use PhpAmqpLib\Message\AMQPMessage; use PhpAmqpLib\Message\AMQPMessage;
use Psr\Container\ContainerExceptionInterface; use Psr\Container\ContainerExceptionInterface;
use Psr\Container\NotFoundExceptionInterface; use Psr\Container\NotFoundExceptionInterface;