From 1c6fdd4bb6e1a373abd69c53b587cf3d2ceed6ab Mon Sep 17 00:00:00 2001
From: ZweiCD <416931358@qq.com>
Date: Tue, 14 Jul 2020 14:27:45 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=85=A5=E5=BA=93=E5=8D=95?=
 =?UTF-8?q?=E5=88=9B=E5=BB=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/QimenWms.php     | 7 +++----
 src/WmsInterface.php | 2 +-
 src/WmsStrategy.php  | 4 ++--
 3 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/src/QimenWms.php b/src/QimenWms.php
index 6a00d0f..1bca641 100644
--- a/src/QimenWms.php
+++ b/src/QimenWms.php
@@ -48,8 +48,8 @@ class QimenWms extends BaseWms implements WmsInterface
                 'createTime' => date('Y-m-d H:i:s'), //发货单创建时间
                 'placeOrderTime' => $order['created_at'], //前台订单 (店铺订单) 创建时间 (下单时间)
                 'operateTime' => date('Y-m-d H:i:s'), //操作 (审核) 时间
-                'shopNick' => $order['order_sender_info']['shop_name'] ?? static::$default_shop_name,
-                'sellerNick' => $order['order_sender_info']['shop_name'] ?? static::$default_seller_nick,
+                'shopNick' => (isset($order['order_sender_info']['shop_name']) && $order['order_sender_info']['shop_name']) ? $order['order_sender_info']['shop_name'] : static::$default_shop_name,
+                'sellerNick' => (isset($order['order_sender_info']['shop_name']) && $order['order_sender_info']['shop_name']) ? $order['order_sender_info']['shop_name'] : static::$default_seller_nick,
                 'remark' => $order['remark'],
                 'logisticsCode' => $order['order_sender_info']['logistics_code'],
                 //发货人信息
@@ -268,10 +268,9 @@ class QimenWms extends BaseWms implements WmsInterface
     /**
      * 新增入库计划
      * @param array $params
-     * @param int $type
      * @return array|\DOMDocument
      */
-    public function stockInCreate($params, $type)
+    public function stockInCreate($params)
     {
         $method = 'taobao.qimen.entryorder.create';
 
diff --git a/src/WmsInterface.php b/src/WmsInterface.php
index 3963a38..b17d903 100644
--- a/src/WmsInterface.php
+++ b/src/WmsInterface.php
@@ -16,7 +16,7 @@ Interface WmsInterface
 
     public function returnOrderCreate(array $params);
 
-    public function stockInCreate(array $params, int $type);
+    public function stockInCreate(array $params);
 
     public function stockOutCreate(array $params);
 
diff --git a/src/WmsStrategy.php b/src/WmsStrategy.php
index ea10a92..0dd3961 100644
--- a/src/WmsStrategy.php
+++ b/src/WmsStrategy.php
@@ -75,8 +75,8 @@ class WmsStrategy
         return $this->wmsClient->returnOrderCreate($params);
     }
 
-    public function stockInCreate($params, $type = 0) {
-        return $this->wmsClient->stockInCreate($params, $type);
+    public function stockInCreate($params) {
+        return $this->wmsClient->stockInCreate($params);
     }
 
     public function stockOutCreate($params) {