From 06a838fbf18ce177590ba1c12859071fcde558ef Mon Sep 17 00:00:00 2001
From: ljl <liaojinling@jiancent.com>
Date: Mon, 29 May 2023 20:20:56 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/Helper/Efps/Api.php | 22 +++++----------------
 certs/prod/efps.cer     | 44 +++++++++++++++++++++--------------------
 2 files changed, 28 insertions(+), 38 deletions(-)

diff --git a/app/Helper/Efps/Api.php b/app/Helper/Efps/Api.php
index fbea378..edb288c 100644
--- a/app/Helper/Efps/Api.php
+++ b/app/Helper/Efps/Api.php
@@ -87,7 +87,7 @@ class Api extends AbstractApi
 
     public static function bindCard($params)
     {
-        $memberId = self::getConfig('customerCode');
+        $memberId = $params['memberId'] ?? '';
         $mchtOrderNo = $params['mchtOrderNo'] ?? StringHelper::generateOrderNo();
         $userName = $params['userName'] ?? '';
         $phoneNum = $params['phoneNum'] ?? '';
@@ -103,6 +103,7 @@ class Api extends AbstractApi
             'customerCode' => self::getConfig('customerCode'),
             'mchtOrderNo' => $mchtOrderNo,
             'memberId' => $memberId,
+            'isSendIssuer' => true,
             'userName' => Signer::publicEncrypt($userName),
             'phoneNum' => Signer::publicEncrypt($phoneNum),
             'bankCardNo' => Signer::publicEncrypt($bankCardNo),
@@ -111,19 +112,6 @@ class Api extends AbstractApi
             'certificatesNo' => Signer::publicEncrypt($certificatesNo),
             'nonceStr' => StringHelper::getRandomString(32),
         ];
