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

src/Service/Interfaces/Product/ProductServiceInterface.php

@@ -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

src/Service/Interfaces/ProductDevelop/SpecimenServiceInterface.php

+<?php
+
+namespace Meibuyu\Rpc\Service\Interfaces\ProductDevelop;
+
+
+/**
+ * @author chentianyu
+ */
+interface SpecimenServiceInterface
+{
+
+    /**
+     * 创建物流信息
+     * @param $data
+     * @return int|string
+     * @author chentianyu
+     */
+    public function creatLogistics($data);
+
+
+}
\ No newline at end of file

src/Service/Interfaces/PurchaseNew/PurchaseStockServiceInterface.php

@@ -48,22 +48,6 @@ interface PurchaseStockServiceInterface
     public function warehousingOperation($post):array;
 
 
-    /**
-     * 已完成记录rpc 已弃用
-     *
-    {
-    "batch_no": "batch_no",
-    "purchase_no": "1634197133",
-    "product": [{
-    "id": 24,
-    "completed_num":22 //已完成数量
-    }]
-    }
-     * @param $post
-     * @return array
-     */
-    public function completeOperation($post):array;
-
 
     /**
      * 退款记录rpc
@@ -91,18 +75,22 @@ interface PurchaseStockServiceInterface
 
 
     /**
-     * 产品开发退换货
+     * 发货产品处理
      * @param $post
-     * {
-        "product_dev_no":"新品开发单",
-        "child_sku":"仓库子产品sku",
-        "type":"Return |  Exchange (退货|换货)类型",
-        "num":"退换货数量",
-        "logistics_no":"物流单号"
-        }
+     {
+        "logistics_no": "物流单号",
+        "source_type":"product-dev",
+        "operate_user":"操作人名",
+        "type": "Return（退货）| Exchange (换货) | Receipt（签收）",
+        "detail": [{
+            "source_no": "来源单号",
+            "child_sku": "仓库子产品sku",
+            "num": "退换货数量"
+        }]
+      }
      * @return  true | string (error_msg)
      */
-    public function  returnOrExchangeProducts($post);
+    public function  deliveryProductsDeal($post);
 
 
 }
\ No newline at end of file