Merge branch 'dev_hsq'

src/Common/Hsq/Data/Charge/PubChargeData.php

@@ -49,6 +49,7 @@ class PubChargeData extends ChargeBaseData
         ];
         ];
         $signContent = [
         $signContent = [
             /* 业务请求参数 begin */
             /* 业务请求参数 begin */
+            'subMerchantNo' => $this->subMerchantNo, //门店编号
             'transNo' => $this->transNo, //商户订单号
             'transNo' => $this->transNo, //商户订单号
             'payType' => $this->payType, //支付类型
             'payType' => $this->payType, //支付类型
             'orderAmt' => intval($this->orderAmt), //交易金额, 交易金额，单位为：分
             'orderAmt' => intval($this->orderAmt), //交易金额, 交易金额，单位为：分

src/Common/HsqConfig.php

@@ -34,6 +34,8 @@ final class HsqConfig extends ConfigInterface
 
 
     public $payType = 'WECHAT_APPLET'; //交易类型
     public $payType = 'WECHAT_APPLET'; //交易类型
 
 
+    public $subMerchantNo;
+
     public $returnUrl; //异步回调地址
     public $returnUrl; //异步回调地址
 
 
     public $requestDate; // 交易时间 格式为 yyyyMMddHHmmss
     public $requestDate; // 交易时间 格式为 yyyyMMddHHmmss
@@ -127,6 +129,10 @@ final class HsqConfig extends ConfigInterface
             $this->payType = $config['payType'];
             $this->payType = $config['payType'];
         }
         }
 
 
+        if (key_exists('subMerchantNo', $config) && !empty($config['subMerchantNo'])) {
+            $this->subMerchantNo = $config['subMerchantNo'];
+        }
+
         if (key_exists('request_url', $config) && !empty($config['request_url'])) {
         if (key_exists('request_url', $config) && !empty($config['request_url'])) {
             $this->base_url = $config['request_url'];
             $this->base_url = $config['request_url'];
         }
         }