diff --git a/niucloud/app/common.php b/niucloud/app/common.php index 3948d0ef..7dca707c 100644 --- a/niucloud/app/common.php +++ b/niucloud/app/common.php @@ -1087,7 +1087,8 @@ function getEmployeeNumber() return date('Ymd') . $max_id; } -function return_pay_config($campus_id,$order_id){ +function return_pay_config($campus_id, $order_id) +{ $campus_pay = new \app\model\campus_pay\CampusPay(); $pay_config = $campus_pay->where(['campus_id' => $campus_id])->find(); @@ -1095,6 +1096,10 @@ function return_pay_config($campus_id,$order_id){ $vx_config = $sysConfig->where(['config_key' => 'WECHAT'])->value("value"); + if (!$vx_config || !$pay_config) { + throw new \Exception('当前校区支付配置不存在'); + } + $config = [ // 必填-商户号 'mch_id' => $pay_config['mchid'], @@ -1103,7 +1108,7 @@ function return_pay_config($campus_id,$order_id){ // 必填-商户公钥证书路径 'mch_public_cert_path' => $pay_config['apiclient_key'], // 必填 - 'notify_url' => 'https://zh.hnhbty.cn/api/pay/qrcodenotify/order_id/'.$order_id, + 'notify_url' => 'https://zh.hnhbty.cn/api/pay/qrcodenotify/order_id/' . $order_id, // 选填-公众号 的 app_id 'mp_app_id' => $vx_config['app_id'], // 选填-小程序 的 app_id @@ -1121,7 +1126,7 @@ function getCurrentDomain() $host = $_SERVER['HTTP_HOST']; // 包括域名和端口(如存在) - return $scheme . $host.'/'; + return $scheme . $host . '/'; } function decryptWechatPayNotify($ciphertext, $nonce, $associatedData, $key) diff --git a/niucloud/app/service/admin/pay/PayService.php b/niucloud/app/service/admin/pay/PayService.php index 8efea3d3..d41e816c 100644 --- a/niucloud/app/service/admin/pay/PayService.php +++ b/niucloud/app/service/admin/pay/PayService.php @@ -241,6 +241,7 @@ class PayService extends BaseAdminService $pay = new PayLoader('Wechatpay', $config); $url = $pay->scan($params); + $path = qrcode($url['code_url'],'',[],'upload/qrcode/pay/'); $order->where(['id' => $data['order_id']])->update(['payment_id' => $out_trade_no,'ipv3' => $config['mch_secret_key']]);