This commit is contained in:
2023-12-12 15:35:37 +08:00
parent 6438d8affb
commit d16adba08e
32 changed files with 285 additions and 311 deletions
+13 -13
View File
@@ -8,44 +8,44 @@ class NotifyModel
{
//公众号支付
const PAY_TYPE_JSAPI = 'JSAPI';
const string PAY_TYPE_JSAPI = 'JSAPI';
//扫码支付
const PAY_TYPE_NATIVE = 'NATIVE';
const string PAY_TYPE_NATIVE = 'NATIVE';
//App支付
const PAY_TYPE_App = 'App';
const string PAY_TYPE_App = 'App';
//付款码支付
const PAY_TYPE_MICROPAY = 'MICROPAY';
const string PAY_TYPE_MICROPAY = 'MICROPAY';
//H5支付
const PAY_TYPE_MWEB = 'MWEB';
const string PAY_TYPE_MWEB = 'MWEB';
//刷脸支付
const PAY_TYPE_FACEPAY = 'FACEPAY';
const string PAY_TYPE_FACEPAY = 'FACEPAY';
// 支付成功
const PAY_RESULT_SUCCESS = 'SUCCESS';
const string PAY_RESULT_SUCCESS = 'SUCCESS';
// 转入退款
const PAY_RESULT_REFUND = 'REFUND';
const string PAY_RESULT_REFUND = 'REFUND';
// 未支付
const PAY_RESULT_NOTPAY = 'NOTPAY';
const string PAY_RESULT_NOTPAY = 'NOTPAY';
// 已关闭
const PAY_RESULT_CLOSED = 'CLOSED';
const string PAY_RESULT_CLOSED = 'CLOSED';
// 已撤销(付款码支付)
const PAY_RESULT_REVOKED = 'REVOKED';
const string PAY_RESULT_REVOKED = 'REVOKED';
// 用户支付中(付款码支付)
const PAY_RESULT_USERPAYING = 'USERPAYING';
const string PAY_RESULT_USERPAYING = 'USERPAYING';
// 支付失败(其他原因,如银行返回失败)
const PAY_RESULT_PAYERROR = 'PAYERROR';
const string PAY_RESULT_PAYERROR = 'PAYERROR';
public string $appid;
+1 -4
View File
@@ -2,10 +2,7 @@
namespace wchat\wx\V3;
use Exception;
use JetBrains\PhpStorm\ArrayShape;
use Kiri\Client;
use Kiri\CurlClient;
use wchat\wx\SmallProgram;
class TransferBatches extends SmallProgram
@@ -16,7 +13,7 @@ class TransferBatches extends SmallProgram
/**
* @param TransferDetail $detail
* @return array
* @throws Exception
* @throws
*/
#[ArrayShape([])]
public function transfer(TransferDetail $detail): array
+5 -5
View File
@@ -16,11 +16,11 @@ class TransferDetail
* @param string $user_name
*/
public function __construct(
readonly public string $out_detail_no,
readonly public int|float $transfer_amount,
readonly public string $transfer_remark,
readonly public string $openid,
readonly public string $user_name = ''
public string $out_detail_no,
public int|float $transfer_amount,
public string $transfer_remark,
public string $openid,
public string $user_name = ''
)
{
}
+1 -2
View File
@@ -3,7 +3,6 @@
namespace wchat\wx\V3;
use Exception;
use Kiri\Client;
use wchat\wx\SmallProgram;
class WxV3AppPayment extends SmallProgram
@@ -19,7 +18,7 @@ class WxV3AppPayment extends SmallProgram
* @param string|null $openId
* @param string $payer_client_ip
* @return array
* @throws Exception
* @throws
*/
public function payment(string $orderNo, int $total, string $openId = NULL, string $payer_client_ip = '127.0.0.1'): array
{
+1 -2
View File
@@ -3,7 +3,6 @@
namespace wchat\wx\V3;
use Exception;
use Kiri\Client;
use JetBrains\PhpStorm\ArrayShape;
use wchat\wx\SmallProgram;
@@ -20,7 +19,7 @@ class WxV3NativePayment extends SmallProgram
* @param string|null $openId
* @param string $payer_client_ip
* @return array
* @throws Exception
* @throws
*/
#[ArrayShape(['code_url' => "string"])]
public function payment(string $orderNo, int $total, string $openId = NULL, string $payer_client_ip = '127.0.0.1'): array
+1 -2
View File
@@ -3,7 +3,6 @@
namespace wchat\wx\V3;
use Exception;
use Kiri\Client;
use wchat\wx\SmallProgram;
class WxV3Payment extends SmallProgram
@@ -19,7 +18,7 @@ class WxV3Payment extends SmallProgram
* @param string|null $openId
* @param string $payer_client_ip
* @return array
* @throws Exception
* @throws
*/
public function payment(string $orderNo, int $total, string $openId = NULL, string $payer_client_ip = '127.0.0.1'): array
{
+1 -2
View File
@@ -5,7 +5,6 @@ namespace wchat\wx\V3;
use Exception;
use OpenSSLAsymmetricKey;
use Psr\Http\Message\RequestInterface;
use wchat\common\PayConfig;
use wchat\wx\SmallProgram;
use wchat\wx\V3\Notify\GoodsDetail;
use wchat\wx\V3\Notify\NotifyModel;
@@ -50,7 +49,7 @@ class WxV3PaymentNotify extends SmallProgram
/**
* @param RequestInterface $request
* @return bool
* @throws Exception
* @throws
*/
public function verify(RequestInterface $request): bool
{
+4 -5
View File
@@ -4,7 +4,6 @@ namespace wchat\wx\V3;
use Exception;
use Kiri\Client;
use wchat\common\AppConfig;
use wchat\common\Help;
@@ -69,7 +68,7 @@ trait WxV3PaymentTait
/**
* @param string $orderNo
* @return array
* @throws Exception
* @throws
*/
public function searchByOutTradeNo(string $orderNo): array
{
@@ -80,7 +79,7 @@ trait WxV3PaymentTait
/**
* @param string $orderNo
* @return array
* @throws Exception
* @throws
*/
public function searchByTransactionId(string $orderNo): array
{
@@ -91,7 +90,7 @@ trait WxV3PaymentTait
/**
* @param string $parseUrl
* @return array
* @throws Exception
* @throws
*/
private function search(string $parseUrl): array
{
@@ -112,7 +111,7 @@ trait WxV3PaymentTait
* @param string $canonical_url
* @param string $body
* @return string
* @throws Exception
* @throws
*/
public function signature(string $http_method, string $canonical_url, string $body = ''): string
{
+1 -1
View File
@@ -20,7 +20,7 @@ class WxV3Withdrawal extends SmallProgram
* @param string $batch_remark
* @param TransferDetail[] $details
* @return array
* @throws Exception
* @throws
*/
public function payment(string $orderNo, string $batch_name, string $batch_remark, array $details): array
{