Merge remote-tracking branch 'origin/purchase_rpc'

# Conflicts:
#	src/Service/Interfaces/Order/SubOrderServiceInterface.php

src/Service/Interfaces/Order/SubOrderServiceInterface.php

@@ -64,18 +64,26 @@ interface SubOrderServiceInterface
      * 订单采购完成 修改子订单信息  ---1688采购系统使用
      * @param $data //修改参数数组(二维数组)
      *     参数字段:$data = [
-     *      'sub_order_no'=>[oa子订单编号1,oa子订单编号2],
-     *      'data' => [
+     *        [
+     *          'sub_order_no'=>oa子订单编号
      *          'supplier_name'=>供应商，
      *          'purchase_price'=>采购总价,
      *          'platform_order'=>'采购平台订单号',
      *          'domestic_logistics_no'=>物流单号,
      *          'domestic_logistics_price'=>物流价格
      *        ],
+     *        [
+     *           'sub_order_no'=>oa子订单编号
+     *           'supplier_name'=>供应商，
+     * 'purchase_price'=>采购总价,
+     * 'platform_order'=>'采购平台订单号',
+     * 'domestic_logistics_no'=>物流单号,
+     * 'domestic_logistics_price'=>物流价格
+     * ]
      *      ]
      * @return bool
      */
-    public function purchaseCompleted($data): bool;
+    public function purchaseCompleted($data,$type): bool;
 
     /**
      * 1688采购异常订单 修改OA子订单状态
@@ -84,4 +92,27 @@ interface SubOrderServiceInterface
      * @return array
      */
     public function purchaseError($orderId,$errorCode):array ;
+
+    /**
+     * 1688采购 修改oa子订单
+     * @param $editData
+     * $editData = [
+     *           'logistic_no'=>'需要修改的物流单号'
+     *           'logistic_no_new'=>'修改后的物流单号',
+     *           'logistic_price'=>'物流费用',
+     *       ]
+     * @return array
+     */
+    public function purchaseEdit($editData):bool ;
+
+    /**
+     * 删除物流信息
+     * @param $data =>[
+     *          'sub_order_no'=>'子订单号',
+     *          'logistic_no'=>'物流单号'
+     *       ]
+     * @return bool
+     */
+    public function purchaseDelete($data):bool;
+
 }
\ No newline at end of file

src/Service/Interfaces/Purchase/PurchaseDoneServiceInterface.php

+<?php
+
+
+namespace Meibuyu\Micro\Service\Interfaces\Purchase;
+
+
+interface PurchaseDoneServiceInterface
+{
+    /**
+     *通过子订单编号修改采购状态
+     * @param array $orderIds 子订单编号 ['3333444','12222']
+     * @return mixed
+     */
+    public function archivePurchase($orderIds);
+}
\ No newline at end of file