diff --git a/application/service/OrderService.php b/application/service/OrderService.php index 9a3702dc3fbe36f5ea53371c4f229ae6cd41200d..d87fec707e9987587fe64820aab71bbc4e615bea 100755 --- a/application/service/OrderService.php +++ b/application/service/OrderService.php @@ -82,12 +82,6 @@ class OrderService return DataReturn('支付方式有误', -1); } - // 配置信息 - if(empty($payment[0]['config'])) - { - return DataReturn('支付缺少配置', -1); - } - // 支付入口文件检查 $pay_checked = PaymentService::EntranceFileChecked($payment[0]['payment'], 'order'); if($pay_checked['code'] != 0) @@ -104,6 +98,10 @@ class OrderService $call_back_url = $url.'_respond.php'; } else { $call_back_url = MyUrl('index/order/respond', ['paymentname'=>$payment[0]['payment']]); + if(stripos($call_back_url, '?') !== false) + { + $call_back_url = $url.'_respond.php'; + } } // 发起支付 diff --git a/extend/payment/Alipay.php b/extend/payment/Alipay.php index 4aa5f031b8fefc77dfbd87776ad76eaf3c99aa5c..40540e059f6f2b979c81f77dd1e363092575e52b 100755 --- a/extend/payment/Alipay.php +++ b/extend/payment/Alipay.php @@ -194,6 +194,19 @@ class Alipay */ public function Pay($params = []) { + // 参数 + if(empty($params)) + { + return DataReturn('参数不能为空', -1); + } + + // 配置信息 + if(empty($this->config)) + { + return DataReturn('支付缺少配置', -1); + } + + // 手机/PC if(IsMobile()) { $ret = $this->PayMobile($params); diff --git a/extend/payment/AlipayMini.php b/extend/payment/AlipayMini.php index 6c5c8d8b2f5beae556ae95c53aef07e4aca6a9fc..1c35c63e801b626a61c189ff4d63b6fa14c5d60d 100755 --- a/extend/payment/AlipayMini.php +++ b/extend/payment/AlipayMini.php @@ -116,6 +116,19 @@ class AlipayMini */ public function Pay($params = []) { + // 参数 + if(empty($params)) + { + return DataReturn('参数不能为空', -1); + } + + // 配置信息 + if(empty($this->config)) + { + return DataReturn('支付缺少配置', -1); + } + + // 支付参数 $parameter = array( 'app_id' => $this->config['appid'], 'method' => 'alipay.trade.create', diff --git a/extend/payment/WeixinMini.php b/extend/payment/Weixin.php similarity index 98% rename from extend/payment/WeixinMini.php rename to extend/payment/Weixin.php index 86dca97d824ca97840f63de4a43d3b2576afa04c..97600801abd327da3ff12c01d9b50d25aa649172 100644 --- a/extend/payment/WeixinMini.php +++ b/extend/payment/Weixin.php @@ -11,14 +11,14 @@ namespace payment; /** - * 微信小程序支付 + * 微信支付 * @author Devil * @blog http://gong.gg/ * @version 1.0.0 * @date 2018-09-19 * @desc description */ -class WeixinMini +class Weixin { // 插件配置参数 private $config; @@ -119,11 +119,18 @@ class WeixinMini */ public function Pay($params = []) { + // 参数 if(empty($params)) { return DataReturn('参数不能为空', -1); } + // 配置信息 + if(empty($this->config)) + { + return DataReturn('支付缺少配置', -1); + } + // 获取支付参数 $ret = $this->GetPayParams($params); if($ret['code'] != 0)