Commit 056e344f authored by Lin jixin's avatar Lin jixin
Browse files

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

parents bf437c00 d55adb5b
Loading
Loading
Loading
Loading
+0 −7
Original line number Diff line number Diff line
@@ -45,13 +45,6 @@ interface FactoryNoticeServiceInterface
     */
    public function markRead($userInfo,$params);

    /**
     * 获取用户已读工厂公告
     * @param $userInfo
     * @author chentianyu
     */
    public static function getReadNotices($userInfo);

    /**
     * 打包下载
     * @param $noticeId
+11 −2
Original line number Diff line number Diff line
@@ -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: 获取订单信息
@@ -88,7 +89,7 @@ interface FactoryServiceInterface
     * DateTime: 2022/9/22 16:21
     * @param $orderNo
     */
    public function getProductionOrder($orderNo, $columns =['*']);
    public function getProductionOrder($orderNo, $columns =['*'],$with=[]);



@@ -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
+21 −0
Original line number Diff line number Diff line
<?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;

}
+6 −0
Original line number Diff line number Diff line
@@ -109,4 +109,10 @@ interface ProductChildServiceInterface
     */
    public function getIdsByCategoryId(int $categoryId, int $limit = null);

    /**
     * 创建对应的子产品
     * @param array $childDetails
     * @return array
     */
    public function createChildrenProducts(array $childDetails): array;
}
+61 −0
Original line number Diff line number Diff line
@@ -206,6 +206,51 @@ interface ProductServiceInterface
     */
    public function specimenTransformToProduct(array $params);

    /**
     * 更新样品转换的产品
     * @param string $sku_id 主键
     * @param array $status_id 允许转换的状态
     * @param array $params 传入的参数
     * $params = [
     *     'product' => [ // 产品信息
     *         'sku' => 'ABC123', // SKU,必填
     *         'name' => '裙子', // 产品中文名,选填
     *         'en_name' => 'dress', // 产品英文名,选填
     *         'brand_id' => 123, // 品牌id,选填
     *         'team_ids' => [1,2,3], // 团队id数组,选填
     *         'hs_code' => '6109909060', // 海关编号,选填
     *         'origin_country_id' => 123, // 原产国,选填
     *         'production_address' => '苏州', // 境内货源地,选填
     *         'unit' => '件', // 单位,必填
     *         'category_id' => 123, // 品类id,必填
     *         'ingredient_id' => 123, // 成分id,选填
     *         'product_name_id' => 123, // 品名id,必填
     *         'style' => '复古', // 风格/款式,选填
     *         'creator_id' => 123, // 创建人id,必填
     *         'images' => [], // 图片地址数组
     *         'cost' => 12,5, // 生产成本
     *         'package_cost' => 12,5, // 包装成本
     *         'customs_unit_price' => 12,5, // 报关单价
     *         'customs_cost' => 12,5, // 报关成本
     *         'product_weight' => 15.2, // 产品重量(g)
     *         'product_length' => 15.2, // 产品长度(cm)
     *         'product_width' => 15.2, // 产品宽度(cm)
     *         'product_height' => 15.2, // 产品高度(cm)
     *         'product_volume' => 15.2, // 产品体积(cm3)
     *         'package_weight' => 15.2, // 包装重量(g)
     *         'package_length' => 15.2, // 包装长度(cm)
     *         'package_width' => 15.2, // 包装宽度(cm)
     *         'package_height' => 15.2, // 包装高度(cm)
     *         'package_volume' => 15.2, // 包装体积(cm3)
     *     ],
     *     'material' => [] // 原料信息,暂无
     * ];
     * @return array
     * @throws \Meibuyu\Rpc\Exceptions\RpcException
     * @author Zero
     */
    public function updateSpecimenTransformToProduct(array $params,$sku_id,$status_id);

    /**
     * 检查产品是否上架
     * @param array $params
@@ -278,4 +323,20 @@ 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;


   /**
    * 创建属于草稿状态(不展示出来)的主 SKU
    * @return array
    * @throws \Meibuyu\Rpc\Exceptions\RpcException
    * @author QJK
    */
    public function createDraftProduct(array $params);
}
Loading