From 013480a3cb6a6ed66d8d9396ab1ee0baea3c6ef3 Mon Sep 17 00:00:00 2001 From: wucongxing8150 <815046773@qq.com> Date: Tue, 23 Apr 2024 16:49:16 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=8E=B7=E5=8F=96=E6=9C=8D?= =?UTF-8?q?=E5=8A=A1=E5=8C=85=E5=BD=93=E6=9C=88=E5=B7=B2=E9=97=AE=E8=AF=8A?= =?UTF-8?q?=E6=AC=A1=E6=95=B0=20=EF=BC=8C=E4=BB=A5=E6=94=AF=E4=BB=98?= =?UTF-8?q?=E6=97=B6=E9=97=B4=E4=B8=BA=E5=87=86=E3=80=82=20=E5=BD=93?= =?UTF-8?q?=E4=B8=80=E4=B8=AA=E6=9C=8D=E5=8A=A1=E5=8C=85=E8=AE=A2=E5=8D=95?= =?UTF-8?q?=E6=98=AF2024-4-22=2015=EF=BC=9A30=E5=88=9B=E5=BB=BA=E7=9A=84?= =?UTF-8?q?=20=E6=AD=A4=E6=97=B6=E4=BC=9A=E5=88=9B=E5=BB=BA=E4=B8=80?= =?UTF-8?q?=E4=B8=AA=E6=9C=8D=E5=8A=A1=E5=8C=85=E9=97=AE=E8=AF=8A=E8=AE=A2?= =?UTF-8?q?=E5=8D=95=EF=BC=8C=E5=BD=93=E6=9C=8D=E5=8A=A1=E5=8C=85=E9=97=AE?= =?UTF-8?q?=E8=AF=8A=E8=AE=A2=E5=8D=95=20=E7=BB=9F=E8=AE=A1=E5=89=A9?= =?UTF-8?q?=E4=BD=99=E6=AC=A1=E6=95=B0=E6=97=B6=EF=BC=8C=E6=98=AF=E4=BB=A5?= =?UTF-8?q?=E6=9C=8D=E5=8A=A1=E5=8C=85=E7=9A=84=E6=94=AF=E4=BB=98=E6=97=B6?= =?UTF-8?q?=E9=97=B4=EF=BC=8C=E5=A6=82=E6=9E=9C=E4=BB=A5=E5=BC=80=E5=A7=8B?= =?UTF-8?q?=E6=97=B6=E9=97=B4=EF=BC=8C=E4=BC=9A=E5=AD=98=E5=9C=A8=E6=BC=8F?= =?UTF-8?q?=E6=8E=89=E9=A6=96=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/Services/ImService.php | 28 ++++++++++----------- app/Services/InquiryService.php | 2 +- app/Services/MessagePush.php | 2 +- app/Services/OrderServicePackageService.php | 6 ++--- app/Services/PatientOrderService.php | 2 +- 5 files changed, 20 insertions(+), 20 deletions(-) diff --git a/app/Services/ImService.php b/app/Services/ImService.php index 3092742..2119b87 100644 --- a/app/Services/ImService.php +++ b/app/Services/ImService.php @@ -326,7 +326,7 @@ class ImService extends BaseService if ($order_service_package_detail['monthly_frequency'] != 0 && !empty($order_service_package['start_time'])) { // 获取服务包当月已问诊次数 $OrderServicePackageService = new OrderServicePackageService(); - $month_inquiry_count = $OrderServicePackageService->getCurrentMonthInquiryCount($order_service_package['start_time'], $order_service_package['order_service_type'], $order_service_package['user_id'], $order_service_package['doctor_id']); + $month_inquiry_count = $OrderServicePackageService->getCurrentMonthInquiryCount($order_service_package['pay_time'], $order_service_package['order_service_type'], $order_service_package['user_id'], $order_service_package['doctor_id']); } $message_content_data['data']['remaining_month_inquiry_count'] = $order_service_package_detail['monthly_frequency'] - $month_inquiry_count; // 服务包当月剩余问诊次数 @@ -404,7 +404,7 @@ class ImService extends BaseService if ($order_service_package_detail['monthly_frequency'] != 0 && !empty($order_service_package['start_time'])) { // 获取服务包当月已问诊次数 $OrderServicePackageService = new OrderServicePackageService(); - $month_inquiry_count = $OrderServicePackageService->getCurrentMonthInquiryCount($order_service_package['start_time'], $order_service_package['order_service_type'], $order_service_package['user_id'], $order_service_package['doctor_id']); + $month_inquiry_count = $OrderServicePackageService->getCurrentMonthInquiryCount($order_service_package['pay_time'], $order_service_package['order_service_type'], $order_service_package['user_id'], $order_service_package['doctor_id']); } // 检测问诊是否服务包首次问诊 @@ -505,7 +505,7 @@ class ImService extends BaseService if ($order_service_package_detail['monthly_frequency'] != 0 && !empty($order_service_package['start_time'])) { // 获取服务包当月已问诊次数 $OrderServicePackageService = new OrderServicePackageService(); - $month_inquiry_count = $OrderServicePackageService->getCurrentMonthInquiryCount($order_service_package['start_time'], $order_service_package['order_service_type'], $order_service_package['user_id'], $order_service_package['doctor_id']); + $month_inquiry_count = $OrderServicePackageService->getCurrentMonthInquiryCount($order_service_package['pay_time'], $order_service_package['order_service_type'], $order_service_package['user_id'], $order_service_package['doctor_id']); } // 转换服务包订单类型为汉字 @@ -517,7 +517,7 @@ class ImService extends BaseService // 获取服务包当月剩余问诊次数 if ($order_service_package_detail['monthly_frequency'] != 0 && !empty($order_service_package['start_time'])) { $OrderServicePackageService = new OrderServicePackageService(); - $month_inquiry_count = $OrderServicePackageService->getCurrentMonthInquiryCount($order_service_package['start_time'],$order_service_package['order_service_type'],$order_service_package['user_id'], $order_service_package['doctor_id']); + $month_inquiry_count = $OrderServicePackageService->getCurrentMonthInquiryCount($order_service_package['pay_time'],$order_service_package['order_service_type'],$order_service_package['user_id'], $order_service_package['doctor_id']); $remaining_inquiry_count = $order_service_package_detail['monthly_frequencys'] - $month_inquiry_count; if ($remaining_inquiry_count < 0){ $remaining_inquiry_count = 0; @@ -646,7 +646,7 @@ class ImService extends BaseService if ($order_service_package_detail['monthly_frequency'] != 0 && !empty($order_service_package['start_time'])) { // 获取服务包当月已问诊次数 $OrderServicePackageService = new OrderServicePackageService(); - $month_inquiry_count = $OrderServicePackageService->getCurrentMonthInquiryCount($order_service_package['start_time'], $order_service_package['order_service_type'], $order_service_package['user_id'], $order_service_package['doctor_id']); + $month_inquiry_count = $OrderServicePackageService->getCurrentMonthInquiryCount($order_service_package['pay_time'], $order_service_package['order_service_type'], $order_service_package['user_id'], $order_service_package['doctor_id']); } // 转换服务包订单类型为汉字 @@ -747,7 +747,7 @@ class ImService extends BaseService if ($order_service_package_detail['monthly_frequency'] != 0 && !empty($order_service_package['start_time'])) { // 获取服务包当月已问诊次数 $OrderServicePackageService = new OrderServicePackageService(); - $month_inquiry_count = $OrderServicePackageService->getCurrentMonthInquiryCount($order_service_package['start_time'], $order_service_package['order_service_type'], $order_service_package['user_id'], $order_service_package['doctor_id']); + $month_inquiry_count = $OrderServicePackageService->getCurrentMonthInquiryCount($order_service_package['pay_time'], $order_service_package['order_service_type'], $order_service_package['user_id'], $order_service_package['doctor_id']); } $message_content_data['data']['remaining_month_inquiry_count'] = $order_service_package_detail['monthly_frequency'] - $month_inquiry_count; // 服务包当月剩余问诊次数 @@ -823,7 +823,7 @@ class ImService extends BaseService if ($order_service_package_detail['monthly_frequency'] != 0 && !empty($order_service_package['start_time'])) { // 获取服务包当月已问诊次数 $OrderServicePackageService = new OrderServicePackageService(); - $month_inquiry_count = $OrderServicePackageService->getCurrentMonthInquiryCount($order_service_package['start_time'], $order_service_package['order_service_type'], $order_service_package['user_id'], $order_service_package['doctor_id']); + $month_inquiry_count = $OrderServicePackageService->getCurrentMonthInquiryCount($order_service_package['pay_time'], $order_service_package['order_service_type'], $order_service_package['user_id'], $order_service_package['doctor_id']); } // 检测问诊是否服务包首次问诊 @@ -913,7 +913,7 @@ class ImService extends BaseService if ($order_service_package_detail['monthly_frequency'] != 0 && !empty($order_service_package['start_time'])) { // 获取服务包当月已问诊次数 $OrderServicePackageService = new OrderServicePackageService(); - $month_inquiry_count = $OrderServicePackageService->getCurrentMonthInquiryCount($order_service_package['start_time'], $order_service_package['order_service_type'], $order_service_package['user_id'], $order_service_package['doctor_id']); + $month_inquiry_count = $OrderServicePackageService->getCurrentMonthInquiryCount($order_service_package['pay_time'], $order_service_package['order_service_type'], $order_service_package['user_id'], $order_service_package['doctor_id']); } $message_content_data['data']['remaining_month_inquiry_count'] = $order_service_package_detail['monthly_frequency'] - $month_inquiry_count; // 服务包当月剩余问诊次数 @@ -995,7 +995,7 @@ class ImService extends BaseService if ($order_service_package_detail['monthly_frequency'] != 0 && !empty($order_service_package['start_time'])) { // 获取服务包当月已问诊次数 $OrderServicePackageService = new OrderServicePackageService(); - $month_inquiry_count = $OrderServicePackageService->getCurrentMonthInquiryCount($order_service_package['start_time'], $order_service_package['order_service_type'], $order_service_package['user_id'], $order_service_package['doctor_id']); + $month_inquiry_count = $OrderServicePackageService->getCurrentMonthInquiryCount($order_service_package['pay_time'], $order_service_package['order_service_type'], $order_service_package['user_id'], $order_service_package['doctor_id']); } $message_content_data['data']['remaining_month_inquiry_count'] = $order_service_package_detail['monthly_frequency'] - $month_inquiry_count; // 服务包当月剩余问诊次数 @@ -1073,7 +1073,7 @@ class ImService extends BaseService if ($order_service_package_detail['monthly_frequency'] != 0 && !empty($order_service_package['start_time'])) { // 获取服务包当月已问诊次数 $OrderServicePackageService = new OrderServicePackageService(); - $month_inquiry_count = $OrderServicePackageService->getCurrentMonthInquiryCount($order_service_package['start_time'], $order_service_package['order_service_type'], $order_service_package['user_id'], $order_service_package['doctor_id']); + $month_inquiry_count = $OrderServicePackageService->getCurrentMonthInquiryCount($order_service_package['pay_time'], $order_service_package['order_service_type'], $order_service_package['user_id'], $order_service_package['doctor_id']); } $message_content_data['data']['remaining_month_inquiry_count'] = $order_service_package_detail['monthly_frequency'] - $month_inquiry_count; // 服务包当月剩余问诊次数 @@ -1159,7 +1159,7 @@ class ImService extends BaseService if ($order_service_package_detail['monthly_frequency'] != 0 && !empty($order_service_package['start_time'])) { // 获取服务包当月已问诊次数 $OrderServicePackageService = new OrderServicePackageService(); - $month_inquiry_count = $OrderServicePackageService->getCurrentMonthInquiryCount($order_service_package['start_time'], $order_service_package['order_service_type'], $order_service_package['user_id'], $order_service_package['doctor_id']); + $month_inquiry_count = $OrderServicePackageService->getCurrentMonthInquiryCount($order_service_package['pay_time'], $order_service_package['order_service_type'], $order_service_package['user_id'], $order_service_package['doctor_id']); } $message_content_data['data']['remaining_month_inquiry_count'] = $order_service_package_detail['monthly_frequency'] - $month_inquiry_count; // 服务包当月剩余问诊次数 @@ -1311,7 +1311,7 @@ class ImService extends BaseService if ($order_service_package_detail['monthly_frequency'] != 0 && !empty($order_service_package['start_time'])) { // 获取服务包当月已问诊次数 $OrderServicePackageService = new OrderServicePackageService(); - $month_inquiry_count = $OrderServicePackageService->getCurrentMonthInquiryCount($order_service_package['start_time'], $order_service_package['order_service_type'], $order_service_package['user_id'], $order_service_package['doctor_id']); + $month_inquiry_count = $OrderServicePackageService->getCurrentMonthInquiryCount($order_service_package['pay_time'], $order_service_package['order_service_type'], $order_service_package['user_id'], $order_service_package['doctor_id']); } $message_content_data['data']['remaining_month_inquiry_count'] = $order_service_package_detail['monthly_frequency'] - $month_inquiry_count; // 服务包当月剩余问诊次数 @@ -1395,7 +1395,7 @@ class ImService extends BaseService if ($order_service_package_detail['monthly_frequency'] != 0 && !empty($order_service_package['start_time'])) { // 获取服务包当月已问诊次数 $OrderServicePackageService = new OrderServicePackageService(); - $month_inquiry_count = $OrderServicePackageService->getCurrentMonthInquiryCount($order_service_package['start_time'], $order_service_package['order_service_type'], $order_service_package['user_id'], $order_service_package['doctor_id']); + $month_inquiry_count = $OrderServicePackageService->getCurrentMonthInquiryCount($order_service_package['pay_time'], $order_service_package['order_service_type'], $order_service_package['user_id'], $order_service_package['doctor_id']); } $message_content_data['data']['remaining_month_inquiry_count'] = $order_service_package_detail['monthly_frequency'] - $month_inquiry_count; // 服务包当月剩余问诊次数 @@ -1480,7 +1480,7 @@ class ImService extends BaseService if ($order_service_package_detail['monthly_frequency'] != 0 && !empty($order_service_package['start_time'])) { // 获取服务包当月已问诊次数 $OrderServicePackageService = new OrderServicePackageService(); - $month_inquiry_count = $OrderServicePackageService->getCurrentMonthInquiryCount($order_service_package['start_time'], $order_service_package['order_service_type'], $order_service_package['user_id'], $order_service_package['doctor_id']); + $month_inquiry_count = $OrderServicePackageService->getCurrentMonthInquiryCount($order_service_package['pay_time'], $order_service_package['order_service_type'], $order_service_package['user_id'], $order_service_package['doctor_id']); } $message_content_data['data']['remaining_month_inquiry_count'] = $order_service_package_detail['monthly_frequency'] - $month_inquiry_count; // 服务包当月剩余问诊次数 diff --git a/app/Services/InquiryService.php b/app/Services/InquiryService.php index 3a8923f..ad10b1e 100644 --- a/app/Services/InquiryService.php +++ b/app/Services/InquiryService.php @@ -1541,7 +1541,7 @@ class InquiryService extends BaseService if ($order_service_package_detail['monthly_frequency'] != 0 && !empty($order_service_package['start_time'])) { // 获取服务包当月已问诊次数 $OrderServicePackageService = new OrderServicePackageService(); - $month_inquiry_count = $OrderServicePackageService->getCurrentMonthInquiryCount($order_service_package['start_time'], $order_service_package['order_service_type'], $order_service_package['user_id'], $order_service_package['doctor_id']); + $month_inquiry_count = $OrderServicePackageService->getCurrentMonthInquiryCount($order_service_package['pay_time'], $order_service_package['order_service_type'], $order_service_package['user_id'], $order_service_package['doctor_id']); } // 处理剩余服务天数 diff --git a/app/Services/MessagePush.php b/app/Services/MessagePush.php index 9e53993..aedc4a3 100644 --- a/app/Services/MessagePush.php +++ b/app/Services/MessagePush.php @@ -3272,7 +3272,7 @@ class MessagePush extends BaseService // 获取服务包当月已问诊次数 if ($order_service_package_detail['monthly_frequency'] != 0 && !empty($this->order_service_package['start_time'])) { $OrderServicePackageService = new OrderServicePackageService(); - $month_inquiry_count = $OrderServicePackageService->getCurrentMonthInquiryCount($this->order_service_package['start_time'],$this->order_service_package['order_service_type'],$this->order_service_package['user_id'], $this->order_service_package['doctor_id']); + $month_inquiry_count = $OrderServicePackageService->getCurrentMonthInquiryCount($this->order_service_package['pay_time'],$this->order_service_package['order_service_type'],$this->order_service_package['user_id'], $this->order_service_package['doctor_id']); $remaining_inquiry_count = $order_service_package_detail['monthly_frequencys'] - $month_inquiry_count; if ($remaining_inquiry_count < 0){ $remaining_inquiry_count = 0; diff --git a/app/Services/OrderServicePackageService.php b/app/Services/OrderServicePackageService.php index 05802b5..fa74098 100644 --- a/app/Services/OrderServicePackageService.php +++ b/app/Services/OrderServicePackageService.php @@ -173,7 +173,7 @@ class OrderServicePackageService extends BaseService // 3.5号购买，每月2次问诊次数。今天5.3，属于第几个月，这个月的开始时间和结束时间 if ($order_service_package_detail['monthly_frequency'] != 0) { // 获取服务包当月已问诊次数 - $month_inquiry_count = $this->getCurrentMonthInquiryCount($order_service_package['start_time'],$service_type,$user_info['client_user_id'], $doctor_id); + $month_inquiry_count = $this->getCurrentMonthInquiryCount($order_service_package['pay_time'],$service_type,$user_info['client_user_id'], $doctor_id); if ($month_inquiry_count >= $order_service_package_detail['monthly_frequency']) { // 超出当月问诊次数 @@ -696,7 +696,7 @@ class OrderServicePackageService extends BaseService // 3.5号购买，每月2次问诊次数。今天5.3，属于第几个月，这个月的开始时间和结束时间 if ($order_service_package_detail['monthly_frequency'] != 0) { // 获取服务包当月已问诊次数 - $month_inquiry_count = $this->getCurrentMonthInquiryCount($order_service_package['start_time'],$order_service_package['order_service_type'],$user_info['client_user_id'], $order_service_package['doctor_id']); + $month_inquiry_count = $this->getCurrentMonthInquiryCount($order_service_package['pay_time'],$order_service_package['order_service_type'],$user_info['client_user_id'], $order_service_package['doctor_id']); if ($month_inquiry_count >= $order_service_package_detail['monthly_frequency']) { return fail(HttpEnumCode::HTTP_ERROR, "超出服务包所包含的当月问诊次数"); @@ -1106,7 +1106,7 @@ class OrderServicePackageService extends BaseService // 3.5号购买，每月2次问诊次数。今天5.3，属于第几个月，这个月的开始时间和结束时间 if ($order_service_package_detail['monthly_frequency'] != 0) { // 获取服务包当月已问诊次数 - $month_inquiry_count = $this->getCurrentMonthInquiryCount($order_service_package['start_time'],$order_service_package['order_service_type'],$user_info['client_user_id'], $order_service_package['doctor_id']); + $month_inquiry_count = $this->getCurrentMonthInquiryCount($order_service_package['pay_time'],$order_service_package['order_service_type'],$user_info['client_user_id'], $order_service_package['doctor_id']); if ($month_inquiry_count >= $order_service_package_detail['monthly_frequency']) { // 超出当月问诊次数 diff --git a/app/Services/PatientOrderService.php b/app/Services/PatientOrderService.php index ad59b30..b2afcf1 100644 --- a/app/Services/PatientOrderService.php +++ b/app/Services/PatientOrderService.php @@ -3064,7 +3064,7 @@ class PatientOrderService extends BaseService $result['order_service_package']['current_month_finish_date'] = $current_month_date['current_month_finish_date']; // 获取服务包当月已问诊次数 - $result['order_service_package']['month_inquiry_count'] = $OrderServicePackageService->getCurrentMonthInquiryCount($order_service_package['start_time'],$order_service_package['order_service_type'],$user_info['client_user_id'], $order_service_package['doctor_id']); + $result['order_service_package']['month_inquiry_count'] = $OrderServicePackageService->getCurrentMonthInquiryCount($order_service_package['pay_time'],$order_service_package['order_service_type'],$user_info['client_user_id'], $order_service_package['doctor_id']); } }