Merge branch 'test' of git.huaperfect.com:hwq/micro into test

src/Constants/MaterialCategory.php

+<?php
+/**
+ * Created by PhpStorm.
+ * User: Zero
+ * Date: 2020/3/23
+ * Time: 17:45
+ */
+
+namespace Meibuyu\Micro\Constants;
+
+class MaterialCategory
+{
+
+    const FU_LIAO = 1; // 辅料
+    const MIAN_LIAO = 2; // 面料
+    const LI_BU = 3; // 里布
+    const HAO_CAI = 4; // 耗材
+
+}

src/Constants/SpecialUserId.php

+<?php
+/**
+ * Created by PhpStorm.
+ * User: Zero
+ * Date: 2020/6/18
+ * Time: 8:32
+ */
+
+namespace Meibuyu\Micro\Constants;
+
+class SpecialUserId
+{
+
+    const ZHANG_TING_TING = 83; // 张婷婷
+    const CAI_YA_XIANG = 85; // 蔡亚祥
+    const CAI_HONG_SHAN = 86; // 蔡红山
+
+}

src/Service/Interfaces/MessageServiceInterface.php

@@ -16,8 +16,10 @@ interface MessageServiceInterface
      * @param array $receiveUserId 接收人id
      * @param string $application 应用名称
      * @param int $sendUserId 发送人id(发送人id等于0时是系统消息)
-     * @param int $templateId 模板id
+     * @param int $templateId 模板id(等于0时直接使用content内容)
      * @param array $replace 替换模板内容
+     * @param string $content 自定义消息内容
+     * @return bool
      */
-    public function send(array $receiveUserId, $application, $templateId, $sendUserId = 0, $replace = []): bool;
+    public function send(array $receiveUserId, $application, $templateId = 0, $sendUserId = 0, $replace = [], $content = ''): bool;
 }

src/Service/Interfaces/Product/PlatformProductChildServiceInterface.php

@@ -70,4 +70,14 @@ interface PlatformProductChildServiceInterface
      */
     public function getListByProductChildIds(array $productChildIds, $siteId = null, array $columns = ['*']);
 
+    /**
+     * 通过仓库产品id获取平台子产品数组
+     * @param $productId
+     * @param null $siteId
+     * @param array $relations
+     * @param array $columns
+     * @return array
+     */
+    public function getListByProductIds($productId, $siteId = null, array $relations = [], $columns = ['*']);
+
 }