Merge branch 'develop' of http://git.huaperfect.com/without_auth/meibuyu-rpc into develop

src/Service/Interfaces/Notice/FactoryNoticeServiceInterface.php

+<?php
+
+namespace Meibuyu\Rpc\Service\Interfaces\Notice;
+
+interface FactoryNoticeServiceInterface
+{
+
+    /**
+     * 分页
+     * @param $userInfo
+     * @param $params
+     * @author chentianyu
+     */
+    public function page($userInfo,$params);
+
+    /**
+     * 未读列表
+     * @param $userInfo
+     * @param $params
+     * @author chentianyu
+     */
+    public function unReadList($userInfo,$params);
+
+    /**
+     * 查看
+     * @param $userInfo
+     * @param $params
+     * @author chentianyu
+     */
+    public function show($userInfo,$params);
+
+    /**
+     * 下一条未读的记录
+     * @param $userInfo
+     * @param $params
+     * @author chentianyu
+     */
+    public function nextUnRead($userInfo,$params);
+
+    /**
+     * 标记为已读
+     * @param $userInfo
+     * @param $params
+     * @author chentianyu
+     */
+    public function markRead($userInfo,$params);
+
+    /**
+     * 打包下载
+     * @param $noticeId
+     * @author chentianyu
+     */
+    public function pack($noticeId);
+
+
+}

src/Service/Interfaces/OutsideFactory/FactoryServiceInterface.php

@@ -78,9 +78,10 @@ interface FactoryServiceInterface
     /**
      * Notes: 分派订单取消
      * User: carlos
+     * @param string $type cancel|delete
      * DateTime: 2022/9/21 14:24
      */
-    public function cancelOrder($orderNo);
+    public function cancelOrder($orderNo, $type = 'cancel');
 
     /**
      * Notes: 获取订单信息
@@ -101,4 +102,12 @@ interface FactoryServiceInterface
      * date 2022-09-27
      */
     public function getProductionAccountStatement($searchConditions,$isExport=false);
+
+
+    /**
+     * Notes: 生产订单完结
+     * User: carlos
+     * DateTime: 2022/9/29 9:52
+     */
+    public function finishProductionOrder($orderSn);
 }
\ No newline at end of file

src/Service/Interfaces/Product/ApproveProductChildServiceInterface.php

+<?php
+/**
+ * Created by PhpStorm.
+ * User: Zero
+ * Date: 2020/10/12
+ * Time: 9:39
+ */
+
+namespace Meibuyu\Rpc\Service\Interfaces\Product;
+
+interface ApproveProductChildServiceInterface
+{
+
+    /**
+     * 根据子产品获取对应的主产品的创建人 id 信息
+     * @param $childProductIds
+     * @return array
+     */
+    public function getProductCreatorsByChildProductIds($childProductIds): array;
+
+}

src/Service/Interfaces/Product/ProductServiceInterface.php

@@ -278,4 +278,11 @@ interface ProductServiceInterface
      */
     public function getProductChildByWhere(array $where, array $whereIn = [], array $columns = ['*'], array $relations = []): array;
 
+    /**
+     * 根据主 SKU 获取子 SKU 相关信息
+     * @param $filters
+     * @param string[] $childProductFields
+     * @return array
+     */
+    public function getChildProductsByProductFilter($filters, $childProductFields = ['*']): array;
 }

src/Service/Interfaces/Production/ProductionServiceInterface.php

@@ -126,4 +126,25 @@ interface ProductionServiceInterface
      */
     public function getMessageProductionOrderIds();
 
+
+    /**
+     * 发送留言
+     * @return mixed
+     */
+    public function pushProductionMessage(array $params);
+
+
+    /**
+     * 获取留言
+     * @return mixed
+     */
+    public function getProductionMessage(array $params);
+
+
+    /**
+     * 已读标记
+     * @return mixed
+     */
+    public function isReadProductionMessage(array $params);
+
 }