修改支付方式

packages/Longyi/Pay/Airwallex/src/Payment/Airwallex.php

@@ -169,7 +169,7 @@ class Airwallex extends Payment
     //成功修改状态
     public function paymentSucceeded($orderId, $transactionId)
     {
-        $order = $this->orderRepository->find($orderId);
+        $order = $this->orderRepository->findByField('increment_id', $orderId);
 
         if (!$order->id) {
             return false;

packages/Longyi/Pay/Applepay/src/Payment/Applepay.php

@@ -66,7 +66,7 @@ class Applepay extends Payment
     }
     public function createGatewayOrder()
     {
-        return $this->createOrder($this->getOrder(), ['merchantOrderId' => $this->getOrder()->id]);
+        return $this->createOrder($this->getOrder(), ['merchantOrderId' => $this->getOrder()->increment_id]);
     }
     public function createOrder($order, $override)
     {
@@ -194,7 +194,7 @@ class Applepay extends Payment
     //成功修改状态
     public function paymentSucceeded($orderId, $transactionId)
     {
-        $order = $this->orderRepository->find($orderId);
+        $order = $this->orderRepository->findByField('increment_id', $orderId);
 
         if (!$order->id) {
             return false;

packages/Longyi/Pay/AwxAfterpay/src/Payment/AwxAfterpay.php

@@ -74,7 +74,7 @@ class AwxAfterpay extends Payment
     }
     public function createGatewayOrder()
     {
-        return $this->createPayment($this->getOrder(), ['merchantOrderId' => $this->getOrder()->id], $this->currentInput);
+        return $this->createPayment($this->getOrder(), ['merchantOrderId' => $this->getOrder()->increment_id], $this->currentInput);
     }
     public function createPayment($order, $override, $input)
     {

packages/Longyi/Pay/AwxKlarna/src/Payment/AwxKlarna.php

@@ -75,7 +75,7 @@ class AwxKlarna extends Payment
     }
     public function createGatewayOrder()
     {
-        return $this->createPayment($this->getOrder(), ['merchantOrderId' => $this->getOrder()->id], $this->getInput());
+        return $this->createPayment($this->getOrder(), ['merchantOrderId' => $this->getOrder()->increment_id], $this->getInput());
     }
     public function createPayment($order, $override, $input)
     {

packages/Longyi/Pay/Klarna/src/Http/Controllers/KlarnaController.php

@@ -2,6 +2,7 @@
 
 namespace Longyi\Pay\Klarna\Http\Controllers;
 
+use Illuminate\Support\Facades\Log;
 use Longyi\Pay\Klarna\Payment\Klarna;
 use Webkul\Checkout\Facades\Cart;
 use Webkul\Sales\Models\Order;
@@ -24,7 +25,43 @@ class KlarnaController extends Controller
 
     public function hook()
     {
-        echo '123';exit;
+        $rawBody = request()->getContent();
+        $orderId = request()->get('order_id', 0);
+        $secretToken = request()->get('secretToken', '');
+        Log::channel('payment')->info('klarna hook request received', [
+            'query'     => request()->query(),
+            'order_id'  => $orderId,
+            'secretToken'  => $secretToken,
+            'raw_body'  => $rawBody,
+        ]);
+        // 验证签名
+        if (!$this->klarna->verifySignature($orderId, $secretToken)) {
+            @header("HTTP/1.0 400 Bad Request");
+            exit;
+        }
+        if (empty($orderId)) {
+            @header("HTTP/1.0 400 Bad Request");
+            exit;
+        }
+        $order = $this->orderRepository->find($orderId);
+        if (empty($order)) {
+            @header("HTTP/1.0 400 Bad Request");
+            exit;
+        }
+        $event = json_decode($rawBody);
+        try {
+            $this->klarna->paymentSucceeded($order, $event->authorization_token);
+            @header("HTTP/1.0 200 ok");
+        } catch (\Exception $e) {
+            //记录日志
+            Log::channel('payment')->error('klarna hook error', [
+                'order' => $order,
+                'event' => $event,
+                'error' => $e->getMessage()
+            ]);
+            @header("HTTP/1.0 400 Bad Request");
+            exit;
+        }
     }
 
 }

packages/Longyi/Pay/Klarna/src/Payment/Klarna.php

@@ -27,7 +27,7 @@ class Klarna extends Payment
     protected $createSessionUlr = 'https://api-na.playground.klarna.com/payments/v1/sessions';
     protected $createOrderUlr = 'https://api-na.playground.klarna.com/payments/v1/authorizations/{authorizationToken}/order';
     protected $getOrderUlr = 'https://api-na.playground.klarna.com/ordermanagement/v1/orders/{order_id}';
-
+    protected $authorizationUrl = null;
     public function __construct(
         protected InvoiceRepository $invoiceRepository,
         protected OrderRepository $orderRepository,
@@ -40,6 +40,7 @@ class Klarna extends Payment
         }
         $this->clientId = $this->getConfigData('client_id');
         $this->apikey = $this->getConfigData('secret_id');
+        $this->authorizationUrl = $this->getBaseUlr() . '/payment/klarna/hook';
     }
 
 
@@ -99,7 +100,7 @@ class Klarna extends Payment
             'merchant_urls' => [
                 'confirmation_url' => $input->paymentSuccessUrl . '?orderId=' . $order->id,
                 'push_url' => $input->paymentSuccessUrl . '?orderId=' . $order->id,
-                'authorization' => $input->paymentSuccessUrl . '?orderId=' . $order->id
+                'authorization' => $this->authorizationUrl . '?orderId=' . $order->id . '&secretToken=' . $this->generateSignature($order->id)
             ],
             'order_lines' => $products,
             'purchase_country' => $bill->country,
@@ -245,40 +246,54 @@ class Klarna extends Payment
         }
     }
 
