Merge branch 'ft-buyer-agent' into test

# Conflicts:
#	src/Buyer/Lib/BillInterface.php
#	src/Logistics/Lib/LogisticsInterface.php

src/Buyer/Lib/BillInterface.php

@@ -12,7 +12,7 @@ namespace Hdll\Services\Buyer\Lib;
 use Swoft\Core\ResultInterface;
 use Swoft\Core\ResultInterface;
 
 
 /**
 /**
- * @method ResultInterface deferSaveBill(int $order_id, int $buyer_id, int $store_id, string $order_sn, int $money, string $orderName, int $orderType, int $agentId, int $itemId)
+ * @method ResultInterface deferSaveBill(int $order_id, int $buyer_id, int $store_id, string $order_sn, int $money, string $orderName, int $orderType, int $agentId, array $subOrder)
  * @method ResultInterface deferGetListByOrderId(int $storeId, int $orderId)
  * @method ResultInterface deferGetListByOrderId(int $storeId, int $orderId)
  * Interface AgencyInterface
  * Interface AgencyInterface
  * @package App\Lib
  * @package App\Lib
@@ -30,7 +30,7 @@ interface BillInterface
 	 * @param string $orderName //订单名称
 	 * @param string $orderName //订单名称
 	 * @param int    $orderType //订单类型
 	 * @param int    $orderType //订单类型
 	 * @param int    $agentId   //代理商id
 	 * @param int    $agentId   //代理商id
-	 * @param int    $itemId
+	 * @param int    $subOrder
 	 * @return mixed
 	 * @return mixed
 	 * @author Administrator
 	 * @author Administrator
 	 */
 	 */
@@ -43,7 +43,7 @@ interface BillInterface
 		string $orderName,
 		string $orderName,
 		int $orderType,
 		int $orderType,
 		int $agentId,
 		int $agentId,
-		int $itemId
+		array $subOrder
 	);
 	);
 
 
 	public function getListByOrderId(int $storeId, int $orderId);
 	public function getListByOrderId(int $storeId, int $orderId);

src/Logistics/Lib/LogisticsInterface.php

@@ -6,7 +6,7 @@ use Swoft\Core\ResultInterface;
 
 
 /**
 /**
  * @method ResultInterface deferOnPath(array $param)
  * @method ResultInterface deferOnPath(array $param)
- * @method ResultInterface deferHandleFreight($storeId, array $receiver, array $goodsIds)
+ * @method ResultInterface deferHandleFreight($storeId, array $receiver, array $goods)
  * Class LotteryInterface
  * Class LotteryInterface
  * @package Hdll\Services\Logistics\Lib
  * @package Hdll\Services\Logistics\Lib
  */
  */
@@ -19,10 +19,10 @@ interface LogisticsInterface
 	 * 获取运费
 	 * 获取运费
 	 * @param       $storeId
 	 * @param       $storeId
 	 * @param array $receiver
 	 * @param array $receiver
-	 * @param array $goodsIds
+	 * @param array $goods
 	 * @return mixed
 	 * @return mixed
 	 */
 	 */
-	public function handleFreight($storeId, array $receiver, array $goodsIds);
+	public function handleFreight($storeId, array $receiver, array $goods);
 
 
 	/**
 	/**
 	 * 获取收货人地址
 	 * 获取收货人地址