修改支付方式

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

@@ -43,12 +43,16 @@ class KlarnaController extends Controller
             @header("HTTP/1.0 400 Bad Request");
             exit;
         }
-        $order = $this->orderRepository->findOneByField('increment_id', $orderId);
+        $order = $this->orderRepository->find($orderId);
         if (empty($order)) {
             @header("HTTP/1.0 400 Bad Request");
             exit;
         }
         $event = json_decode($rawBody);
+        if ($event->merchant_reference2 != $orderId) {
+            @header("HTTP/1.0 400 Bad Request");
+            exit;
+        }
         try {
             $this->klarna->paymentSucceeded($order, $event->authorization_token);
             @header("HTTP/1.0 200 ok");

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

@@ -97,6 +97,7 @@ class Klarna extends Payment
         $data = [
             'order_amount' => $grandTotal,
             'merchant_reference1' => $override['merchantOrderId'],
+            'merchant_reference2' => $order->id,
             'merchant_urls' => [
                 'confirmation_url' => $input->paymentSuccessUrl . '?orderId=' . $order->id,
                 'push_url' => $input->paymentSuccessUrl . '?orderId=' . $order->id,