From 22dbaee7c17f3d9a1d4f77c8f793ae6dc1395bfa Mon Sep 17 00:00:00 2001
From: ZweiCD <416931358@qq.com>
Date: Thu, 23 Jul 2020 10:11:50 +0800
Subject: [PATCH] =?UTF-8?q?2b=E5=8F=91=E8=B4=A7=E4=BD=BF=E7=94=A8ptck?=
 =?UTF-8?q?=E7=9A=84orderType?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 config/express_choose.php | 4 ++--
 config/wms.php            | 1 -
 src/QimenWms.php          | 2 +-
 src/WmsStrategy.php       | 1 +
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/config/express_choose.php b/config/express_choose.php
index ece2b4c..c81971d 100644
--- a/config/express_choose.php
+++ b/config/express_choose.php
@@ -6,8 +6,8 @@ return [
     'other_express_weight' => 50,
     'logistics' => [
         'toB' => [
-            'code' => 'YTO',
-            'name' => '圆通',
+            'code' => 'KYE',
+            'name' => '跨越',
         ],
         'toC' => [
             'code' => 'STO',
diff --git a/config/wms.php b/config/wms.php
index 1a35851..b2061dc 100644
--- a/config/wms.php
+++ b/config/wms.php
@@ -15,7 +15,6 @@ return [
     ],
     'fineex' => [
         'base_uri' => env('FINEEX_HOST', 'http://qimen.api.taobao.com/router/qmtest?'),
-//        'base_uri' => env('FINEEX_HOST', 'http://qimenapi.tbsandbox.com/router/qimen/service?'),
         'app_key' => env('FINEEX_APP_KEY', '30469069'),
         'app_secret' => env('FINEEX_APP_SECRET', 'fe74d42121d20db341d29229c1179fe3'),
         'customerId' => env('FINEEX_CUSTOMERID','mockCustomerId'),
diff --git a/src/QimenWms.php b/src/QimenWms.php
index 157c58a..2872f21 100644
--- a/src/QimenWms.php
+++ b/src/QimenWms.php
@@ -317,7 +317,7 @@ class QimenWms extends BaseWms implements WmsInterface
         $postData = [
             'deliveryOrder' => [
                 'deliveryOrderCode' => $params['out_warehouse_number'], //出库单号
-                'orderType' => 'DBCK', //出库单类型
+                'orderType' => $params['order_type'] ?? 'DBCK', //出库单类型
                 'warehouseCode' => $this->config['warehouse_code'], //仓库编码
                 'logisticsCode' => $params['order_sender_info']['logistics_code'] ?? 'SF',
                 'logisticsName' => $params['order_sender_info']['logistics_name'] ?? '顺丰',
diff --git a/src/WmsStrategy.php b/src/WmsStrategy.php
index 0dd3961..bcb2811 100644
--- a/src/WmsStrategy.php
+++ b/src/WmsStrategy.php
@@ -39,6 +39,7 @@ class WmsStrategy
             $params['address_city'] = $params['order_address']['receive_city'];
             $params['address_area'] = $params['order_address']['receive_district'];
             $params['address_detail'] = $params['order_address']['receive_address'];
+            $params['order_type'] = 'PTCK';
             foreach ($params['order_goods'] as &$item) {
                 $item['product_name'] = $item['goods_name'];
                 $item['number'] = $item['sku_quantity'];