-    public function fetchOrderStatus($gatewayOrderId = null)
+    //成功修改状态
+    public function paymentSucceeded($order, $transactionId)
     {
-        $order = $this->getOrder();
-        if ($order) {
-            $gatewayOrderId = $order->payment->additional['transaction_id'];
+        if (!$order->id) {
+            return false;
         }
-        if (empty($gatewayOrderId)) {
-            return new \Exception('OrderId is empty');
+        if ($order->status != Order::STATUS_PENDING) {
+            return false;
         }
-        $client = new Client();
-        $response = $client->request('GET', str_replace('{order_id}', $gatewayOrderId, $this->getOrderUlr), [
-            'headers' => [
-                'Accept' => 'application/json',
-                'Content-Type' => 'application/json',
-                'Authorization' => 'Basic ' . base64_encode("{$this->clientId}:{$this->apikey}")
-            ],
-            'timeout' => 30,
-            'verify'  => false,
-        ]);
-        $responseBody = $response->getBody()->getContents();
-        Log::channel('payment')->info("klarna fetchOrderStatus response", [
-            'gatewayOrderId' => $gatewayOrderId,
-            'status' => $response->getStatusCode(),
-            'body' => $responseBody
-        ]);
-        $resultObject = json_decode($responseBody);
-        $paymentStatus = [];
-        $paymentStatus['captures'] = null;
-        $paymentStatus['status'] = null;
-        if ($resultObject->fraud_status == 'ACCEPTED' && $resultObject->status == 'AUTHORIZED') {
-            $paymentStatus['captures'] = true;
-            $paymentStatus['status'] = 'COMPLETED';
+        try {
+            $this->createOrder($order, $transactionId);
+            $order->status = Order::STATUS_PROCESSING;
+            $order->save();
+            if ($order->payment) {
+                $additional = $order->payment->additional;
+                $additional['transaction_id'] = $transactionId;
+                $order->payment->additional = $additional;
+                $order->payment->save();
+            }
+            if ($order->canInvoice()) {
+                $this->invoiceRepository->create($this->prepareInvoiceData($order));
+            }
+        } catch (\Exception $e) {
+            Log::channel('payment')->error('klarna paymentSucceeded error', [
+                'order'  => $order->increment_id ?? null,
+                'message'    => $e->getMessage(),
+            ]);
+            //抛出异常
+            throw $e;
         }
-        return $paymentStatus;
+        return true;
+    }
+
+    /**
+     * Prepares order's invoice data for creation.
+     */
+    protected function prepareInvoiceData($order): array
+    {
+        $invoiceData = [
+            'order_id' => $order->id,
+            'invoice'  => ['items' => []],
+        ];
+
+        foreach ($order->items as $item) {
+            $invoiceData['invoice']['items'][$item->id] = $item->qty_to_invoice;
+        }
+
+        return $invoiceData;
     }
     /**
      * Get payment method image.
@@ -304,4 +319,23 @@ class Klarna extends Payment
         }
         return true;
     }
+
+    /**
+     * 生成签名
+     * @return string
+     */
+    public function generateSignature($orderId): string
+    {
+        return md5($orderId . 'veryGood');
+    }
+    //验签
+    public function verifySignature($orderId, $signature)
+    {
+        return $this->generateSignature($orderId) == $signature;
+    }
+
+    public function getBaseUlr()
+    {
+        return  config('app.url');
+    }
 }