Merge branch 'feature/new_wms' into 'master'

B端订单推送增加备注

See merge request composer/php-wms-client!13

config/express_choose.php

@@ -6,13 +6,15 @@ return [
     'other_express_weight' => 45,
     'logistics' => [
         'toB' => [
-            [
-                'code' => 'CN7000001003751',
-                'name' => '跨越',
-            ],
             [
                 'code' => 'CN7000001000869',
                 'name' => '安能快运',
+                'is_default' => false,
+            ],
+            [
+                'code' => 'CN7000001003751',
+                'name' => '跨越',
+                'is_default' => false,
             ],
 
         ],
@@ -20,6 +22,7 @@ return [
             [
                 'code' => 'STO',
                 'name' => '申通',
+                'is_default' => false,
             ],
         ]
     ],

src/FineexWms.php

@@ -7,7 +7,7 @@ class FineexWms extends QimenWms
     protected static $default_shop_name = '北京拍店';
     protected static $default_seller_nick = '北京拍店';
     protected static $default_sender_name = '北京拍店';
-    protected static $default_sender_mobile = '18867657269';
+    protected static $default_sender_mobile = '13012816773';
     protected static $default_sender_province = '浙江省';
     protected static $default_sender_city = '嘉兴市';
     protected static $default_sender_area = '秀洲区';

src/QimenWms.php

@@ -332,6 +332,7 @@ class QimenWms extends BaseWms implements WmsInterface
                     'area' => $params['address_area'],
                     'detailAddress' => $params['address_detail'],
                 ],
+                'remark' => $params['remark'] ?? '',
             ],
             'orderLines' => [],
         ];

src/WmsStrategy.php

@@ -33,6 +33,7 @@ class WmsStrategy
             $logistics = $this->chooseLogisticsCompany($params['order_address']['receive_province'], $skuTotalWeight);
             $params['order_sender_info']['logistics_code'] = $logistics['code'];
             $params['order_sender_info']['logistics_name'] = $logistics['name'];
+            $orderLogisticsType = $logistics['type'];
         } else {
             $params['order_sender_info']['logistics_code'] = $params['express_code'];
             $params['order_sender_info']['logistics_name'] = self::getExpressNameByExpressCode($params['express_code']);
@@ -145,7 +146,8 @@ class WmsStrategy
     {
         $expressChooseConf = require(dirname(dirname(__FILE__)) . '/config/express_choose.php');
         $type = self::getOrderType($province, $weight, $expressChooseConf);
-        return $expressChooseConf['logistics'][$type];
+        $expressChooseConf['logistics'][$type][0]['is_default'] = true;
+        return collect([$expressChooseConf['logistics']['toC'], $expressChooseConf['logistics']['toB']])->collapse()->all();
     }
 
     /**