diff --git a/app/Amqp/Consumer/AutoFinishInquiryDelayDirectConsumer.php b/app/Amqp/Consumer/AutoFinishInquiryDelayDirectConsumer.php index dba07b0..8eda7d4 100644 --- a/app/Amqp/Consumer/AutoFinishInquiryDelayDirectConsumer.php +++ b/app/Amqp/Consumer/AutoFinishInquiryDelayDirectConsumer.php @@ -404,9 +404,9 @@ class AutoFinishInquiryDelayDirectConsumer extends ConsumerMessage /** * 处理医生好评率 * @param string $doctor_id - * @return float|int + * @return int|void */ - protected function handleDoctorPraiseRate(string $doctor_id): float|int + protected function handleDoctorPraiseRate(string $doctor_id) { // 获取该医生全部问诊评价总数 $params = array(); diff --git a/app/Common/Common.php b/app/Common/Common.php index 93aea9f..f4c2dec 100644 --- a/app/Common/Common.php +++ b/app/Common/Common.php @@ -135,7 +135,7 @@ function addAliyunOssWebsite($path): string if (empty($path)){ return ""; } - return config('alibaba.oss.custom_domain_name') . '/' . $path; + return config('alibaba.oss.custom_domain_name') . $path; } /** diff --git a/app/Services/PatientOrderService.php b/app/Services/PatientOrderService.php index 54e72ca..2ff32b0 100644 --- a/app/Services/PatientOrderService.php +++ b/app/Services/PatientOrderService.php @@ -280,6 +280,8 @@ class PatientOrderService extends BaseService return fail(); } + + // 检测订单状态 if (!in_array($order_inquiry['inquiry_status'], [1, 2, 3])) { // 问诊订单状态(1:待支付 2:待分配 3:待接诊 4:已接诊 5:已完成 6:已结束 7:已取消) diff --git a/app/Services/UserDoctorService.php b/app/Services/UserDoctorService.php index 82d593f..b49318c 100644 --- a/app/Services/UserDoctorService.php +++ b/app/Services/UserDoctorService.php @@ -6,7 +6,6 @@ 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; use App\Exception\BusinessException; @@ -1641,6 +1640,8 @@ class UserDoctorService extends BaseService return fail(HttpEnumCode::HTTP_ERROR, "接诊失败"); } + + if ($order_inquiry['inquiry_status'] != 3) { // 问诊订单状态(1:待支付 2:待分配 3:待接诊 4:已接诊 5:已完成 6:已结束 7:已取消) return fail(HttpEnumCode::HTTP_ERROR, "接诊失败");