Merge branch 'dev_huishouqian' into 'master'

慧收钱模块增加支付宝功能

See merge request !11

src/Common/Hsq/Data/BackPubChargeData.php

@@ -39,14 +39,15 @@ class BackPubChargeData extends HsqBaseData
 
 
             if(!empty($result['qrCode']))
             if(!empty($result['qrCode']))
             {
             {
-                $qrCode = json_decode($result['qrCode'],true);
                 switch ($result['payType'])
                 switch ($result['payType'])
                 {
                 {
                     case 'WECHAT_APPLET': //微信
                     case 'WECHAT_APPLET': //微信
+                        $qrCode = json_decode($result['qrCode'],true);
                         $data = $qrCode;
                         $data = $qrCode;
                         break;
                         break;
                     case 'ALI_APPLET': //支付宝
                     case 'ALI_APPLET': //支付宝
-                        $data = [];
+                        $qrCode = $result['qrCode'];
+                        $data = $qrCode;
                         break;
                         break;
                     default:
                     default:
                 }
                 }