fix: 微信分账参数可能丢失的问题 (#1108)

Author: yansongda

CHANGELOG.md

@@ -1,3 +1,9 @@
+## v3.7.18
+
+### fixed
+
+- fix: 微信分账参数可能丢失的问题 (#1108)
+
 ## v3.7.17
 
 ### fixed

src/Plugin/Wechat/V3/Extend/ProfitSharing/CreatePlugin.php

@@ -83,7 +83,7 @@ protected function normal(Collection $payload, array $params, array $config): ar
             return $data;
         }
 
-        return array_merge($data, $this->encryptSensitiveData($params, $config, $payload));
+        return array_merge($data, $this->encryptSensitiveData($params, $payload));
     }
 
     /**
@@ -110,7 +110,7 @@ protected function service(Collection $payload, array $params, array $config): a
             return $data;
         }
 
-        return array_merge($data, $this->encryptSensitiveData($params, $config, $payload));
+        return array_merge($data, $this->encryptSensitiveData($params, $payload));
     }
 
     /**
@@ -120,14 +120,15 @@ protected function service(Collection $payload, array $params, array $config): a
      * @throws InvalidParamsException
      * @throws ServiceNotFoundException
      */
-    protected function encryptSensitiveData(array $params, array $config, Collection $payload): array
+    protected function encryptSensitiveData(array $params, Collection $payload): array
     {
+        $data['receivers'] = $payload->get('receivers', []);
         $data['_serial_no'] = get_wechat_serial_no($params);
 
         $config = get_provider_config('wechat', $params);
         $publicKey = get_wechat_public_key($config, $data['_serial_no']);
 
-        foreach ($payload->get('receivers', []) as $key => $list) {
+        foreach ($data['receivers'] as $key => $list) {
             $data['receivers'][$key]['name'] = encrypt_wechat_contents($list['name'], $publicKey);
         }
 

tests/Plugin/Wechat/V3/Extend/ProfitSharing/CreatePluginTest.php

@@ -39,8 +39,16 @@ public function testEmptyPayload()
     public function testNormalWithoutName()
     {
         $rocket = new Rocket();
-        $rocket->setPayload(new Collection( [
+        $rocket->setPayload(new Collection([
             "test" => "yansongda",
+            'receivers' => [
+                [
+                    'type' => 'PERSONAL_OPENID',
+                    'amount' => 100,
+                    'account' => 'openid1234567890',
+                    'description' => '分账测试',
+                ],
+            ],
         ]));
 
         $result = $this->plugin->assembly($rocket, function ($rocket) { return $rocket; });
@@ -51,6 +59,14 @@ public function testNormalWithoutName()
             '_service_url' => 'v3/profitsharing/orders',
             'test' => 'yansongda',
             'appid' => 'wx55955316af4ef13',
+            'receivers' => [
+                [
+                    'type' => 'PERSONAL_OPENID',
+                    'amount' => 100,
+                    'account' => 'openid1234567890',
+                    'description' => '分账测试',
+                ],
+            ],
         ], $result->getPayload()->all());
     }
 
@@ -60,6 +76,10 @@ public function testNormalWithName()
         $rocket->setPayload(new Collection([
             'receivers' => [
                 [
+                    'type' => 'PERSONAL_OPENID',
+                    'amount' => 100,
+                    'account' => 'openid1234567890',
+                    'description' => '分账测试',
                     'name' => 'yansongda',
                 ],
             ],
@@ -74,6 +94,10 @@ public function testNormalWithName()
         self::assertEquals('v3/profitsharing/orders', $payload['_url']);
         self::assertEquals('v3/profitsharing/orders', $payload['_service_url']);
         self::assertEquals('wx55955316af4ef13', $payload['appid']);
+        self::assertEquals('PERSONAL_OPENID', $payload['receivers'][0]['type']);
+        self::assertEquals(100, $payload['receivers'][0]['amount']);
+        self::assertEquals('openid1234567890', $payload['receivers'][0]['account']);
+        self::assertEquals('分账测试', $payload['receivers'][0]['description']);
         self::assertArrayHasKey('_serial_no', $payload);
         self::assertArrayHasKey('name', $payload['receivers'][0]);
         self::assertNotEquals('yansongda', $payload['receivers'][0]['name']);
@@ -124,6 +148,10 @@ public function testServiceWithName()
         $rocket->setParams(['_config' => 'service_provider'])->setPayload(new Collection([
             'receivers' => [
                 [
+                    'type' => 'PERSONAL_OPENID',
+                    'amount' => 100,
+                    'account' => 'openid1234567890',
+                    'description' => '分账测试',
                     'name' => 'yansongda',
                 ],
             ],
@@ -138,6 +166,10 @@ public function testServiceWithName()
         self::assertEquals('v3/profitsharing/orders', $payload['_url']);
         self::assertEquals('v3/profitsharing/orders', $payload['_service_url']);
         self::assertEquals('wx55955316af4ef13', $payload['appid']);
+        self::assertEquals('PERSONAL_OPENID', $payload['receivers'][0]['type']);
+        self::assertEquals(100, $payload['receivers'][0]['amount']);
+        self::assertEquals('openid1234567890', $payload['receivers'][0]['account']);
+        self::assertEquals('分账测试', $payload['receivers'][0]['description']);
         self::assertArrayHasKey('_serial_no', $payload);
         self::assertArrayHasKey('name', $payload['receivers'][0]);
         self::assertNotEquals('yansongda', $payload['receivers'][0]['name']);