Merge branch 'develop' into 'master'

Develop

See merge request !2

src/Service/Interfaces/FeiShu/FeiShuUserServiceInterface.php

@@ -20,4 +20,21 @@ Interface FeiShuUserServiceInterface
      * @return mixed
      */
     public function getUserList();
+
+    /**
+     * Notes:通过临时Code获取用户信息(用于飞书扫码登录第三方应用)
+     * User: carlos
+     * DateTime: 2021/12/20 9:31
+     * @param string $code
+     * @return mixed
+     */
+    public function getUserByCode(string $code);
+
+    /**
+     * Notes: 获取飞书应用id
+     * User: carlos
+     * DateTime: 2021/12/20 9:32
+     * @return mixed
+     */
+    public function getAppId();
 }
\ No newline at end of file

src/Service/Interfaces/PurchaseNew/SupplierNewServiceInterface.php

@@ -38,4 +38,10 @@ interface SupplierNewServiceInterface
      * @return array
      */
     public function getSupplierInfoByName(array $supplierName): array;
+	
+	  /**
+     * 需要兼容的供应商
+     * @return array
+     */
+	public function supplierMap();
 }
\ No newline at end of file

src/Service/Interfaces/Wms/SeventeenTrackInterface.php

+<?php
+/**
+ * Created by PhpStorm.
+ * User: 王源
+ * Date: 2020/1/9
+ * Time: 15:07
+ */
+
+namespace Meibuyu\Rpc\Service\Interfaces\Wms;
+
+interface SeventeenTrackInterface
+{
+    /**
+     * 从17track实时获取物流信息是否签收
+     * @param array $trackNumber $trackNumber：物流单号，$carrier 17track物流公司编号 格式：[['number' => $trackNumber,'carrier' => $carrier]]
+     * @return array
+     */
+    public function getRealTimeSignForNo(array $trackNumber): array;
+
+    /**
+     * 从wms缓存表获取物流信息是否签收
+     * @param array $trackNumber $trackNumber：物流单号 格式：[$trackNumber1,$trackNumber2]
+     * @return array
+     */
+    public function getCacheSignForNo(array $trackNumber): array;
+}