diff --git a/app/miniapi/controller/Base.php b/app/miniapi/controller/Base.php index 6d876d7..69a9c0e 100644 --- a/app/miniapi/controller/Base.php +++ b/app/miniapi/controller/Base.php @@ -173,6 +173,7 @@ class Base extends BaseController Config::set(['EVUS_GOODS' => $data['EVUS_GOODS'] ?? []], 'app'); Config::set(['ESTA_GOODS' => $data['ESTA_GOODS'] ?? []], 'app'); Config::set(['pay_url' => $data['pay']['pay_url'] ?? ''], 'app'); + Config::set(['mini_pay_url' => $data['pay']['miniwxpay'] ?? ''], 'app'); Config::set(['order_url' => $data['order_url'] ?? ''], 'app'); Config::set(['user_url' => $data['user_url'] ?? ''], 'app'); Config::set(['get_evus_detail_url' => $data['get_evus_detail_url'] ?? ''], 'app'); diff --git a/app/miniapi/service/Payment/MiniPayService.php b/app/miniapi/service/Payment/MiniPayService.php index 17ab1a1..a8983db 100644 --- a/app/miniapi/service/Payment/MiniPayService.php +++ b/app/miniapi/service/Payment/MiniPayService.php @@ -25,7 +25,7 @@ class MiniPayService 'body' => $payConfig['body'], 'money' => $money, 'openid' => $openid, - 'attach' => $payConfig['attach'], + 'mark' => $payConfig['mark'], ]); $result = $this->decodeResponse($response, $scene); if (empty($result) || intval($result['code'] ?? 0) !== 200) { diff --git a/app/miniapi/service/Payment/PaymentChannelService.php b/app/miniapi/service/Payment/PaymentChannelService.php index 8707a85..ed80d6e 100644 --- a/app/miniapi/service/Payment/PaymentChannelService.php +++ b/app/miniapi/service/Payment/PaymentChannelService.php @@ -19,11 +19,12 @@ class PaymentChannelService $app = (array)($business['apps'][$context->miniAppCode()] ?? []); $config = array_replace_recursive($config, (array)($company['mini_pay'] ?? []), (array)($app['mini_pay'] ?? [])); + $url = trim((string)Config::get('app.mini_pay_url', '')) ?: trim((string)($config['url'] ?? '')); return [ - 'url' => trim((string)($config['url'] ?? '')), + 'url' => $url, 'body' => trim((string)($config['body'] ?? 'EVUS登记服务费')) ?: 'EVUS登记服务费', - 'attach' => trim((string)($config['attach'] ?? 'msg')) ?: 'msg', + 'mark' => trim((string)($config['mark'] ?? $config['attach'] ?? 'msg')) ?: 'msg', ]; } diff --git a/config/mini_payment.php b/config/mini_payment.php index 1c14931..33c0e0c 100644 --- a/config/mini_payment.php +++ b/config/mini_payment.php @@ -5,9 +5,9 @@ return [ 'businesses' => [ 'evus' => [ 'mini_pay' => [ - 'url' => 'https://pay.qlevisa.com/home/pay/miniwxevuspay', + 'url' => '', 'body' => 'EVUS登记服务费', - 'attach' => 'msg', + 'mark' => 'msg', ], 'companies' => [ 'jn' => [ @@ -30,9 +30,9 @@ return [ ], 'esta' => [ 'mini_pay' => [ - 'url' => 'https://pay.qlevisa.com/home/pay/miniwxevuspay', + 'url' => '', 'body' => 'ESTA登记签证服务费', - 'attach' => 'esta', + 'mark' => 'esta', ], 'companies' => [ 'jn' => [