diff --git a/app/Services/InquiryService.php b/app/Services/InquiryService.php index 4f8035c..9c43ab8 100644 --- a/app/Services/InquiryService.php +++ b/app/Services/InquiryService.php @@ -181,7 +181,7 @@ class InquiryService extends BaseService // 获取患者家庭成员是否存在服务包订单 $OrderServicePackageService = new OrderServicePackageService(); - $order_service_package = $OrderServicePackageService->getExitsPatientFamilyServicePackage($user_info['user_id'], $request_params['family_id'], $request_params['doctor_id']); + $order_service_package = $OrderServicePackageService->getPatientFamilyNoPayServicePackage($user_info['user_id'], $request_params['family_id'], $request_params['doctor_id']); if (!empty($order_service_package)){ $result['status'] = 3; $result['message'] = "您和当前医生存在未支付的服务包订单,无法再次发起问诊"; @@ -1336,7 +1336,7 @@ class InquiryService extends BaseService // 获取患者家庭成员是否存在服务包订单 $OrderServicePackageService = new OrderServicePackageService(); - $order_service_package = $OrderServicePackageService->getExitsPatientFamilyServicePackage($order_inquiry['user_id'], $order_inquiry['family_id'], $order_inquiry['doctor_id']); + $order_service_package = $OrderServicePackageService->getPatientFamilyNoPayServicePackage($order_inquiry['user_id'], $order_inquiry['family_id'], $order_inquiry['doctor_id']); if (!empty($order_service_package)){ return fail(HttpEnumCode::HTTP_ERROR, "当前用户存在未支付订单,不支持赠送"); } diff --git a/app/Services/OrderServicePackageService.php b/app/Services/OrderServicePackageService.php index 5a8cccc..5bdff44 100644 --- a/app/Services/OrderServicePackageService.php +++ b/app/Services/OrderServicePackageService.php @@ -1604,13 +1604,13 @@ class OrderServicePackageService extends BaseService } /** - * 获取患者家庭成员是否存在服务包订单 + * 获取患者家庭成员是否存在未支付的服务包订单 * @param string|int $patient_user_id * @param string|int $family_id * @param string|int $doctor_id * @return array */ - public function getExitsPatientFamilyServicePackage(string|int $patient_user_id,string|int $family_id,string|int $doctor_id): array + public function getPatientFamilyNoPayServicePackage(string|int $patient_user_id,string|int $family_id,string|int $doctor_id): array { // 检测患者是否购买服务包 $params = array(); @@ -1618,7 +1618,7 @@ class OrderServicePackageService extends BaseService $params['doctor_id'] = $doctor_id; $params['family_id'] = $family_id; - $order_service_status = ['1','2','3']; + $order_service_status = ['1']; $order_service_package = OrderServicePackage::getStatusOne($params, $order_service_status); if (empty($order_service_package)) { return [];