-        /*$params = [
-            'version' => '2.0',
-            'customerCode' => self::getConfig('customerCode'),
-            'mchtOrderNo' => $mchtOrderNo,
-            'memberId' => $memberId,
-            'userName' => $userName,
-            'phoneNum' => $phoneNum,
-            'bankCardNo' => $bankCardNo,
-            'bankCardType' => $bankCardType,
-            'certificatesType' => '01',
-            'certificatesNo' => $certificatesNo,
-            'nonceStr' => StringHelper::getRandomString(32),
-        ];*/
         if ($bankCardType == 'credit') {
             $params['expired'] = Signer::publicEncrypt($expired);
             $params['cvn'] = Signer::publicEncrypt($cvn);
@@ -139,7 +127,7 @@ class Api extends AbstractApi
         $memberId = $params['memberId'] ?? '';
         $uri = '/api/txs/protocol/bindCardConfirm';
         $params = [
-            'version' => '3.0',
+            'version' => '2.0',
             'customerCode' => self::getConfig('customerCode'),
             'smsNo' => $smsNo,
             'memberId' => $memberId,
@@ -166,7 +154,7 @@ class Api extends AbstractApi
 
         $uri = '/api/txs/pay/CertifiedPayment';
         $params = [
-            'version' => '3.0',
+            'version' => '2.0',
             'customerCode' => self::getConfig('customerCode'),
             'outTradeNo' => $outTradeNo,
             'userName' => Signer::publicEncrypt($userName),
@@ -189,7 +177,7 @@ class Api extends AbstractApi
         $memberId = $params['memberId'] ?? '';
         $uri = '/api/txs/protocol/unBindCard';
         $params = [
-            'version' => '3.0',
+            'version' => '2.0',
             'customerCode' => self::getConfig('customerCode'),
             'protocol' => $protocol,
             'memberId' => $memberId,
diff --git a/certs/prod/efps.cer b/certs/prod/efps.cer
index 5e9bc00..03d623e 100644
--- a/certs/prod/efps.cer
+++ b/certs/prod/efps.cer
@@ -1,23 +1,25 @@
 -----BEGIN CERTIFICATE-----
-MIID0jCCArqgAwIBAgIJAP7Hut/02gF6MA0GCSqGSIb3DQEBCwUAMH4xCzAJBgNV
-BAYTAkdaMQswCQYDVQQIDAJHRDELMAkGA1UEBwwCR1oxDTALBgNVBAoMBEVQQVkx
-EjAQBgNVBAsMCWVwYXlsaW5rczENMAsGA1UEAwwEeWlscjEjMCEGCSqGSIb3DQEJ
-ARYUeWlsaXJlbkBlcGF5bGlua3MuY24wHhcNMjMwNDEzMDE1MDM5WhcNMzMwNDEw
-MDE1MDM5WjB+MQswCQYDVQQGEwJHWjELMAkGA1UECAwCR0QxCzAJBgNVBAcMAkda
-MQ0wCwYDVQQKDARFUEFZMRIwEAYDVQQLDAllcGF5bGlua3MxDTALBgNVBAMMBHlp
-bHIxIzAhBgkqhkiG9w0BCQEWFHlpbGlyZW5AZXBheWxpbmtzLmNuMIIBIjANBgkq
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA1SL1lt41Phow3aZKQhB0zXNCX4DNqMkr
-88/auTe/Lq7llBNYWtPJeABg6K+8JHAs6L90yzQN3mUU3k4gKFLCJPQEIlK9sPKA
-AJQnDAs+3PUucgl1QCJnmeSRQKQCGfFjmsGOn+deyV/Lx4gHd3ytpErUDM1iEfen
-YHQACuGlRK9G7w90V0UnF7YJca5FCB/wzL3QjqcQC6Z9e/bYXQES7fQH8vX+ajBr
-gvi9nMVjFugsZk5sLkwGeYuY4/HMuUWQ8wW+Fvu8cJKtb48sqTl1eTPMhKPwgrgY
-EB+RIBA4Ls/gF4/7/dQJA18xFS60Dbn7LS6IP6OTkO9BP4k+qi0kLQIDAQABo1Mw
-UTAdBgNVHQ4EFgQUZlpKcM3zf5c8fed6tWnRVVQfC4AwHwYDVR0jBBgwFoAUZlpK
-cM3zf5c8fed6tWnRVVQfC4AwDwYDVR0TAQH/BAUwAwEB/zANBgkqhkiG9w0BAQsF
-AAOCAQEAyIhFS5AzMVNYXqjRxkKIgdEFt3DXVWermW6L/w0S774ebflQT7fabZhP
-+NirUB9VP2hM4axZEhXSXYBeRMw9ahs/It0OrBNbmH+N4bIUVLdGeMoGpjjV5vvd
-OV5Tagna7hhaK0F3iBOnjDiO17INxMiRx9yt7n41ml+4VLAbaLY1l0CGouNmrkzT
-15CxLnB29m0Xq3V+YsLfDV5ohUNtbFX3NrBUXSHUUf5n8YWqJWTQl2TkeMoYAJbs
-WSdkZGNB5KGDUORRPjabpEs2+0+uGHgVr3Llxc3rEVgLSX0wFe1ytLbIW0ibmQV+
-tpiZYSSfN6lzzX9NnQk3zGLv+UfIag==
+MIIEIjCCAwqgAwIBAgIUJciVbai01yHdyTuMJ3UAOf6uWPQwDQYJKoZIhvcNAQEL
+BQAwgZYxCzAJBgNVBAYTAkNOMTkwNwYDVQQKDDDljJfkuqzlpKnlqIHor5rkv6Hn
+lLXlrZDllYbliqHmnI3liqHmnInpmZDlhazlj7gxFTATBgNVBAsMDOS8geS4muiv
+geS5pjE1MDMGA1UEAwws5aSp5aiB6K+a5L+h5pWw5a2X6K6k6K+B5Lit5b+D5LyB
+5Lia6K+B5LmmQ0EwHhcNMTgwMTExMDgwNjE4WhcNMTkwMTExMDgwNjE4WjCBjDE5
+MDcGA1UECgww5YyX5Lqs5aSp5aiB6K+a5L+h55S15a2Q5ZWG5Yqh5pyN5Yqh5pyJ
+6ZmQ5YWs5Y+4MRgwFgYDVQQLDA/ov5Dnu7TmlK/mjIHpg6gxNTAzBgNVBAMMLOaY
+k+elqOiBlOaUr+S7mOaciemZkOWFrOWPuC1FRlBT5ZWG5oi36Zeo5oi3MIIBIjAN
+BgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAptTghT1nY9twX4VKrvJigGB/klcs
+P8tH+9aV5TofKskh8PQg8neTSprPMmEsidFGMJ26a4x/E88nJ6wMHAZqeWP0x64/
+GLtIff8r+WZjqBYP9WNiW71NcAsoJEBrlLlLrc5W/9mC+3z0oWYiz+LB9E+uMeCV
+3ocHP42Z6oGeCV6jSe1Sx2UBsCEROYh1nTnZQ13pHIghqO1Fc5MZTcTW5k3zviuF
+L7IJYUW79AIzh9SttcMbUZqGWkf808Ux3BhZzgUTL0g76fpCRjPilmlCJ/NdyGJ4
+8E0IfMXHeTq3uiEjnO2nzsEV4zvhNoii0F2iH+fgMXBDwGd9O3mLv23gIQIDAQAB
+o3AwbjAJBgNVHRMEAjAAMAsGA1UdDwQEAwIFoDBUBgNVHR8ETTBLMEmgR6BFhkNo
+dHRwOi8vdG9wY2EuaXRydXMuY29tLmNuL3B1YmxpYy9pdHJ1c2NybD9DQT0kIAoK
+JENBX1NFUklBTE5VTUJFUiQkMA0GCSqGSIb3DQEBCwUAA4IBAQCUEFIx+vOeOQi2
+ZWR8TnADKYYTNsqv52e9WBz8VKfjbzIDA/hXqJUvtylyyEL4pBn82xG0WMk9UaAE
+EGrkpdA0figlbUInyXZE8WZYcE/7Nlr4aupH+JETp1OqvAsS0l5M2mH4OdVMDA/K
+pdwTMBa0it7f3QA8k2lXalHlifi35jrKj2q3DFKvy2n9pcwblPX2jpC7pZ1Y66tq
+7SapaGyCo12Q6o0vSCgGodFkZsczYmGdp4ZbphUbACVQ3Lhw/moqB3PadT6V0jB6
+4BDDHnkDkaoUI5XUr1BMmTAyy+chBLHzk83Dx9ioNHdF0rHpEyUD73GfV11R7BIy
+zl5g8FpF
 -----END CERTIFICATE-----