notify

Author: mitoop

README.md

@@ -15,10 +15,10 @@
         'yzh_public_key' => env('YZH_YZH_PUBLIC_KEY', storage_path('certs/yzh_public.pem')),
         'sign_type' => 'rsa',
         'timeout' => 30,
+        
         // 支付全局配置 调用 pay 方法指定的配置优先级高于全局配置
-        'pay_remark' => 'remark', // 订单备注 [选填]
-        'notify_url' => 'notify url', // 回调地址 长度不超过 200 个字符
+        'pay_remark' => 'remark', // 订单备注 [选填] 银行卡支付时最大36个字符 支付宝支付时候最大40个字符 都不能包含特殊字符
+        'notify_url' => 'notify url', // 回调地址 [选填] 长度不超过 200 个字符
         'project_id' => 'project id', // 项目ID [选填] 该字段由云账户分配，当接口指定项目时，会将订单关联指定项目
-    ];
     // ...
 ```

src/Response.php

@@ -7,14 +7,15 @@
 use Yzh\Model\Apiusersign\ApiUserSignReleaseResponseData;
 use Yzh\Model\Apiusersign\ApiUserSignResponseData;
 use Yzh\Model\BaseResponse;
+use Yzh\Model\Notify\NotifyResponse;
 use Yzh\Model\Payment\CreateAlipayOrderResponseData;
 use Yzh\Model\Payment\CreateBankpayOrderResponseData;
 
 class Response
 {
     public function __construct(
         protected bool $status,
-        protected ?BaseResponse $response = null,
+        protected BaseResponse|NotifyResponse|null $response = null,
         protected string $error = ''
     ) {
     }
@@ -27,6 +28,10 @@ public function ok(): bool
     public function data(): Collection
     {
         if ($response = $this->response) {
+            if ($response instanceof NotifyResponse) {
+                return collect(json_decode($response->getData(), true));
+            }
+
             $data = $response->getData();
 
             if ($data instanceof ApiUserSignContractResponseData) {

src/ResponseAdapter.php

@@ -0,0 +1,49 @@
+<?php
+
+namespace Mitoop\Yzh;
+
+use Yzh\Model\BaseResponse;
+use Yzh\Model\Notify\NotifyResponse;
+
+class ResponseAdapter
+{
+    public function __construct(protected BaseResponse|NotifyResponse $response)
+    {
+    }
+
+    public function isSuccess(): bool
+    {
+        if ($this->response instanceof BaseResponse) {
+            return $this->response->isSuccess();
+        }
+
+        if ($this->response instanceof NotifyResponse) {
+            return $this->response->getSignRes() && $this->response->getDescryptRes();
+        }
+    }
+
+    public function getError(): string
+    {
+        if ($this->response instanceof BaseResponse) {
+            return sprintf('%s:%s %s',
+                $this->response->getCode(),
+                $this->response->getMessage(),
+                $this->response->getRequestID()
+            );
+        }
+
+        if ($this->response instanceof NotifyResponse) {
+            return sprintf('验签失败 sign_res:%s descrypt_res%s',
+                (int) $this->response->getSignRes(),
+                (int) $this->response->getDescryptRes()
+            );
+        }
+
+        return '';
+    }
+
+    public function getResponse(): BaseResponse|NotifyResponse
+    {
+        return $this->response;
+    }
+}

src/Service.php

@@ -6,15 +6,12 @@
 use Yzh\ApiUserSignServiceClient;
 use Yzh\Config;
 use Yzh\Model\Apiusersign\ApiUserSignContractRequest;
-use Yzh\Model\Apiusersign\ApiUserSignContractResponse;
 use Yzh\Model\Apiusersign\ApiUserSignReleaseRequest;
-use Yzh\Model\Apiusersign\ApiUserSignReleaseResponse;
 use Yzh\Model\Apiusersign\ApiUserSignRequest;
-use Yzh\Model\Apiusersign\ApiUserSignResponse;
+use Yzh\Model\Notify\NotifyRequest;
 use Yzh\Model\Payment\CreateAlipayOrderRequest;
-use Yzh\Model\Payment\CreateAlipayOrderResponse;
 use Yzh\Model\Payment\CreateBankpayOrderRequest;
-use Yzh\Model\Payment\CreateBankpayOrderResponse;
+use Yzh\NotifyClient;
 use Yzh\PaymentClient;
 
 class Service
@@ -25,6 +22,8 @@ class Service
 
     protected static string $projectId = '';
 
+    protected static bool $validateNotifyIP = false;
+
     protected Config $config;
 
     public function __construct(array $config)
@@ -35,7 +34,7 @@ public function __construct(array $config)
         $this->config = Config::newFromArray($config);
     }
 
-    public function getContract(): ApiUserSignContractResponse
+    public function getContract(): ResponseAdapter
     {
         $client = new ApiUserSignServiceClient($this->config);
 
@@ -46,10 +45,10 @@ public function getContract(): ApiUserSignContractResponse
 
         $request->setRequestID((string) Str::orderedUuid());
 
-        return $client->apiUserSignContract($request);
+        return new ResponseAdapter($client->apiUserSignContract($request));
     }
 
-    public function sign(string $name, string $idCard): ApiUserSignResponse
+    public function sign(string $name, string $idCard): ResponseAdapter
     {
         $client = new ApiUserSignServiceClient($this->config);
 
@@ -63,10 +62,10 @@ public function sign(string $name, string $idCard): ApiUserSignResponse
 
         $request->setRequestID((string) Str::orderedUuid());
 
-        return $client->apiUserSign($request);
+        return new ResponseAdapter($client->apiUserSign($request));
     }
 
-    public function unsign(string $name, string $idCard): ApiUserSignReleaseResponse
+    public function unsign(string $name, string $idCard): ResponseAdapter
     {
         $client = new ApiUserSignServiceClient($this->config);
 
@@ -80,10 +79,16 @@ public function unsign(string $name, string $idCard): ApiUserSignReleaseResponse
 
         $request->setRequestID((string) Str::orderedUuid());
 
-        return $client->apiUserSignRelease($request);
+        return new ResponseAdapter($client->apiUserSignRelease($request));
     }
 
-    protected function payWithBankCard(BankCard $bankCard, string $amount, string $orderId, string $payRemark, string $notifyUrl, string $projectId): CreateBankpayOrderResponse
+    protected function payWithBankCard(
+        BankCard $bankCard,
+        string $amount,
+        string $orderId,
+        string $payRemark,
+        string $notifyUrl,
+        string $projectId): ResponseAdapter
     {
         $client = new PaymentClient($this->config);
 
@@ -103,10 +108,16 @@ protected function payWithBankCard(BankCard $bankCard, string $amount, string $o
 
         $request->setRequestID((string) Str::orderedUuid());
 
-        return $client->createBankpayOrder($request);
+        return new ResponseAdapter($client->createBankpayOrder($request));
     }
 
-    protected function payWithAlipay(BankCard $bankCard, string $amount, string $orderId, string $payRemark, string $notifyUrl, string $projectId): CreateAlipayOrderResponse
+    protected function payWithAlipay(
+        BankCard $bankCard,
+        string $amount,
+        string $orderId,
+        string $payRemark,
+        string $notifyUrl,
+        string $projectId): ResponseAdapter
     {
         $client = new PaymentClient($this->config);
 
@@ -127,7 +138,7 @@ protected function payWithAlipay(BankCard $bankCard, string $amount, string $ord
 
         $request->setRequestID((string) Str::orderedUuid());
 
-        return $client->createAlipayOrder($request);
+        return new ResponseAdapter($client->createAlipayOrder($request));
     }
 
     /**
@@ -144,7 +155,7 @@ public function pay(
         string $payRemark = '',
         string $notifyUrl = '',
         string $projectId = ''
-    ): CreateBankpayOrderResponse|CreateAlipayOrderResponse {
+    ): ResponseAdapter {
         $payRemark = ($payRemark !== '') ? $payRemark : static::$payRemark;
         $notifyUrl = ($notifyUrl !== '') ? $notifyUrl : static::$notifyUrl;
         $projectId = ($projectId !== '') ? $projectId : static::$projectId;
@@ -158,6 +169,15 @@ public function pay(
         }
     }
 
+    public function processCallback(): ResponseAdapter
+    {
+        $client = new NotifyClient($this->config);
+
+        $request = new NotifyRequest(request('data'), request('mess'), request('timestamp'), request('sign'));
+
+        return new ResponseAdapter($client->verifyAndDecrypt($request));
+    }
+
     public static function payRemarkUsing(string $payRemark): void
     {
         static::$payRemark = $payRemark;

src/Yzh.php

@@ -3,13 +3,13 @@
 namespace Mitoop\Yzh;
 
 use Throwable;
-use Yzh\Model\BaseResponse;
 
 /**
  * @method static Response getContract()
  * @method static Response sign(string $name, string $idCard)
  * @method static Response unsign(string $name, string $idCard)
  * @method static Response pay(BankCard $bankCard, string $amount, string $orderId, string $payRemark = '',string $notifyUrl = '',string $projectId = '')
+ * @method static Response processCallback()
  *
  * @see Service
  */
@@ -18,16 +18,16 @@ class Yzh
     public static function __callStatic(string $method, array $args)
     {
         try {
-            /** @var BaseResponse $response */
+            /** @var ResponseAdapter $response */
             $response = app(Service::class)->$method(...$args);
 
             if ($response->isSuccess()) {
-                return new Response(true, response: $response);
+                return new Response(true, response: $response->getResponse());
             }
 
             return new Response(
                 false,
-                error: sprintf('%s:%s %s', $response->getCode(), $response->getMessage(), $response->getRequestID()));
+                error: $response->getError());
         } catch (Throwable $e) {
             return new Response(
                 false,