Merge remote-tracking branch 'origin/develop' into develop

src/Service/Interfaces/FeiShu/FeiShuMessageServiceInterface.php

+<?php
+
+namespace  Meibuyu\Rpc\Service\Interfaces\FeiShu;
+
+interface FeiShuMessageServiceInterface
+{
+    /**
+     * Notes: 批量发送消息
+     * User: carlos
+     * DateTime: 2021/12/15 17:31
+     * @param array $userIds
+     * @param string $template
+     * @param array $data
+     * @return mixed
+     */
+    public function batchSendMsg(array $userIds, string $template, array $data);
+}
\ No newline at end of file

src/Service/Interfaces/FeiShu/FeiShuUserServiceInterface.php

+<?php
+
+namespace  Meibuyu\Rpc\Service\Interfaces\FeiShu;
+
+Interface FeiShuUserServiceInterface
+{
+    /**
+     * Notes: 通过手机号码 获取飞书用户ID
+     * User: carlos
+     * DateTime: 2021/12/15 13:50
+     * @param string $phone
+     * @return mixed
+     */
+    public function getUserIdByPhone(array $phone);
+
+    /**
+     * Notes: 获取部门用户
+     * User: carlos
+     * DateTime: 2021/12/15 13:51
+     * @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/Finance/ApplyMoneyServiceInterface.php

@@ -15,4 +15,11 @@ interface ApplyMoneyServiceInterface
      * @return mixed
      */
     public function createApplyMoney($data);
+
+    /**
+     * @param array $data
+     * @param int $id
+     * @return mixed
+     */
+    public function updateApplyMoney($id, $data);
 }

src/Service/Interfaces/Finance/PurchaseOrderServiceInterface.php

@@ -28,4 +28,10 @@ interface PurchaseOrderServiceInterface
      * @return mixed
      */
     public function updatePurchaseOrder($id, $data);
+
+    /**
+     * @param array $ids
+     * @return mixed
+     */
+    public function deletePurchaseOrder($ids);
 }

src/Service/Interfaces/Order/SubOrderServiceInterface.php

@@ -129,4 +129,11 @@ interface SubOrderServiceInterface
      */
     public function isOutStockInfo(array $subOrderNos = []):array;
 
+    /**
+     * 通过子订单号获取子订单信息
+     * @param array $subOrderNos
+     * @return array
+     */
+    public function getSubOrderInfoByNo(array $subOrderNos = [], array $column = ['sub_order_no','shipping_notes','dispatch_notes','product_specification']): array;
+
 }

src/Service/Interfaces/Product/ThirdPlatformProductServiceInterface.php

+<?php
+/**
+ * Created by PhpStorm.
+ * User: Zero
+ * Date: 2021/12/07
+ * Time: 9:39
+ */
+
+namespace Meibuyu\Rpc\Service\Interfaces\Product;
+
+interface ThirdPlatformProductServiceInterface
+{
+
+    /**
+     * 通过id数组获取shopify子产品数组
+     * @param array $ids 默认去重
+     * @return array 默认keyBy
+     * @author Zero
+     */
+    public function getShopifyChildrenByIds(array $ids): array;
+
+    /**
+     * 通过id数组获取速卖通子产品数组
+     * @param array $ids 默认去重
+     * @return array 默认keyBy
+     * @author Zero
+     */
+    public function getAliExpressChildrenByIds(array $ids): array;
+
+    /**
+     * 通过id数组获取Magento子产品数组
+     * @param array $ids 默认去重
+     * @return array 默认keyBy
+     * @author Zero
+     */
+    public function getMagentoChildrenByIds(array $ids): array;
+
+}

src/Service/Interfaces/PurchaseNew/PurchaseInfoServiceInterface.php

@@ -44,13 +44,6 @@ interface PurchaseInfoServiceInterface
     public function getPurchaseInfoArrByBatchNo(array $batchNo) :array;
 
 
-    /**
-     * 订单推送采购
-     * @param $post
-     * @return mixed
-     */
-    public function orderPushPurchase($post);
-
 
 
     /**
@@ -60,4 +53,17 @@ interface PurchaseInfoServiceInterface
      */
     public function getLogisticsInfo(array $subOrderNos);
 
+
+
+    /**
+     * 财务核算完成同步采购更新状态
+     * @param $purchaseId
+     * @return mixed
+     */
+    public function syncAccountingComplete($purchaseId):bool;
+
+
+
+
+
 }
\ No newline at end of file

src/Service/Interfaces/PurchaseNew/PurchaseStockServiceInterface.php

@@ -49,7 +49,7 @@ interface PurchaseStockServiceInterface
 
 
     /**
-     * 已完成记录rpc
+     * 已完成记录rpc 已弃用
      *
     {
     "batch_no": "batch_no",
@@ -82,4 +82,10 @@ interface PurchaseStockServiceInterface
     public function refundOperation($post):array;
 
 
+    /**
+     * 获取采购在途的数量总和
+     * @return mixed
+     */
+    public function getShippingCount();
+
 }
\ No newline at end of file

src/Service/Interfaces/PurchaseNew/SupplierNewServiceInterface.php

@@ -31,4 +31,17 @@ interface SupplierNewServiceInterface
      * @return array
      */
     public function getSupplierInfo(array $params): array;
+
+    /**
+     * 通过供应商名称获取供应商信息
+     * @param array $supplierName
+     * @return array
+     */
+    public function getSupplierInfoByName(array $supplierName): array;
+	
+	  /**
+     * 需要兼容的供应商
+     * @return array
+     */
+	public function supplierMap();
 }
\ No newline at end of file

src/Service/Interfaces/SyncDataService/SyncAliexpressServiceInterface.php

+<?php
+/**
+ * Created by PhpStorm.
+ * User: qiudongfang
+ * Date: ${DATA}
+ * Time: 下午2:57
+ */
+
+namespace Meibuyu\Rpc\Service\Interfaces\SyncDataService;
+
+interface SyncAliexpressServiceInterface
+{
+    /**
+     * @param integer $siteId
+     * @param integer $status
+     * @param array $orderIds
+     * @return mixed
+     */
+    public function syncOrders($siteId, $status, $orderIds);
+
+    /**
+     * @param integer $siteId
+     * @param array $orderIds
+     * @param integer $status
+     * @return mixed
+     */
+    public function updateOrderStatus($siteId, $orderIds, $status);
+
+    /**
+     * @param integer $siteId
+     * @param array $productIds
+     * @return mixed
+     */
+    public function syncProducts($siteId, $productIds);
+
+    /**
+     * @param integer $siteId
+     * @param array $productIds
+     * @param integer $status
+     * @return mixed
+     */
+    public function updateProductStatus($siteId, $productIds, $status);
+}

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;
+}