From ef7ebc2f891442498da2a8278f90babe2088fd0a Mon Sep 17 00:00:00 2001 From: wucongxing8150 <815046773@qq.com> Date: Sun, 28 Apr 2024 10:31:45 +0800 Subject: [PATCH] =?UTF-8?q?=E8=8E=B7=E5=8F=96im=E6=B6=88=E6=81=AF=E6=8E=A8?= =?UTF-8?q?=E9=80=81=E4=B8=AD=EF=BC=8C=E6=9C=8D=E5=8A=A1=E5=8C=85=E8=AE=A2?= =?UTF-8?q?=E5=8D=95=E7=9B=B8=E5=85=B3=E7=9A=84=E8=87=AA=E5=AE=9A=E4=B9=89?= =?UTF-8?q?=E5=8F=82=E6=95=B0=E5=A2=9E=E5=8A=A0=E6=9C=8D=E5=8A=A1=E5=8C=85?= =?UTF-8?q?=E7=B1=BB=E5=9E=8B=E5=88=A4=E6=96=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/Controller/CallBackController.php | 40 +++++++++++++-------------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/app/Controller/CallBackController.php b/app/Controller/CallBackController.php index e34b827..78c68c1 100644 --- a/app/Controller/CallBackController.php +++ b/app/Controller/CallBackController.php @@ -104,7 +104,7 @@ class CallBackController extends AbstractController Log::getInstance("CallBack-wxPayInquirySuccess")->error("问诊微信支付回调数据处理失败，缺少外部订单号"); return $server->serve(); } - } catch (\Exception $e) { + } catch (\Throwable $e) { // 验证失败 Log::getInstance("CallBack-wxPayInquirySuccess")->error($e->getMessage()); return $this->wxPayErrorReturn($e->getMessage()); @@ -201,7 +201,7 @@ class CallBackController extends AbstractController Order::edit($params,$data); Db::commit(); - } catch (\Exception $e) { + } catch (\Throwable $e) { // 验证失败 Db::rollBack(); Log::getInstance("CallBack-wxPayInquirySuccess")->error($e->getMessage()); @@ -267,7 +267,7 @@ class CallBackController extends AbstractController Log::getInstance("CallBack-wxPayInquirySuccess")->info("发送im消息成功"); } } - } catch (\Exception $e) { + } catch (\Throwable $e) { // 验证失败 Log::getInstance("CallBack-wxPayInquirySuccess")->error("问诊微信支付回调数据处理成功，分配医生/发送问诊消息失败:" . $e->getMessage()); return $server->serve(); @@ -305,7 +305,7 @@ class CallBackController extends AbstractController Log::getInstance("CallBack-wxPayInquiryRefund")->error("微信退款回调数据错误"); return $server->serve(); } - } catch (\Exception $e) { + } catch (\Throwable $e) { // 验证失败 Log::getInstance("CallBack-wxPayInquiryRefund")->error($e->getMessage()); return $this->wxPayErrorReturn($e->getMessage()); @@ -352,7 +352,7 @@ class CallBackController extends AbstractController $OrderService->orderRefundResult($order_inquiry['inquiry_no'],$message['refund_status'],$message['success_time']); Db::commit(); - } catch (\Exception $e) { + } catch (\Throwable $e) { // 验证失败 Db::rollBack(); Log::getInstance("CallBack-wxPayInquiryRefund")->error("微信支付回调数据验证失败:" . $e->getMessage()); @@ -404,7 +404,7 @@ class CallBackController extends AbstractController Log::getInstance("CallBack-wxPayProductSuccess")->error("缺少外部订单号"); return $server->serve(); } - } catch (\Exception $e) { + } catch (\Throwable $e) { // 验证失败 Log::getInstance("CallBack-wxPayProductSuccess")->error($e->getMessage()); return $this->wxPayErrorReturn($e->getMessage()); @@ -498,7 +498,7 @@ class CallBackController extends AbstractController } Db::commit(); - } catch (\Exception $e) { + } catch (\Throwable $e) { Db::rollBack(); Log::getInstance("CallBack-wxPayProductSuccess")->error("药品微信支付回调数据处理失败:" . $e->getMessage()); return $this->wxPayErrorReturn($e->getMessage()); @@ -580,7 +580,7 @@ class CallBackController extends AbstractController Log::getInstance("CallBack-wxPayProductRefund")->error("缺少外部订单号"); return $server->serve(); } - } catch (\Exception $e) { + } catch (\Throwable $e) { // 验证失败 Log::getInstance("CallBack-wxPayProductRefund")->error($e->getMessage()); return $this->wxPayErrorReturn($e->getMessage()); @@ -637,7 +637,7 @@ class CallBackController extends AbstractController $OrderService->orderRefundResult($order_product['order_product_no'],$message['refund_status'],$message['success_time']); Db::commit(); - } catch (\Exception $e) { + } catch (\Throwable $e) { // 验证失败 Db::rollBack(); Log::getInstance("CallBack-wxPayProductRefund")->error("药品微信退款回调数据处理失败:" . $e->getMessage()); @@ -657,7 +657,7 @@ class CallBackController extends AbstractController $MessagePush = new MessagePush($user_patient['user_id']); $MessagePush->refundProductSuccess($order_product['order_product_id']); } - } catch (\Exception $e) { + } catch (\Throwable $e) { // 验证失败 Log::getInstance("CallBack-wxPayProductRefund")->error("微信退款回调处理成功，推送消息失败:" . $e->getMessage()); return $server->serve(); @@ -726,7 +726,7 @@ class CallBackController extends AbstractController }else{ return $this->ImErrorReturn("非法事件"); } - } catch (\Exception $e) { + } catch (\Throwable $e) { // 验证失败 return $this->ImErrorReturn($e->getMessage()); } @@ -830,7 +830,7 @@ class CallBackController extends AbstractController } - } catch (\Exception $e) { + } catch (\Throwable $e) { // 验证失败 Log::getInstance()->error("处方平台物流回调数据处理失败:" . $e->getMessage()); return $this->platformLogisticsErrorReturn($e->getMessage()); @@ -1064,7 +1064,7 @@ class CallBackController extends AbstractController } return $this->LogisticsSuccessReturn(); - } catch (\Exception $e) { + } catch (\Throwable $e) { return $this->LogisticsFailReturn("异常：" . $e->getMessage()); } } @@ -1224,7 +1224,7 @@ class CallBackController extends AbstractController Order::edit($params,$data); Db::commit(); - } catch (\Exception $e) { + } catch (\Throwable $e) { // 验证失败 Db::rollBack(); Log::getInstance("CallBack-xPayDetectionSuccess")->error("问诊微信支付回调数据处理失败:" . $e->getMessage()); @@ -1264,7 +1264,7 @@ class CallBackController extends AbstractController Log::getInstance("CallBack-wxPayDetectionRefund")->error("缺少外部订单号"); return $server->serve(); } - } catch (\Exception $e) { + } catch (\Throwable $e) { // 验证失败 Log::getInstance("CallBack-wxPayDetectionRefund")->error($e->getMessage()); return $this->wxPayErrorReturn($e->getMessage()); @@ -1311,7 +1311,7 @@ class CallBackController extends AbstractController $OrderService->orderRefundResult($order_detection['detection_no'],$message['refund_status'],$message['success_time']); Db::commit(); - } catch (\Exception $e) { + } catch (\Throwable $e) { // 验证失败 Db::rollBack(); Log::getInstance("CallBack-wxPayDetectionRefund")->error("微信支付回调数据验证失败:" . $e->getMessage()); @@ -2344,7 +2344,7 @@ class CallBackController extends AbstractController Log::getInstance("CallBack-wxPayServiceRefund")->error("缺少外部订单号"); return $server->serve(); } - } catch (\Exception $e) { + } catch (\Throwable $e) { // 验证失败 Log::getInstance("CallBack-wxPayServiceRefund")->error($e->getMessage()); return $this->wxPayErrorReturn($e->getMessage()); @@ -2391,7 +2391,7 @@ class CallBackController extends AbstractController $OrderService->orderRefundResult($order_service_package['order_service_no'],$message['refund_status'],$message['success_time']); Db::commit(); - } catch (\Exception $e) { + } catch (\Throwable $e) { // 验证失败 Db::rollBack(); Log::getInstance("CallBack-wxPayServiceRefund")->error("微信支付回调数据验证失败:" . $e->getMessage()); @@ -2788,7 +2788,7 @@ class CallBackController extends AbstractController } Db::commit(); - } catch (\Exception $e) { + } catch (\Throwable $e) { // 验证失败 Db::rollBack(); Log::getInstance("CallBack-wxPayServiceSuccess")->error("问诊微信支付回调数据处理失败:" . $e->getMessage()); @@ -2830,7 +2830,7 @@ class CallBackController extends AbstractController Log::getInstance("CallBack-wxPayServiceSuccess")->info("发送im消息成功"); } - } catch (\Exception $e) { + } catch (\Throwable $e) { // 验证失败 Log::getInstance("CallBack-wxPayInquirySuccess")->error("微信支付回调处理成功，分配医生/发送问诊消息失败:" . $e->getMessage()); return $server->serve();