From c289e53e1c425fd2e01b9befad33f4c30dfb8127 Mon Sep 17 00:00:00 2001 From: mkm <727897186@qq.com> Date: Tue, 4 Jun 2024 11:23:00 +0800 Subject: [PATCH] =?UTF-8?q?feat(payment):=20=E6=9B=B4=E6=96=B0=E6=94=AF?= =?UTF-8?q?=E4=BB=98=E5=AE=9D=E6=94=AF=E4=BB=98=E9=85=8D=E7=BD=AE=E4=BF=A1?= =?UTF-8?q?=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../logic/store_product/StoreProductLogic.php | 3 +++ .../ali/appCertPublicKey_2021004146699603.crt | 23 ------------------- .../ali/appCertPublicKey_2021004148687460.crt | 23 +++++++++++++++++++ config/payment.php | 12 +++++----- 4 files changed, 32 insertions(+), 29 deletions(-) delete mode 100644 config/pay/ali/appCertPublicKey_2021004146699603.crt create mode 100644 config/pay/ali/appCertPublicKey_2021004148687460.crt diff --git a/app/admin/logic/store_product/StoreProductLogic.php b/app/admin/logic/store_product/StoreProductLogic.php index d224e87e7..19420428b 100644 --- a/app/admin/logic/store_product/StoreProductLogic.php +++ b/app/admin/logic/store_product/StoreProductLogic.php @@ -43,6 +43,7 @@ class StoreProductLogic extends BaseLogic 'cost' => $params['cost'], 'purchase' => $params['purchase'], 'rose' => $params['rose'], + 'is_return' => $params['is_return'], ]; if ($params['rose'] > 0) { $rose_price = bcmul($params['cost'], $params['rose'], 2); @@ -112,6 +113,8 @@ class StoreProductLogic extends BaseLogic 'cost' => $params['cost'], 'purchase' => $params['purchase'], 'rose' => $params['rose'], + 'is_return' => $params['is_return'], + ]; if ($params['rose'] > 0) { $rose_price = bcmul($params['cost'], bcdiv($params['rose'], 100, 2), 2); diff --git a/config/pay/ali/appCertPublicKey_2021004146699603.crt b/config/pay/ali/appCertPublicKey_2021004146699603.crt deleted file mode 100644 index 14bfbaeb6..000000000 --- a/config/pay/ali/appCertPublicKey_2021004146699603.crt +++ /dev/null @@ -1,23 +0,0 @@ ------BEGIN CERTIFICATE----- -MIIEoDCCA4igAwIBAgIQICQFJYrgve0jW7XDuTjfnzANBgkqhkiG9w0BAQsFADCBgjELMAkGA1UE -BhMCQ04xFjAUBgNVBAoMDUFudCBGaW5hbmNpYWwxIDAeBgNVBAsMF0NlcnRpZmljYXRpb24gQXV0 -aG9yaXR5MTkwNwYDVQQDDDBBbnQgRmluYW5jaWFsIENlcnRpZmljYXRpb24gQXV0aG9yaXR5IENs -YXNzIDEgUjEwHhcNMjQwNTI1MDIxNjQ0WhcNMjkwNTI0MDIxNjQ0WjBoMQswCQYDVQQGEwJDTjEt -MCsGA1UECgwk5rO45bee6YeM5rW35Yac5Lia56eR5oqA5pyJ6ZmQ5YWs5Y+4MQ8wDQYDVQQLDAZB -bGlwYXkxGTAXBgNVBAMMEDIwODg4NDExMTg1MTQ5NzkwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw -ggEKAoIBAQCktKWIoqSZ8BoSpALMsvTEsEQ1kF++wBeneams0Q17LvqGDBgiGuuICU0tnhBrjEkJ -FIw+5ApiHdkwbjFRqDqXyNj7B9fMBWp+QeHf6KvmRsPOHZegyvmQlqvMYf6hF4OwVKDrtVi6I1hV -drwf35h8KEGh4QM0WyXno2bJ7OVQDL49enrG7dXZQkwnwiluuxgjKphC2WYHCERGiYbrRKWXtQmz -ivjw7YTtfSXvypp8N3pSWXkWeLqpGGK3GG3pcUu4U+y4RFknnzSpiv20EJ6gw3pjUDkzexJoGh9b -yFOMoRVTJpIV8iTshdozd69ny5FjmIoXIouGCjdwp6M+XCXVAgMBAAGjggEpMIIBJTAfBgNVHSME -GDAWgBRxB+IEYRbk5fJl6zEPyeD0PJrVkTAdBgNVHQ4EFgQU7grrNa/BE8O53ysngZSu711bo6Qw -QAYDVR0gBDkwNzA1BgdggRwBbgEBMCowKAYIKwYBBQUHAgEWHGh0dHA6Ly9jYS5hbGlwYXkuY29t -L2Nwcy5wZGYwDgYDVR0PAQH/BAQDAgbAMC8GA1UdHwQoMCYwJKAioCCGHmh0dHA6Ly9jYS5hbGlw -YXkuY29tL2NybDg5LmNybDBgBggrBgEFBQcBAQRUMFIwKAYIKwYBBQUHMAKGHGh0dHA6Ly9jYS5h -bGlwYXkuY29tL2NhNi5jZXIwJgYIKwYBBQUHMAGGGmh0dHA6Ly9jYS5hbGlwYXkuY29tOjgzNDAv -MA0GCSqGSIb3DQEBCwUAA4IBAQA9DYzEMnOGG9uddKhyS7XyJiFRoP7GXIvwj4IjLn/hQ/UbD2DB -MJUTDSkFIcyEU9w2zCD7atgKZNYCscIACnFmz91op1Oo+ohMTswUNGHMZCGYqSy3msA1Okuxc8mE -yvHRwJdU7qnEsSOD7hrKw059AFcDW3okDSKYvr8tJNC3MNyGY4dd6YxouE3738HtlYf/iGkN0ntQ -NEayluq3tRI+XE6AYrU6FYvXwWAGur/UqQTyKYAT0j2UE5VBfwC7/qpFBK+13oe8JvqdgLJY6BtB -nAnLaP1Z5RY5JnmUgzXD/pCkIZu5U3WS9hFcAxCrSiZmU4+CVRTTfY7d/DU89epc ------END CERTIFICATE----- \ No newline at end of file diff --git a/config/pay/ali/appCertPublicKey_2021004148687460.crt b/config/pay/ali/appCertPublicKey_2021004148687460.crt new file mode 100644 index 000000000..9647b7271 --- /dev/null +++ b/config/pay/ali/appCertPublicKey_2021004148687460.crt @@ -0,0 +1,23 @@ +-----BEGIN CERTIFICATE----- +MIIEoDCCA4igAwIBAgIQICQGBNJZOOwkTe9gZxT5sDANBgkqhkiG9w0BAQsFADCBgjELMAkGA1UE +BhMCQ04xFjAUBgNVBAoMDUFudCBGaW5hbmNpYWwxIDAeBgNVBAsMF0NlcnRpZmljYXRpb24gQXV0 +aG9yaXR5MTkwNwYDVQQDDDBBbnQgRmluYW5jaWFsIENlcnRpZmljYXRpb24gQXV0aG9yaXR5IENs +YXNzIDEgUjEwHhcNMjQwNjA0MDI1NTUxWhcNMjkwNjAzMDI1NTUxWjBoMQswCQYDVQQGEwJDTjEt +MCsGA1UECgwk5rO45bee6YeM5rW35Yac5Lia56eR5oqA5pyJ6ZmQ5YWs5Y+4MQ8wDQYDVQQLDAZB +bGlwYXkxGTAXBgNVBAMMEDIwODg4NDExMTg1MTQ5NzkwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw +ggEKAoIBAQCcbQPAhlF54v5H/uopq7w5d/ANwxU4ylK2RZ11BrzkHzBiTI0MnqGld1hE9fjTmjN3 +ve5Xop5AYnp2kUg30KrxFnT3PrEkb7cUs3E3ZpU+jJClbOZbtetWqfVfNhzYaWEzk2l9OWgEJQpV +/vMXro7gPUGlSq1jGxdZfvqkw56pUS2YhTVgg2JHQIfEsMIRKFYt/qkJWYBCSs1ZLS1MMlrpACMR +NCtT1AyGSE7bZZhBEqGi+9SMHOaQ5kEXWY7SNjkdmq4F5bDgCmX269DYFAs7445fi3Q0DymZ7s/Q +22WQCwkgynjuCdlWNR9gOuD/4pernv+7NuDCZkfVjTn52VhfAgMBAAGjggEpMIIBJTAfBgNVHSME +GDAWgBRxB+IEYRbk5fJl6zEPyeD0PJrVkTAdBgNVHQ4EFgQUmpowO+lYng9+Y0qY4KMxBYbXW4Qw +QAYDVR0gBDkwNzA1BgdggRwBbgEBMCowKAYIKwYBBQUHAgEWHGh0dHA6Ly9jYS5hbGlwYXkuY29t +L2Nwcy5wZGYwDgYDVR0PAQH/BAQDAgbAMC8GA1UdHwQoMCYwJKAioCCGHmh0dHA6Ly9jYS5hbGlw +YXkuY29tL2NybDkwLmNybDBgBggrBgEFBQcBAQRUMFIwKAYIKwYBBQUHMAKGHGh0dHA6Ly9jYS5h +bGlwYXkuY29tL2NhNi5jZXIwJgYIKwYBBQUHMAGGGmh0dHA6Ly9jYS5hbGlwYXkuY29tOjgzNDAv +MA0GCSqGSIb3DQEBCwUAA4IBAQAX4sySbFWN38ylT9UjLxdP6GHm8MAdcybNUhxx5QtwrhvAT0Ll +7tG3qb4lb3JNBh/2C2XXGjfhGagHHQxcsc/hnBVj9kAFcnJQYlrfJ9ts1tavOsJesjyg837DUCLP +cXkScYlngNHhb8RGaCsqdWOnjWIk5lr/0Ttu2TqFRwtmJwHXd0cj9tWVuLJFg8bkoLXuhzddBNLB +TsACbbiSXE11qf5B0go9ixCwhxYjQFRkdLcPBqRomRtn3FNYhBxrwO/zumkuuVlc1jBgKYaNC8zW +jK41b49mMdrDdLOJDfmOKPdO0N/++BaTS8ZNOxgbOFS7PQlHJykcd6K3rtdrH16B +-----END CERTIFICATE----- \ No newline at end of file diff --git a/config/payment.php b/config/payment.php index 7c5ba66c7..1eabdd704 100644 --- a/config/payment.php +++ b/config/payment.php @@ -9,19 +9,19 @@ return [ 'alipay' => [ 'default' => [ // 必填-支付宝分配的 app_id - 'app_id' => '2021004146699603', + 'app_id' => '2021004148687460', // 必填-应用私钥 字符串或路径 - 'app_secret_cert' => 'MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQCktKWIoqSZ8BoSpALMsvTEsEQ1kF++wBeneams0Q17LvqGDBgiGuuICU0tnhBrjEkJFIw+5ApiHdkwbjFRqDqXyNj7B9fMBWp+QeHf6KvmRsPOHZegyvmQlqvMYf6hF4OwVKDrtVi6I1hVdrwf35h8KEGh4QM0WyXno2bJ7OVQDL49enrG7dXZQkwnwiluuxgjKphC2WYHCERGiYbrRKWXtQmzivjw7YTtfSXvypp8N3pSWXkWeLqpGGK3GG3pcUu4U+y4RFknnzSpiv20EJ6gw3pjUDkzexJoGh9byFOMoRVTJpIV8iTshdozd69ny5FjmIoXIouGCjdwp6M+XCXVAgMBAAECggEAJ1Dn4sHQQN7Lmn+EG5DsVLcu0QpxkHsSKmwkUJhme20vaCgi6qE6b/KodacxjDqkhIJfJ/QPdnRhj+n949wggHL1OJcasBzq2tCnNme4APQLcXwm4b8R663LvLH3skSGruTEtP9I+sXNJDl/lqwtHhYN9LJdrXXEipK6yqC97Gl7JznT/VXctOebXqFtdxm1M1zCoxwWwU20rYbNV74VIwIQhhNYaParU7ycVRgxw7wFhImGfy/y4SgHVTOS2Lhj12oDhHVSkhQjyEL4IKlI7Np/5jbZax+NWZjiTUJcDYEK6v6hpw0Skjf7fCBhbiHWTFm0LsBonLhX0b7hKaRYAQKBgQDu6fpxBmqpFy1Vzr/VWIWR9pXNtPqD3aVGWOUm3BuTyTtM8vEr6hcFIzjDae2JzSHTwAlNXQlifx43W630Iq2/AfYLsK1jtfqPRnuB1B4Bd+dixslG5a+mvpYTX0h9nZittWUh07tB8peoRidhnre0kKBZgdsO0XaaEpGkxoaEgQKBgQCwfBEq87wF5a9elUgJuDoqpglFWj8S52YqtolLdtpPpR7CtOLgAQb/ZAZ2Q0knAXcHgNoabqTJ1/psVc33+Lg3bQZyXiy9KUT72SoNhXa+kqWOAqjb4rEqL9x65l1A04Xxd4D0D3Drf0nv4TTaJfjjM/nRRWmqcOEKcvzgakKnVQKBgQCvI9EXCBgqqrXuQGj6kjEgpn581R4MivA82K/rw9Fnjk4tg67ufWWwu3hCMKYUrc8NdqqbDwfxL7TL6iZkYQOzkVF4kmUZQm9Slt21d/UjKG30SDuHAJu6hd5ohyISC/S/6skfeiK9HoS0s/DsrDiJYrhZxUr72uux2Mjx3SMBgQKBgQCX88qoS8Eo5rDO5ANpcviJ/flfgCtscFYUEqQ1mHixOH86r5njup62x/2UV6yla+p7SGMBfSBfNZlFK7+ycLDT8Agr8o/csqrVmQ5PJAmwXf0zP3D6Gb3mj9zq6GuERFtAI1+hQ6Y67ZbQdfwWk7kujnLaz0QCXzwzzfuSkYsgHQKBgFadCh1lJYQcpCjEDD50QAdbfzhVJRSYVEQhj2ekQ+w7hEndXiwptucPt8vs39qRfyXwoez2dWbK9ZUmU3/DTZBtL/1OmpDV2yPYi+xpipgzETB44mQnpcAcvaxU59j0oZQxXsWXHKNfOBzO2KgrReHnY7oUurPPq1A76yEcGmtn', + 'app_secret_cert' => 'MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQCcbQPAhlF54v5H/uopq7w5d/ANwxU4ylK2RZ11BrzkHzBiTI0MnqGld1hE9fjTmjN3ve5Xop5AYnp2kUg30KrxFnT3PrEkb7cUs3E3ZpU+jJClbOZbtetWqfVfNhzYaWEzk2l9OWgEJQpV/vMXro7gPUGlSq1jGxdZfvqkw56pUS2YhTVgg2JHQIfEsMIRKFYt/qkJWYBCSs1ZLS1MMlrpACMRNCtT1AyGSE7bZZhBEqGi+9SMHOaQ5kEXWY7SNjkdmq4F5bDgCmX269DYFAs7445fi3Q0DymZ7s/Q22WQCwkgynjuCdlWNR9gOuD/4pernv+7NuDCZkfVjTn52VhfAgMBAAECggEAJKb2hhny5VhmtH/qZjEzPVP5D4BybIgbsVHGfzFA+ULFl4LQWfChd5/rMt1fnFU5UglS233jDrsEbtvDzDA8nZjhdz1dTGhQwaz6Dj0fIzTUf65wm3SY3Ame0NxhDeRDPk6AHTNiR/ZV4aiHVTk1iR1RUGWbEum6IuI54Hllp85ba5rdgp9cQpER9gsKCZ47Pq1T3NsSS3wUkcCEK9sxNiuQ0YpeO82w4qP5L4TXDbIJPlAkbWdzV+AkOfLmj4g5sLiLYUJ1gn4gV9pYymrbQyO8C1uyMUy3tlOmq/5SUaO+/jbDmplBY8xBDIYmHRZ870zz6uUpWRdkQzgO+XHtoQKBgQDbzgF/5MRrovQqSeclQNx0pTjKkLug2Q+ddkN3D1SO0J6thBT0Ga2MvvSZ3y7gIgNnJVCl6uvQergeaRHThcJ0wL6wqV1jlVqA7R5w2v70JnM0mEUDudpSd3cXtoJmAiprEtscSWNv3eRWssnM38+8zQu8IsaL5XCmm6Cb7no1HQKBgQC2LzxntHrDqb6E+KuaeACUkNUH2HWcFZHgGgrjcX2e/n6M30pMITY5nxopW3ixi0T+VgkHD2wn5wsO1z0e0T2IVNHrMX2WGEev263BiNulsAd4Zsmlzti7nC03aJ4+kj5/ewAz4GJ2DkKzDxScToraPU1CQ6pXsWcJaO5hmob2qwKBgHzkgumenRTj1ISq1VHPlvQYZTqEHnh4nWzFI/Rkm5FCbMb/A8DnTjtozScZL1NfQDu9ciO0ZiVhdXiiDuT3XdRlKHTM5ymMVY5oLSHG7ZLgvhkmZCCH28t74glxRIqdtGh+oE1kTcHkfLfegteMXEdU4tQVlmcrCWVBjHLNgFbpAoGBAKla+7IDqeNdVcfSSeNMDm4MvJuQcrPnsTU7wEdx5q74MLfPkgd3ECs8ZVtwtp+EsVwkqjuv8ICfXD4tg5m0NJkZEBKsbOwsIeeuNLWl/Vjma+tW0biasgqkwbuyOvg7hnGG68dNnPnVg9dj+2rZ8GWzerBQqnbeaMPskTyWI0QFAoGBANcpk2bK2yBzsa+RJ5rOjSzv/gJnYuHdx91RJ1yY9q4kL8sfwtBZr85iRWoxTwmv5TG/WpqsV2wfe5o1vPYVqzumarsQIP2YQxV2cKhkS8FEdJC1HAcAD1iuNqNqeV8lbdPfXb6y3aTxrNYui1IjZ1TsDh5ftD5K541WVZOo1JaF', // 必填-应用公钥证书 路径 - 'app_public_cert_path' => config_path('pay') . '/ali/appCertPublicKey_2021004146699603.crt', + 'app_public_cert_path' => config_path('pay') . '/ali/appCertPublicKey_2021004148687460.crt', // 必填-支付宝公钥证书 路径 'alipay_public_cert_path' => config_path('pay') . '/ali/alipayCertPublicKey_RSA2.crt', // 必填-支付宝根证书 路径 'alipay_root_cert_path' => config_path('pay') . '/ali/alipayRootCert.crt', // 选填-同步回调地址 - 'return_url' => 'https://erp.lihaink.cn/api/pay/alipay_return', + 'return_url' => getenv('APP_URL') .'/api/pay/alipay_return', // 选填-异步回调地址 - 'notify_url' => 'https://erp.lihaink.cn/api/pay/alipay_notify', + 'notify_url' => getenv('APP_URL') .'/api/pay/alipay_notify', // 选填-服务商模式下的服务商 id，当 mode 为 Pay::MODE_SERVICE 时使用该参数 'service_provider_id' => '', // 选填-默认为正常模式。可选为： MODE_NORMAL, MODE_SANDBOX, MODE_SERVICE @@ -41,7 +41,7 @@ return [ // 必填-商户公钥证书路径 'mch_public_cert_path' => config_path('pay') . '/wechat/82fdc3426e3aeb9e5df91a9547ac5ef3.pem', // 必填 - 'notify_url' => 'https://erp.lihaink.cn/api/pay/notifyMnp', + 'notify_url' => getenv('APP_URL') .'/api/pay/notifyMnp', // 选填-公众号 的 app_id 'mp_app_id' => 'wxe2428e8fe6767e45', // 选填-小程序 的 app_id