diff --git a/app/Services/PatientOrderService.php b/app/Services/PatientOrderService.php index f27d6fc..98f231b 100644 --- a/app/Services/PatientOrderService.php +++ b/app/Services/PatientOrderService.php @@ -1114,7 +1114,7 @@ class PatientOrderService extends BaseService $data['order_type'] = 2; $message = new CancelUnpayOrdersDelayDirectProducer($data); - $message->setDelayMs(1000 * 60 * 30); + $message->setDelayMs(1000 * 60 * 5); $producer = $this->container->get(Producer::class); $res = $producer->produce($message); if (!$res) { @@ -1170,7 +1170,7 @@ class PatientOrderService extends BaseService $address['consignee_tel_mask'] = $order_product['consignee_tel_mask']; $result = array(); - $result['logistics'] = $order_product['logistics_no'] ?: null; + $result['logistics'] = null; $result['address'] = $address; // 获取物流数据 @@ -1178,6 +1178,12 @@ class PatientOrderService extends BaseService $params['order_product_id'] = $order_product_id; $order_product_logistics = OrderProductLogistic::getOne($params); if (empty($order_product_logistics)){ + $logistics = array(); + $logistics['logistics_no'] = $order_product['logistics_no'] ?: ""; + + // 获取快递公司名称 + + return success($result); } diff --git a/app/Services/UserDoctorService.php b/app/Services/UserDoctorService.php index ee7d3e8..31c3a88 100644 --- a/app/Services/UserDoctorService.php +++ b/app/Services/UserDoctorService.php @@ -983,7 +983,7 @@ class UserDoctorService extends BaseService $result['prescription_icd'] = $order_prescription_icd ?? [];// 处方诊断疾病 $result['prescription']['doctor_advice'] = $order_prescription['doctor_advice'] ?? "";// 医嘱 $result['prescription']['prescription_status'] = $order_prescription['prescription_status'] ?? "";// 处方状态(1:待审核 2:待使用 3:已失效 4:已使用) - $result['prescription']['pharmacist_audit_status'] = $order_prescription['prescription_status'] ?? "";// 药师审核状态(0:审核中 1:审核成功 2:审核驳回) + $result['prescription']['pharmacist_audit_status'] = $order_prescription['pharmacist_audit_status'] ?? "";// 药师审核状态(0:审核中 1:审核成功 2:审核驳回) return success($result); } diff --git a/config/autoload/databases.php b/config/autoload/databases.php index 7adca88..7ac123b 100644 --- a/config/autoload/databases.php +++ b/config/autoload/databases.php @@ -24,8 +24,8 @@ return [ 'collation' => env('DB_COLLATION', 'utf8_unicode_ci'), 'prefix' => env('DB_PREFIX', ''), 'pool' => [ - 'min_connections' => 20, - 'max_connections' => 100, + 'min_connections' => 10, + 'max_connections' => 50, 'connect_timeout' => 10.0, 'wait_timeout' => 5.0, 'heartbeat' => -1,