Merge pull request #339 from overtrue/develop

Fix bug: Payment::downloadBill() response error.
w7corp · Mar 16, 2016 · 1a024ea · 1a024ea
2 parents 02a7031 + 90d85b3
commit 1a024ea
Show file tree

Hide file tree

Showing 2 changed files with 32 additions and 8 deletions.
diff --git a/src/Payment/API.php b/src/Payment/API.php
@@ -293,7 +293,7 @@ public function downloadBill($date, $type = self::BILL_TYPE_ALL)
             'bill_type' => $type,
         ];
 
-        return $this->request(self::API_DOWNLOAD_BILL, $params);
+        return $this->request(self::API_DOWNLOAD_BILL, $params, 'post', [], true)->getBody();
     }
 
     /**
@@ -371,14 +371,15 @@ public function getMerchant()
     /**
      * Make a API request.
      *
-     * @param string $api
-     * @param array  $params
-     * @param string $method
-     * @param array  $options
+     * @param string  $api
+     * @param array   $params
+     * @param string  $method
+     * @param array   $options
+     * @param boolean $options
      *
      * @return \EasyWeChat\Support\Collection
      */
-    protected function request($api, array $params, $method = 'post', array $options = [])
+    protected function request($api, array $params, $method = 'post', array $options = [], $returnResponse = false)
     {
         $params['appid'] = $this->merchant->app_id;
         $params['mch_id'] = $this->merchant->merchant_id;
@@ -390,7 +391,9 @@ protected function request($api, array $params, $method = 'post', array $options
             'body' => XML::build($params),
         ], $options);
 
-        return $this->parseResponse($this->getHttp()->request($api, $method, $options));
+        $response = $this->getHttp()->request($api, $method, $options);
+
+        return $returnResponse ? $response : $this->parseResponse($response);
     }
 
     /**

diff --git a/tests/Payment/PaymentAPITest.php b/tests/Payment/PaymentAPITest.php
@@ -14,6 +14,7 @@
 use EasyWeChat\Payment\Merchant;
 use EasyWeChat\Payment\Order;
 use EasyWeChat\Support\XML;
+use Psr\Http\Message\ResponseInterface;
 
 class PaymentAPITest extends PHPUnit_Framework_TestCase
 {
@@ -184,7 +185,27 @@ public function testQueryRefund()
      */
     public function testDownloadBill()
     {
-        $api = $this->getAPI();
+        $http = Mockery::mock(Http::class);
+
+        $http->shouldReceive('request')->andReturnUsing(function ($api, $method, $options) {
+            $params = XML::parse($options['body']);
+            $response = Mockery::mock(ResponseInterface::class);
+            $response->shouldReceive('getBody')->andReturn(compact('api', 'params'));
+
+            return $response;
+        });
+
+        $merchant = new Merchant([
+                'fee_type' => 'CNY',
+                'merchant_id' => 'testMerchantId',
+                'app_id' => 'wxTestAppId',
+                'device_info' => 'testDeviceInfo',
+                'key' => 'testKey',
+                'notify_url' => 'merchant_default_notify_url',
+            ]);
+
+        $api = Mockery::mock('EasyWeChat\Payment\API[getHttp]', [$merchant]);
+        $api->shouldReceive('getHttp')->andReturn($http);
 
         $response = $api->downloadBill('20150901');
         $this->assertEquals(API::API_DOWNLOAD_BILL, $response['api']);