修改支付参数，增加证书序号配置（可选）

WePayV3/Contracts/BasicWePay.php

@@ -65,12 +65,12 @@ abstract class BasicWePay
         if (empty($options['mch_v3_key'])) {
             throw new InvalidArgumentException("Missing Config -- [mch_v3_key]");
         }
-        if (empty($options['cert_private'])) {
-            throw new InvalidArgumentException("Missing Config -- [cert_private]");
-        }
         if (empty($options['cert_public'])) {
             throw new InvalidArgumentException("Missing Config -- [cert_public]");
         }
+        if (empty($options['cert_private'])) {
+            throw new InvalidArgumentException("Missing Config -- [cert_private]");
+        }
 
         if (stripos($options['cert_public'], '-----BEGIN CERTIFICATE-----') === false) {
             if (file_exists($options['cert_public'])) {
@@ -93,11 +93,29 @@ abstract class BasicWePay
         $this->config['mch_v3_key'] = $options['mch_v3_key'];
         $this->config['cert_public'] = $options['cert_public'];
         $this->config['cert_private'] = $options['cert_private'];
-        $this->config['cert_serial'] = openssl_x509_parse($this->config['cert_public'])['serialNumberHex'];
 
-        if (empty($this->config['cert_serial'])) {
+        if (empty($options['cert_serial'])) {
-            throw new InvalidArgumentException("Failed to parse certificate public key");
+            $this->config['cert_serial'] = openssl_x509_parse($this->config['cert_public'], true)['serialNumberHex'];
+        } else {
+            $this->config['cert_serial'] = $options['cert_serial'];
         }
+        if (empty($this->config['cert_serial'])) {
+            throw new InvalidArgumentException('Failed to parse certificate public key');
+        }
+
+        // 服务商参数支持
+//        if (!empty($options['sp_appid'])) {
+//            $this->config['sp_appid'] = $options['sp_appid'];
+//        }
+//        if (!empty($options['sp_mchid'])) {
+//            $this->config['sp_mchid'] = $options['sp_mchid'];
+//        }
+//        if (!empty($options['sub_appid'])) {
+//            $this->config['sub_appid'] = $options['sub_appid'];
+//        }
+//        if (!empty($options['sub_mch_id'])) {
+//            $this->config['sub_mch_id'] = $options['sub_mch_id'];
+//        }
     }
 
     /**

WePayV3/ProfitSharing.php

@@ -25,8 +25,6 @@ use WePayV3\Contracts\BasicWePay;
  */
 class ProfitSharing extends BasicWePay
 {
-
-
     /**
      * 请求分账
      * @param array $options
@@ -63,9 +61,10 @@ class ProfitSharing extends BasicWePay
     {
         return $this->doRequest('POST', '/v3/profitsharing/orders/unfreeze', json_encode($options, JSON_UNESCAPED_UNICODE), true);
     }
+
     /**
      * 查询剩余待分金额
-     * @param array $transactionId 微信订单号
+     * @param string $transactionId 微信订单号
      * @return array
      * @throws \WeChat\Exceptions\InvalidResponseException
      */
@@ -74,6 +73,7 @@ class ProfitSharing extends BasicWePay
         $pathinfo = "/v3/profitsharing/transactions/{$transactionId}/amounts";
         return $this->doRequest('GET', $pathinfo, '', true);
     }
+
     /**
      * 添加分账接收方
      * @param array $options
@@ -85,6 +85,7 @@ class ProfitSharing extends BasicWePay
         $options['appid'] = $this->config['appid'];
         return $this->doRequest('POST', "/v3/profitsharing/receivers/add", json_encode($options, JSON_UNESCAPED_UNICODE), true);
     }
+
     /**
      * 删除分账接收方
      * @param array $options

_test/pay-v3-config.php

@@ -27,14 +27,16 @@ $certPrivate = <<<CERT
 CERT;
 
 return [
-    // 商户绑定的公众号APPID
+    // 可选，公众号APPID
     'appid'        => '',
-    // 微信商户编号ID
+    // 必填，微信商户编号ID
     'mch_id'       => '',
-    // 微信商户V3接口密钥
+    // 必填，微信商户V3接口密钥
     'mch_v3_key'   => '',
-    // 微信商户证书公钥，支持证书内容或文件路径
+    // 可选，微信商户证书序列号，可从公钥中提取
+    'cert_serial'  => '',
+    // 必填，微信商户证书公钥，支持证书内容或文件路径
     'cert_public'  => $certPublic,
-    // 微信商户证书私钥，支持证书内容或文件路径
+    // 必填，微信商户证书私钥，支持证书内容或文件路径
     'cert_private' => $certPrivate,
 ];