diff --git a/app/Services/MessagePush.php b/app/Services/MessagePush.php index fc78f05..34601f0 100644 --- a/app/Services/MessagePush.php +++ b/app/Services/MessagePush.php @@ -142,7 +142,7 @@ class MessagePush extends BaseService if (!$result) { Log::getInstance("MessagePush")->error("错误:" . json_encode($data, JSON_UNESCAPED_UNICODE)); } - } catch (\Exception $e) { + } catch (\Throwable $e) { Log::getInstance("MessagePush")->error("错误:" . $e->getMessage()); } } @@ -187,7 +187,7 @@ class MessagePush extends BaseService if (!$result) { Log::getInstance("MessagePush")->error("错误:" . json_encode($data, JSON_UNESCAPED_UNICODE)); } - } catch (\Exception $e) { + } catch (\Throwable $e) { Log::getInstance("MessagePush")->error("错误:" . $e->getMessage()); } } @@ -224,7 +224,7 @@ class MessagePush extends BaseService throw new BusinessException("加入推送队列失败" . json_encode($data, JSON_UNESCAPED_UNICODE)); } } - } catch (\Exception $e) { + } catch (\Throwable $e) { throw new BusinessException("加入推送队列失败" . $e->getMessage()); } @@ -356,7 +356,7 @@ class MessagePush extends BaseService if (!$result) { Log::getInstance("MessagePush")->error("错误:加入推送队列失败" . json_encode($data, JSON_UNESCAPED_UNICODE)); } - } catch (\Exception $e) { + } catch (\Throwable $e) { Log::getInstance("MessagePush")->error("错误:加入推送队列失败" . $e->getMessage()); } } @@ -522,7 +522,7 @@ class MessagePush extends BaseService if (!$result) { Log::getInstance("MessagePush")->error("错误:加入推送队列失败" . json_encode($data, JSON_UNESCAPED_UNICODE)); } - } catch (\Exception $e) { + } catch (\Throwable $e) { Log::getInstance("MessagePush")->error("错误:加入推送队列失败" . $e->getMessage()); } } @@ -563,7 +563,7 @@ class MessagePush extends BaseService if (!$result) { Log::getInstance("MessagePush")->error("错误:加入推送队列失败" . json_encode($data, JSON_UNESCAPED_UNICODE)); } - } catch (\Exception $e) { + } catch (\Throwable $e) { Log::getInstance("MessagePush")->error("错误:加入推送队列失败" . $e->getMessage()); } } @@ -595,7 +595,7 @@ class MessagePush extends BaseService if (!$result) { Log::getInstance("MessagePush")->error("错误:加入推送队列失败" . json_encode($data, JSON_UNESCAPED_UNICODE)); } - } catch (\Exception $e) { + } catch (\Throwable $e) { Log::getInstance("MessagePush")->error("错误:加入推送队列失败" . $e->getMessage()); } } @@ -627,7 +627,7 @@ class MessagePush extends BaseService if (!$result) { Log::getInstance("MessagePush")->error("错误:加入推送队列失败" . json_encode($data, JSON_UNESCAPED_UNICODE)); } - } catch (\Exception $e) { + } catch (\Throwable $e) { Log::getInstance("MessagePush")->error("错误:加入推送队列失败" . $e->getMessage()); } } @@ -659,7 +659,7 @@ class MessagePush extends BaseService if (!$result) { Log::getInstance("MessagePush")->error("错误:加入推送队列失败" . json_encode($data, JSON_UNESCAPED_UNICODE)); } - } catch (\Exception $e) { + } catch (\Throwable $e) { Log::getInstance("MessagePush")->error("错误:加入推送队列失败" . $e->getMessage()); } } @@ -749,7 +749,7 @@ class MessagePush extends BaseService if (!$result) { Log::getInstance("MessagePush")->error("错误:加入推送队列失败" . json_encode($data, JSON_UNESCAPED_UNICODE)); } - } catch (\Exception $e) { + } catch (\Throwable $e) { Log::getInstance("MessagePush")->error("错误:加入推送队列失败" . $e->getMessage()); } } @@ -879,7 +879,7 @@ class MessagePush extends BaseService if (!$result) { Log::getInstance("MessagePush")->error("错误:加入推送队列失败" . json_encode($data, JSON_UNESCAPED_UNICODE)); } - } catch (\Exception $e) { + } catch (\Throwable $e) { Log::getInstance("MessagePush")->error("错误:加入推送队列失败" . $e->getMessage()); } } @@ -920,7 +920,7 @@ class MessagePush extends BaseService if (!$result) { Log::getInstance("MessagePush")->error("错误:加入推送队列失败" . json_encode($data, JSON_UNESCAPED_UNICODE)); } - } catch (\Exception $e) { + } catch (\Throwable $e) { Log::getInstance("MessagePush")->error("错误:加入推送队列失败" . $e->getMessage()); } } @@ -986,13 +986,9 @@ class MessagePush extends BaseService $sub_data['params']['page'] = "pages/medinceOrderDetail/medinceOrderDetail?order_product_id={$order_product_id}"; $sub_data['params']['data'] = [ "character_string9" => (string)$order_product['order_product_no'],// 快递单号 - "time7" => $order_product['delivery_time'],// 发货时间 - "thing3" => $order_product['province'] . $order_product['city'] . $order_product['county'],// 收货地址 - "thing6" => (string)$order_product['consignee_name'],// 收货人 - "thing5" => "您的药品已发货,点击可以查看订单详情",// 备注 ]; @@ -1018,7 +1014,7 @@ class MessagePush extends BaseService if (!$result) { Log::getInstance("MessagePush")->error("错误:加入推送队列失败" . json_encode($data, JSON_UNESCAPED_UNICODE)); } - } catch (\Exception $e) { + } catch (\Throwable $e) { Log::getInstance("MessagePush")->error("错误:加入推送队列失败" . $e->getMessage()); } } @@ -1035,7 +1031,7 @@ class MessagePush extends BaseService { try { - } catch (\Exception $e) { + } catch (\Throwable $e) { throw new BusinessException("加入推送队列失败" . $e->getMessage()); } @@ -1116,22 +1112,16 @@ class MessagePush extends BaseService $thing6 = "5分钟内未接诊,平台将自动取消问诊"; } - $sub_data = array(); $sub_data['push_user_id'] = $this->user['user_id']; $sub_data['wx_template_id'] = "G1RIs0RYqsTQ2CuPQWalIMyb6_deuEEbJfajfhGvNzc";//咨询提醒 $sub_data['params']['page'] = "Pages/yishi/wenzhen_v2/wenzhen"; $sub_data['params']['data'] = [ "thing1" => "您有一个新的问诊服务等待接诊",// 提醒内容 - "name2" => (string)$this->order_inquiry['patient_name'],// 患者姓名 - "thing4" => (string)$disease_desc,// 病情描述 - "thing6" => $thing6,// 提示说明 - "thing5" => "",// 咨询内容 - ]; // 短信 @@ -1155,7 +1145,7 @@ class MessagePush extends BaseService if (!$result) { Log::getInstance("MessagePush")->error("错误:加入订阅推送队列失败" . json_encode($data, JSON_UNESCAPED_UNICODE)); } - } catch (\Exception $e) { + } catch (\Throwable $e) { Log::getInstance("MessagePush")->error("错误:加入推送队列失败" . $e->getMessage()); } } @@ -1164,8 +1154,6 @@ class MessagePush extends BaseService * 医生xx时间后还未接诊 * 站内、订阅失败发送短信 * @return bool - * @throws ContainerExceptionInterface - * @throws NotFoundExceptionInterface */ public function doctorNotYetInquiry(): bool { @@ -1239,8 +1227,8 @@ class MessagePush extends BaseService if (!$result) { Log::getInstance("MessagePush")->error("错误:加入站内推送队列失败" . json_encode($data, JSON_UNESCAPED_UNICODE)); } - } catch (\Exception $e) { - Log::getInstance("MessagePush")->error("错误:加入站内推送队列失败" . json_encode($data, JSON_UNESCAPED_UNICODE)); + } catch (\Throwable $e) { + Log::getInstance("MessagePush")->error("错误:加入站内推送队列失败" .$e->getMessage()); } return true; @@ -1290,7 +1278,7 @@ class MessagePush extends BaseService if (!$result) { Log::getInstance("MessagePush")->error("错误:加入站内推送队列失败" . json_encode($data, JSON_UNESCAPED_UNICODE)); } - } catch (\Exception $e) { + } catch (\Throwable $e) { Log::getInstance("MessagePush")->error("错误:加入推送队列失败" . $e->getMessage()); } } @@ -1374,7 +1362,7 @@ class MessagePush extends BaseService if (!$result) { Log::getInstance("MessagePush")->error("错误:加入站内推送队列失败" . json_encode($data, JSON_UNESCAPED_UNICODE)); } - } catch (\Exception $e) { + } catch (\Throwable $e) { Log::getInstance("MessagePush")->error("错误:加入站内推送队列失败" . json_encode($data, JSON_UNESCAPED_UNICODE)); } } @@ -1432,7 +1420,7 @@ class MessagePush extends BaseService if (!$result) { Log::getInstance("MessagePush")->error("错误:加入站内推送队列失败" . json_encode($data, JSON_UNESCAPED_UNICODE)); } - } catch (\Exception $e) { + } catch (\Throwable $e) { Log::getInstance("MessagePush")->error("错误:加入站内推送队列失败" . $e->getMessage()); } } @@ -1466,7 +1454,7 @@ class MessagePush extends BaseService throw new BusinessException("加入推送队列失败" . json_encode($data, JSON_UNESCAPED_UNICODE)); } } - } catch (\Exception $e) { + } catch (\Throwable $e) { throw new BusinessException("加入推送队列失败" . $e->getMessage()); } @@ -1502,7 +1490,7 @@ class MessagePush extends BaseService throw new BusinessException("加入推送队列失败" . json_encode($data, JSON_UNESCAPED_UNICODE)); } } - } catch (\Exception $e) { + } catch (\Throwable $e) { throw new BusinessException("加入推送队列失败" . $e->getMessage()); } @@ -1581,7 +1569,7 @@ class MessagePush extends BaseService throw new BusinessException("加入推送队列失败" . json_encode($data, JSON_UNESCAPED_UNICODE)); } } - } catch (\Exception $e) { + } catch (\Throwable $e) { throw new BusinessException("加入推送队列失败" . $e->getMessage()); } @@ -1657,7 +1645,7 @@ class MessagePush extends BaseService throw new BusinessException("加入推送队列失败" . json_encode($data, JSON_UNESCAPED_UNICODE)); } } - } catch (\Exception $e) { + } catch (\Throwable $e) { throw new BusinessException("加入推送队列失败" . $e->getMessage()); } @@ -1735,7 +1723,7 @@ class MessagePush extends BaseService throw new BusinessException("加入推送队列失败" . json_encode($data, JSON_UNESCAPED_UNICODE)); } } - } catch (\Exception $e) { + } catch (\Throwable $e) { throw new BusinessException("加入推送队列失败" . $e->getMessage()); } @@ -1810,7 +1798,7 @@ class MessagePush extends BaseService throw new BusinessException("加入推送队列失败" . json_encode($data, JSON_UNESCAPED_UNICODE)); } } - } catch (\Exception $e) { + } catch (\Throwable $e) { throw new BusinessException("加入推送队列失败" . $e->getMessage()); } @@ -1890,7 +1878,7 @@ class MessagePush extends BaseService Log::getInstance("MessagePush")->error("错误:加入推送队列失败" . json_encode($data, JSON_UNESCAPED_UNICODE)); } } - } catch (\Exception $e) { + } catch (\Throwable $e) { Log::getInstance("MessagePush")->error("错误:加入推送队列失败" . $e->getMessage()); } @@ -1969,7 +1957,7 @@ class MessagePush extends BaseService throw new BusinessException("加入推送队列失败" . json_encode($data, JSON_UNESCAPED_UNICODE)); } } - } catch (\Exception $e) { + } catch (\Throwable $e) { throw new BusinessException("加入推送队列失败" . $e->getMessage()); } @@ -2008,7 +1996,7 @@ class MessagePush extends BaseService throw new BusinessException("加入推送队列失败" . json_encode($data, JSON_UNESCAPED_UNICODE)); } } - } catch (\Exception $e) { + } catch (\Throwable $e) { throw new BusinessException("加入推送队列失败" . $e->getMessage()); } @@ -2046,7 +2034,7 @@ class MessagePush extends BaseService throw new BusinessException("加入推送队列失败" . json_encode($data, JSON_UNESCAPED_UNICODE)); } } - } catch (\Exception $e) { + } catch (\Throwable $e) { throw new BusinessException("加入推送队列失败" . $e->getMessage()); } @@ -2140,7 +2128,7 @@ class MessagePush extends BaseService if (!$result) { Log::getInstance("MessagePush")->error("错误:加入推送队列失败" . json_encode($data, JSON_UNESCAPED_UNICODE)); } - } catch (\Exception $e) { + } catch (\Throwable $e) { Log::getInstance("MessagePush")->error("错误:加入推送队列失败" . $e->getMessage()); } } @@ -2214,7 +2202,7 @@ class MessagePush extends BaseService if (!$result) { Log::getInstance("MessagePush")->error("错误:加入推送队列失败" . json_encode($data, JSON_UNESCAPED_UNICODE)); } - } catch (\Exception $e) { + } catch (\Throwable $e) { Log::getInstance("MessagePush")->error("错误:加入推送队列失败" . $e->getMessage()); } } @@ -2270,7 +2258,7 @@ class MessagePush extends BaseService if (!$result) { Log::getInstance("MessagePush")->error("错误:加入推送队列失败" . json_encode($data, JSON_UNESCAPED_UNICODE)); } - } catch (\Exception $e) { + } catch (\Throwable $e) { Log::getInstance("MessagePush")->error("错误:加入推送队列失败" . $e->getMessage()); } } @@ -2347,7 +2335,7 @@ class MessagePush extends BaseService if (!$result) { Log::getInstance("MessagePush-patientDetectionResultNotice")->error(json_encode($data, JSON_UNESCAPED_UNICODE)); } - } catch (\Exception $e) { + } catch (\Throwable $e) { Log::getInstance("MessagePush-patientDetectionResultNotice")->error($e->getMessage()); } }