diff --git a/app/Amqp/Consumer/AssignDoctorConsumer.php b/app/Amqp/Consumer/AssignDoctorConsumer.php index bc9ccae..2584e92 100644 --- a/app/Amqp/Consumer/AssignDoctorConsumer.php +++ b/app/Amqp/Consumer/AssignDoctorConsumer.php @@ -31,9 +31,15 @@ use Psr\Container\NotFoundExceptionInterface; class AssignDoctorConsumer extends ConsumerMessage { /** + * @param $data + * [ + * "order_inquiry_id":"问诊订单id" + * ] + * @param AMQPMessage $message + * @return string * @throws ContainerExceptionInterface - * @throws NotFoundExceptionInterface * @throws GuzzleException + * @throws NotFoundExceptionInterface */ public function consumeMessage($data, AMQPMessage $message): string { @@ -48,21 +54,21 @@ class AssignDoctorConsumer extends ConsumerMessage $order_inquiry = OrderInquiry::getOne($params); if (empty($order_inquiry)) { Db::rollBack(); - Log::getInstance()->error("队列执行失败原因：未查询到对应订单数据"); + Log::getInstance()->error("分配医生队列执行失败原因：未查询到对应订单数据"); return Result::DROP;// 销毁 } // 检测订单分配状态 if (!empty($order_inquiry['doctor_id'])) { Db::rollBack(); - Log::getInstance()->error("队列执行失败原因：已分配医生"); + Log::getInstance()->error("分配医生队列执行失败原因：已分配医生"); return Result::DROP;// 销毁 } // 检测订单类型 if ($order_inquiry['inquiry_type'] != 2 && $order_inquiry['inquiry_type'] != 4) { Db::rollBack(); - Log::getInstance()->error("队列执行失败原因：订单非快速问诊、问诊购药类型"); + Log::getInstance()->error("分配医生队列执行失败原因：订单非快速问诊、问诊购药类型"); return Result::DROP;// 销毁 } @@ -70,7 +76,7 @@ class AssignDoctorConsumer extends ConsumerMessage if (in_array($order_inquiry['inquiry_refund_status'], [1, 2, 3])) { Db::rollBack(); // 问诊订单退款状态（0:无退款 1:申请退款 2:退款中 3:退款成功 4:拒绝退款 5:退款关闭） - Log::getInstance()->error("队列执行失败原因：订单存在退款"); + Log::getInstance()->error("分配医生队列执行失败原因：订单存在退款"); return Result::DROP;// 销毁 } @@ -78,7 +84,7 @@ class AssignDoctorConsumer extends ConsumerMessage if ($order_inquiry['inquiry_status'] != 2) { Db::rollBack(); // 问诊订单状态（1:待支付 2:待分配 3:待接诊 4:已接诊 5:已完成 6:已结束 7:已取消） - Log::getInstance()->info("订单状态错误：当前为" . $order_inquiry['inquiry_status'] . " 无法进行分配"); + Log::getInstance()->info("分配医生队列执行失败原因:订单状态错误：当前为" . $order_inquiry['inquiry_status'] . " 无法进行分配"); return Result::DROP;// 销毁 } @@ -86,7 +92,7 @@ class AssignDoctorConsumer extends ConsumerMessage if ($order_inquiry['inquiry_pay_status'] != 2) { Db::rollBack(); // 支付状态（1:未支付 2:已支付 3:支付中 4:支付失败 5:支付超时 6:支付关闭 7:已撤销 8:转入退款） - Log::getInstance()->info("订单支付状态错误：当前为" . $order_inquiry['inquiry_pay_status'] . " 无法进行分配"); + Log::getInstance()->info("分配医生队列执行失败原因:订单支付状态错误：当前为" . $order_inquiry['inquiry_pay_status'] . " 无法进行分配"); return Result::DROP;// 销毁 } @@ -95,7 +101,7 @@ class AssignDoctorConsumer extends ConsumerMessage $diff_time = time() - $pay_time; if ($diff_time < 0) { Db::rollBack(); - Log::getInstance()->info("订单支付状态错误：时间计算错误"); + Log::getInstance()->info("分配医生队列执行失败原因:订单支付状态错误：时间计算错误"); return Result::DROP;// 销毁 } @@ -103,14 +109,14 @@ class AssignDoctorConsumer extends ConsumerMessage if ($diff_time > 300) { // 超出5分钟，执行退款 - Log::getInstance()->info("超出5分钟，执行退款"); + Log::getInstance()->info("分配医生队列执行失败原因:超出5分钟，执行退款"); $redis_key = "inquiryRefund" . $order_inquiry['order_inquiry_id']; $redis_value = $redis->get($redis_key); if (!empty($redis_value)) { // 判断退款次数 if ($redis_value >= 3) { - Log::getInstance()->info("退款取消，退款失败次数过多"); + Log::getInstance()->info("分配医生队列执行失败原因:退款取消，退款失败次数过多"); // 加入短信队列 @@ -129,7 +135,7 @@ class AssignDoctorConsumer extends ConsumerMessage $redis->set($redis_key, $redis_value); } catch (\Exception $e) { Db::rollBack(); - Log::getInstance()->error("队列执行失败原因：退款失败，原因：" . $e->getMessage()); + Log::getInstance()->error("分配医生队列执行失败原因：退款失败，原因：" . $e->getMessage()); return Result::REQUEUE; // 重回队列 } } @@ -139,7 +145,7 @@ class AssignDoctorConsumer extends ConsumerMessage $doctor_id = $UserDoctorService->getInquiryAssignDoctor($order_inquiry['inquiry_type']); if (empty($doctor_id)) { Db::rollBack(); - Log::getInstance()->error("重回队列，目前没有合适医生"); + Log::getInstance()->error("分配医生队列执行失败原因:重回队列，目前没有合适医生"); $redis_key = "AssignDoctor" . $order_inquiry['order_inquiry_id']; $redis_value = $redis->get($redis_key); @@ -173,7 +179,7 @@ class AssignDoctorConsumer extends ConsumerMessage } catch (\Exception $e) { Db::rollBack(); - Log::getInstance()->error("队列执行失败原因：" . $e->getMessage()); + Log::getInstance()->error("分配医生队列执行失败原因：" . $e->getMessage()); return Result::REQUEUE; // 重回队列 } diff --git a/app/Controller/UserPatientController.php b/app/Controller/UserPatientController.php index 1737e28..4b279e9 100644 --- a/app/Controller/UserPatientController.php +++ b/app/Controller/UserPatientController.php @@ -86,6 +86,11 @@ class UserPatientController extends AbstractController */ public function putShoppingCart(): ResponseInterface { + if (!in_array("1", [2, 3, 4, 5])) { + // 问诊订单状态（1:待支付 2:待分配 3:待接诊 4:已接诊 5:已完成 6:已结束 7:已取消） + dump(111); + } + die; $request = $this->container->get(UserPatientRequest::class); $request->scene('putShoppingCart')->validateResolved(); diff --git a/app/Services/InquiryService.php b/app/Services/InquiryService.php index 7de6d6d..257f9ac 100644 --- a/app/Services/InquiryService.php +++ b/app/Services/InquiryService.php @@ -685,7 +685,7 @@ class InquiryService extends BaseService } // 检测问诊订单状态 - if (!in_array($order_inquiry['inquiry_status'], [2, 3, 4, 5])) { + if (!in_array($order_inquiry['inquiry_status'], [2, 3, 4, 5,7])) { // 问诊订单状态（1:待支付 2:待分配 3:待接诊 4:已接诊 5:已完成 6:已结束 7:已取消） throw new BusinessException("订单状态错误"); }