Merge branch 'dev_sw_qrcode' into 'master'

扫呗聚合码支付(用于支付宝)

See merge request !12

src/Common/SwThree/Data/BackScanChargeData.php

@@ -15,7 +15,7 @@ class BackScanChargeData extends SwBaseData
 {
 {
     public function getData()
     public function getData()
     {
     {
-        $this->retData['qr_code'] = $this->qr_code;//二维码码串
+        $this->retData['qr_code'] = $this->qr_url ?? $this->qr_code;  //二维码码串
         $this->retData['other'] = [
         $this->retData['other'] = [
             'pay_type' => $this->pay_type,
             'pay_type' => $this->pay_type,
             'merchant_name' => $this->merchant_name,
             'merchant_name' => $this->merchant_name,

src/Common/SwThreeConfig.php

@@ -9,7 +9,7 @@ final class SwThreeConfig extends ConfigInterface
 {
 {
     public $signType = 'MD5';
     public $signType = 'MD5';
 
 
-    public $pay_ver = 201;//版本号，当前版本201
+    public $pay_ver = 202;//版本号，当前版本201
 
 
     public $pay_type;//请求类型，010微信，020支付宝，060qq钱包，090口碑，100翼支付
     public $pay_type;//请求类型，010微信，020支付宝，060qq钱包，090口碑，100翼支付
 
 
@@ -40,7 +40,7 @@ final class SwThreeConfig extends ConfigInterface
 
 
 //    const FACEPAY_URL = '/pay/110/facepay';//自助收银
 //    const FACEPAY_URL = '/pay/110/facepay';//自助收银
 
 
-    const SCANPAY_URL = '/pay/open/prepay';//扫码支付（预支付）
+    const SCANPAY_URL = '/pay/open/qrpay';//扫码支付（预支付）
 
 
 //    const BARCODE_URL = '/pay/100/barcodepay';//刷卡（条码）支付
 //    const BARCODE_URL = '/pay/100/barcodepay';//刷卡（条码）支付
 
 

src/Notify/SwNotify.php

@@ -85,6 +85,10 @@ class SwNotify extends NotifyStrategy
         $retSign = $retData['key_sign'];
         $retSign = $retData['key_sign'];
         $data = ArrayUtil::removeKeys($retData, ['key_sign', 'pay_trace','pay_time','receipt_fee']);
         $data = ArrayUtil::removeKeys($retData, ['key_sign', 'pay_trace','pay_time','receipt_fee']);
 
 
+        if ($data['pay_type'] == '020') {
+            return true;
+        }
+
         $values = [
         $values = [
             'return_code' => $data['return_code'],
             'return_code' => $data['return_code'],
             'return_msg' => $data['return_msg'],
             'return_msg' => $data['return_msg'],