Merge branch 'test' into user-rpc

src/Service/Interfaces/Logistics/LogisticsServiceInterface.php

+<?php
+
+
+namespace Meibuyu\Micro\Service\Interfaces\Logistics;
+
+
+interface LogisticsServiceInterface
+{
+    /**
+     * 将物流单号推送到物流中心，物流中心会时刻监视运单变化实时推送给订阅模块
+     * @param $module 模块名称
+     * @param $logisticsCode 物流公司编码
+     * @param $logisticsNo 物流单号
+     * @return mixed
+     */
+    public function push($module,$logisticsCode, $logisticsNo);
+}
\ No newline at end of file

src/Service/Interfaces/Order/ShopifyServiceInterface.php → src/Service/Interfaces/Order/ShopifyOrderServiceInterface.php

@@ -10,7 +10,7 @@ namespace Meibuyu\Micro\Service\Interfaces\Order;
 
 
 
-interface ShopifyServiceInterface
+interface ShopifyOrderServiceInterface
 {
     /**
      * shopify 推送订单信息

src/Service/Interfaces/Product/ShopifyProductServiceInterface.php

+<?php
+/**
+ * Created by PhpStorm.
+ * User: Zero
+ * Date: 2020/10/12
+ * Time: 9:39
+ */
+
+namespace Meibuyu\Micro\Service\Interfaces\Product;
+
+interface ShopifyProductServiceInterface
+{
+
+    /**
+     * 通过shopify子产品的shopify_id获取shopify子产品
+     * @param array $vids 默认去重
+     * @return array 默认keyBy
+     */
+    public function getChildrenByVids(array $vids): array;
+
+}

src/Service/Interfaces/Product/ShopifyServiceInterface.php

+<?php
+/**
+ * Created by PhpStorm.
+ * User: Zero
+ * Date: 2020/10/12
+ * Time: 9:39
+ */
+
+namespace Meibuyu\Micro\Service\Interfaces\Product;
+
+interface ShopifyServiceInterface
+{
+
+    /**
+     * 拉取一个shopify订单数据
+     * @param $orderId
+     * @param $shopifySiteId
+     * @return array
+     * @throws \Exception
+     */
+    public function pullOrder($orderId, $shopifySiteId): array;
+
+}

src/Service/Interfaces/StoreServiceInterface.php

@@ -174,14 +174,26 @@ interface StoreServiceInterface
     public function checkStock($ids): array;
 
 
-//    /**
-//     * description:出库单 恢复库存 出库单定为已取消
-//     * author: fuyunnan
-//     * @param string $sourceNo 来源单号
-//     * @return int
-//     * @throws
-//     * Date: 2020/9/7
-//     */
-//    public function restoreStock($sourceNo): int;
+    /**
+     * description:出库单 恢复库存 出库单定为已取消
+     * author: fuyunnan
+     * @param string $sourceNo 来源单号
+     * @return int
+     * @throws
+     * Date: 2020/9/7
+     */
+    public function restoreStock($sourceNo): int;
+
+    /**
+     * description:更新出库单状态
+     * author: fuyunnan
+     * @param array $sourceNos 来源单号数组
+     * @param array $where 条件
+     * @param array $update 修改内容
+     * @return int
+     * @throws
+     * Date: 2020/10/13
+     */
+    public function updateExOrder($sourceNos, $where, $update): int;
 
 }

src/Shopify/ShopifyApp.php

@@ -17,6 +17,7 @@ use Meibuyu\Micro\Shopify\lib\InventoryItem;
 use Meibuyu\Micro\Shopify\lib\InventoryLevel;
 use Meibuyu\Micro\Shopify\lib\Location;
 use Meibuyu\Micro\Shopify\lib\Metafield;
+use Meibuyu\Micro\Shopify\lib\Order;
 use Meibuyu\Micro\Shopify\lib\Product;
 use Meibuyu\Micro\Shopify\lib\ProductVariant;
 use Meibuyu\Micro\Shopify\lib\SmartCollection;
@@ -37,6 +38,7 @@ use Meibuyu\Micro\Shopify\lib\Webhook;
  * @property-read InventoryItem $InventoryItem
  * @property-read InventoryLevel $InventoryLevel
  * @property-read Location $Location
+ * @property-read Order $Order
  *
  * @method Webhook Webhook(integer $id = null)
  * @method Collection Collection(integer $id = null)
@@ -48,6 +50,7 @@ use Meibuyu\Micro\Shopify\lib\Webhook;
  * @method InventoryItem InventoryItem(integer $id = null)
  * @method InventoryLevel InventoryLevel(integer $id = null)
  * @method Location Location(integer $id = null)
+ * @method Order Order(integer $id = null)
  *
  */
 class ShopifyApp
@@ -65,6 +68,7 @@ class ShopifyApp
         'InventoryItem',
         'InventoryLevel',
         'Location',
+        'Order',
     ];
 
     protected $childResources = array(

src/Shopify/lib/Order.php

+<?php
+/**
+ * Created by PhpStorm.
+ * User: Zero
+ * Date: 2020/9/2
+ * Time: 16:50
+ */
+
+namespace Meibuyu\Micro\Shopify\lib;
+
+/**
+ * Class Order
+ * @package Meibuyu\Micro\Shopify\lib
+ *
+ * @method array close()     Close an Order
+ * @method array open()         Re-open a closed Order
+ * @method array cancel(array $data)  Cancel an Order
+ */
+class Order extends AbstractShopify
+{
+
+    protected $resourceKey = 'order';
+
+    protected $customPostActions = [
+        'close',
+        'open',
+        'cancel',
+    ];
+
+}