get data from request

Author: recca0120

src/Message/AcceptNotificationRequest.php

@@ -14,66 +14,17 @@ class AcceptNotificationRequest extends AbstractRequest implements NotificationI
     use HasFlashPay;
     use HasDecode;
 
-    /**
-     * @param  string  $value
-     * @return AcceptNotificationRequest
-     */
-    public function setVer($value)
-    {
-        return $this->setParameter('ver', $value);
-    }
-
-    /**
-     * @return string
-     */
-    public function getVer()
-    {
-        return $this->getParameter('ver');
-    }
-
-    /**
-     * @param  string  $value
-     * @return AcceptNotificationRequest
-     */
-    public function setDat($value)
-    {
-        return $this->setParameter('dat', $value);
-    }
-
-    /**
-     * @return string
-     */
-    public function getDat()
-    {
-        return $this->getParameter('dat');
-    }
-
-    /**
-     * @param  string  $value
-     * @return AcceptNotificationRequest
-     */
-    public function setChk($value)
-    {
-        return $this->setParameter('chk', $value);
-    }
-
-    /**
-     * @return string
-     */
-    public function getChk()
-    {
-        return $this->getParameter('chk');
-    }
-
     /**
      * @return array
-     *
      * @throws Exception
      */
     public function getData()
     {
-        $input = http_build_query(['ver' => $this->getVer(), 'dat' => $this->getDat(), 'chk' => $this->getChk()]);
-        $feedbackService = new FeedbackService($this->getHashKey(), $this->getHashIv(), $input);
+        $feedbackService = new FeedbackService(
+            $this->getHashKey(),
+            $this->getHashIv(),
+            http_build_query($this->httpRequest->request->all())
+        );
 
         return $this->decode($feedbackService->getRetrunJson());
     }
@@ -90,9 +41,9 @@ public function sendData($data)
     /**
      * @return string
      */
-    public function getTransactionStatus()
+    public function getTransactionId()
     {
-        return $this->getNotificationResponse()->getTransactionStatus();
+        return $this->getNotificationResponse()->getTransactionId();
     }
 
     /**
@@ -103,6 +54,14 @@ public function getTransactionReference()
         return $this->getNotificationResponse()->getTransactionReference();
     }
 
+    /**
+     * @return string
+     */
+    public function getTransactionStatus()
+    {
+        return $this->getNotificationResponse()->getTransactionStatus();
+    }
+
     /**
      * @return string
      */

tests/GatewayTest.php

@@ -93,17 +93,15 @@ public function testAcceptNotification()
             'pay_type' => '0',
         ]);
 
-        $request = $this->gateway->acceptNotification($options);
+        $this->getHttpRequest()->request->add($options);
+        $request = $this->gateway->acceptNotification();
         self::assertEquals('交易成功(Approved or completed successfully', $request->getMessage());
         self::assertEquals(NotificationInterface::STATUS_COMPLETED, $request->getTransactionStatus());
         self::assertEquals('FP2302020600004133', $request->getTransactionReference());
 
-        $response = $request->send();
-
-        self::assertTrue($response->isSuccessful());
-        self::assertEquals('11245678', $response->getTransactionId());
-        self::assertEquals('02', $response->getCode());
-        self::assertEquals('1|OK', $response->getReply());
+        self::assertEquals('11245678', $request->getTransactionId());
+        self::assertEquals('FP2302020600004133', $request->getTransactionReference());
+        self::assertEquals('1|OK', $request->getReply());
     }
 
     public function testFetchTransaction()