蜂鸟跑腿--使用动态的商户ID

common/components/delivery/services/DispatchService.php

@@ -33,7 +33,7 @@ class DispatchService
                         break;
                     case 'fengniao':
                         $adapter = new FengniaoAdapter($pt['accessToken']);
-                        $adapter->setMerchantId(14594092); // TODO: 确认是否需要使用动态的商户ID
+                        $adapter->setMerchantId($pt['merchantId']); // TODO: 确认是否需要使用动态的商户ID
                         $this->adapters['fengniao'] = $adapter;
                         break;
                     case 'shunfeng':
@@ -60,7 +60,7 @@ class DispatchService
                 case 'fengniao':
                     //$this->adapters['fengniao'] = new FengniaoAdapter($authPlatform['accessToken']);
                     $adapter = new FengniaoAdapter($authPlatform['accessToken']);
-                    $adapter->setMerchantId(14594092); // TODO: 确认是否需要使用动态的商户ID
+                    $adapter->setMerchantId($authPlatform['merchantId']); // TODO: 确认是否需要使用动态的商户ID
                     $this->adapters['fengniao'] = $adapter;
                     break;
                 case 'shunfeng':

common/components/delivery/services/ShopService.php

@@ -32,7 +32,7 @@ class ShopService
                         break;
                     case 'fengniao':
                         $adapter = new FengniaoShop($pt['accessToken']);
-                        $adapter->setMerchantId(14594092); // TODO: 确认是否需要使用动态的商户ID
+                        $adapter->setMerchantId($authPlatforms['merchantId']); // TODO: 确认是否需要使用动态的商户ID
                         $this->adapters['fengniao'] = $adapter;
                         break;
                     case 'shunfeng':
@@ -52,7 +52,7 @@ class ShopService
                 case 'fengniao':
                     //$this->adapters['fengniao'] = new FengniaoAdapter($authPlatform['accessToken']);
                     $adapter = new FengniaoShop($authPlatform['accessToken']);
-                    $adapter->setMerchantId(14594092); // TODO: 确认是否需要使用动态的商户ID
+                    $adapter->setMerchantId($authPlatform['merchantId']); // TODO: 确认是否需要使用动态的商户ID
                     $this->adapters['fengniao'] = $adapter;
                     break;
                 case 'shunfeng':