Commit 1733a716 authored by jiangkebao's avatar jiangkebao
Browse files

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

parents d1a1536c 71549e48
Loading
Loading
Loading
Loading
+7 −0
Original line number Original line Diff line number Diff line
@@ -43,4 +43,11 @@ interface MaterialServiceInterface
     */
     */
    public function getMaterialNamesByIdList(array $idList, array $columns = ['*']): array;
    public function getMaterialNamesByIdList(array $idList, array $columns = ['*']): array;


    /**
     * 获取某原料品类下的所有原料品名
     * @param $categoryId
     * @return array
     */
    public function getMaterialNamesByCategoryId($categoryId);

}
}
+0 −7
Original line number Original line Diff line number Diff line
@@ -41,11 +41,4 @@ interface PlatformProductServiceInterface
     */
     */
    public function getWithPoint(array $idList, $groupByFlag = false);
    public function getWithPoint(array $idList, $groupByFlag = false);


    /**
     * 获取全部平台产品状态列表
     * @param array $columns 默认['id', 'name']
     * @return array
     */
    public function platformProductStatus(array $columns = ['id', 'name']): array;

}
}
+22 −2
Original line number Original line Diff line number Diff line
@@ -76,9 +76,10 @@ interface ProductServiceInterface
     * 通过id数组获取品名列表
     * 通过id数组获取品名列表
     * @param array $ids 默认去重
     * @param array $ids 默认去重
     * @param array $columns
     * @param array $columns
     * @param array $relations ['report_points']
     * @return array 默认keyBY('id')
     * @return array 默认keyBY('id')
     */
     */
    public function getProductNamesByIds(array $ids, array $columns = ['id', 'name', 'en_name']): array;
    public function getProductNamesByIds(array $ids, array $columns = ['id', 'name', 'en_name'], $relations = []): array;


    /**
    /**
     * 通过id获取品类
     * 通过id获取品类
@@ -92,8 +93,27 @@ interface ProductServiceInterface
     * 通过id获取品名
     * 通过id获取品名
     * @param int $id
     * @param int $id
     * @param array $columns
     * @param array $columns
     * @param array $relations ['report_points']
     * @return array|null
     * @return array|null
     */
     */
    public function getProductNameById(int $id, array $columns = ['id', 'name', 'en_name']);
    public function getProductNameById(int $id, array $columns = ['id', 'name', 'en_name'], $relations = []);

    /**
     * 通过id数组获取申报要素列表
     * @param array $ids 默认去重
     * @param array $columns
     * @param array $relations ['product_name', 'ingredient']
     * @return array 默认keyBY('id')
     */
    public function getReportPointsByIds(array $ids, $relations = [], array $columns = ['id', 'hs_code', 'point']): array;

    /**
     * 通过id获取申报要素
     * @param int $id
     * @param array $columns
     * @param array $relations ['product_name', 'ingredient']
     * @return array|null
     */
    public function getReportPointById(int $id, $relations = [], array $columns = ['id', 'hs_code', 'point']);


}
}