|
|
@@ -362,7 +362,7 @@ class PaymentOrderService extends BaseService
|
|
|
$data['remark'] = '充值手续费:' . RechargeChannel::feeDisplay($rate, $feeFixed)['fee_text'];
|
|
|
$data['status'] = self::STATUS_STAY;
|
|
|
|
|
|
- $ret = ZimuPayService::pay($amount, $order_no, (string)$memberId);
|
|
|
+ $ret = self::requestProvider('ZIMU', $order_no, fn () => ZimuPayService::pay($amount, $order_no, (string)$memberId));
|
|
|
Log::channel('payment')->info('ZIMU支付发起', [
|
|
|
'order_no' => $order_no,
|
|
|
'member_id' => $memberId,
|
|
|
@@ -389,8 +389,7 @@ class PaymentOrderService extends BaseService
|
|
|
$result['text'] .= "支付完成后请耐心等待,支付到账会第一时间通知您! \n";
|
|
|
$result['url'] = $payUrl;
|
|
|
} else {
|
|
|
- $result['text'] = $ret['msg'] ?? 'ZIMU支付发起失败';
|
|
|
- $result['code'] = 20002;
|
|
|
+ $result = self::channelMaintenance($result);
|
|
|
}
|
|
|
return $result;
|
|
|
}
|
|
|
@@ -411,7 +410,7 @@ class PaymentOrderService extends BaseService
|
|
|
$data['remark'] = '充值手续费:' . RechargeChannel::feeDisplay($rate, $feeFixed)['fee_text'];
|
|
|
$data['status'] = self::STATUS_STAY;
|
|
|
|
|
|
- $ret = NoPayService::pay($amount, $order_no, (string)$memberId, $channel);
|
|
|
+ $ret = self::requestProvider('NO', $order_no, fn () => NoPayService::pay($amount, $order_no, (string)$memberId, $channel));
|
|
|
Log::channel('payment')->info('NO支付发起', [
|
|
|
'order_no' => $order_no,
|
|
|
'member_id' => $memberId,
|
|
|
@@ -437,8 +436,7 @@ class PaymentOrderService extends BaseService
|
|
|
$result['text'] .= "支付完成后请耐心等待,支付到账会第一时间通知您! \n";
|
|
|
$result['url'] = $payUrl;
|
|
|
} else {
|
|
|
- $result['text'] = $ret['msg'] ?? 'NO支付发起失败';
|
|
|
- $result['code'] = 20002;
|
|
|
+ $result = self::channelMaintenance($result);
|
|
|
}
|
|
|
return $result;
|
|
|
}
|
|
|
@@ -459,7 +457,7 @@ class PaymentOrderService extends BaseService
|
|
|
$data['remark'] = '充值手续费:' . RechargeChannel::feeDisplay($rate, $feeFixed)['fee_text'];
|
|
|
$data['status'] = self::STATUS_STAY;
|
|
|
|
|
|
- $ret = JdPayService::pay($amount, $order_no);
|
|
|
+ $ret = self::requestProvider('JD', $order_no, fn () => JdPayService::pay($amount, $order_no));
|
|
|
Log::channel('payment')->info('JD支付发起', $ret);
|
|
|
if (($ret['code'] ?? 0) == 200) {
|
|
|
$item = $ret['data'] ?? [];
|
|
|
@@ -483,8 +481,7 @@ class PaymentOrderService extends BaseService
|
|
|
$result['text'] = $text;
|
|
|
$result['url'] = $payUrl;
|
|
|
} else {
|
|
|
- $result['text'] = $ret['message'] ?? 'JD支付发起失败';
|
|
|
- $result['code'] = 20002;
|
|
|
+ $result = self::channelMaintenance($result);
|
|
|
}
|
|
|
return $result;
|
|
|
}
|
|
|
@@ -510,9 +507,10 @@ class PaymentOrderService extends BaseService
|
|
|
$data['callback_url'] = SanJinService::getNotifyUrl();
|
|
|
$data['remark'] = '充值手续费:' . RechargeChannel::feeDisplay($rate, $feeFixed)['fee_text'];
|
|
|
$data['status'] = self::STATUS_STAY;
|
|
|
- $ret = SanJinService::pay($amountInCents, $order_no, $channel);
|
|
|
+ $ret = self::requestProvider('三斤', $order_no, fn () => SanJinService::pay($amountInCents, $order_no, $channel));
|
|
|
Log::error('三斤支付发起:', $ret);
|
|
|
- if ($ret['code'] == 0) {
|
|
|
+ // 响应不是 JSON 时 $ret 为空数组,null == 0 会被误判为成功,所以必须有 code 且带支付地址。
|
|
|
+ if (isset($ret['code']) && $ret['code'] == 0 && !empty($ret['data']['payUrl'])) {
|
|
|
|
|
|
$qrCode = asset(self::createPaymentQrCode($ret['data']['payUrl']));
|
|
|
$result['image'] = $qrCode;
|
|
|
@@ -534,12 +532,31 @@ class PaymentOrderService extends BaseService
|
|
|
$result['text'] = $text;
|
|
|
$result['url'] = $ret['data']['payUrl'];
|
|
|
} else {
|
|
|
- $result['text'] = $ret['message'];
|
|
|
- $result['code'] = 20002;
|
|
|
+ $result = self::channelMaintenance($result);
|
|
|
}
|
|
|
return $result;
|
|
|
}
|
|
|
|
|
|
+ /** 调用三方下单接口;网络或解析异常只记日志,按失败处理,不把异常信息带给客户。 */
|
|
|
+ private static function requestProvider(string $provider, string $orderNo, callable $request): array
|
|
|
+ {
|
|
|
+ try {
|
|
|
+ $ret = $request();
|
|
|
+ return is_array($ret) ? $ret : [];
|
|
|
+ } catch (\Throwable $e) {
|
|
|
+ Log::error("{$provider}支付发起异常", ['order_no' => $orderNo, 'error' => $e->getMessage()]);
|
|
|
+ return [];
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
+ /** 三方下单未成功时统一提示「通道维护中」,三方返回的原始错误只留在日志里。 */
|
|
|
+ private static function channelMaintenance(array $result): array
|
|
|
+ {
|
|
|
+ $result['code'] = 20002;
|
|
|
+ $result['text'] = lang('通道维护中');
|
|
|
+ return $result;
|
|
|
+ }
|
|
|
+
|
|
|
/**
|
|
|
* @description: 接收支付的通知
|
|
|
* @param {*} $params
|