Merge branch 'test' of http://git.dev.2b3.cn/tencent/services into test

src/Buyer/Lib/AgentInterface.php

@@ -3,14 +3,14 @@
 namespace Hdll\Services\Buyer\Lib;
 namespace Hdll\Services\Buyer\Lib;
 
 
 /**
 /**
- * @method ResultInterface deferGetByUnionId(string $unionId)
+ * @method ResultInterface deferGetByUnionId(string $unionId, int $storeId)
  * @method ResultInterface deferUsefulAgent(int $storeId, int $agentId)
  * @method ResultInterface deferUsefulAgent(int $storeId, int $agentId)
  * Interface AgentInterface
  * Interface AgentInterface
  * @package Hdll\Services\Buyer\Lib
  * @package Hdll\Services\Buyer\Lib
  */
  */
 interface AgentInterface
 interface AgentInterface
 {
 {
-	public function getByUnionId(string $unionId);
+	public function getByUnionId(string $unionId, int $storeId);
 
 
 	/**
 	/**
 	 * 代理是否可用
 	 * 代理是否可用

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)
+ * @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 deferGetListByOrderId(int $storeId, int $orderId)
  * @method ResultInterface deferGetListByOrderId(int $storeId, int $orderId)
  * Interface AgencyInterface
  * Interface AgencyInterface
  * @package App\Lib
  * @package App\Lib
@@ -30,6 +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
 	 * @return mixed
 	 * @return mixed
 	 * @author Administrator
 	 * @author Administrator
 	 */
 	 */
@@ -41,7 +42,8 @@ interface BillInterface
 		int $money,
 		int $money,
 		string $orderName,
 		string $orderName,
 		int $orderType,
 		int $orderType,
-		int $agentId
+		int $agentId,
+		int $itemId
 	);
 	);
 
 
 	public function getListByOrderId(int $storeId, int $orderId);
 	public function getListByOrderId(int $storeId, int $orderId);

src/WithdrawCash/Lib/WithdrawCashInterface.php

@@ -18,6 +18,7 @@ use Swoft\Core\ResultInterface;
  * @method ResultInterface deferGetBuyerAccountListByStoreId(int $storeId,array $buyerIds)
  * @method ResultInterface deferGetBuyerAccountListByStoreId(int $storeId,array $buyerIds)
  * @method ResultInterface deferGetSellerCommission(array $sellerIds)
  * @method ResultInterface deferGetSellerCommission(array $sellerIds)
  * @method ResultInterface deferGetSellerFund(array $sellerIds)
  * @method ResultInterface deferGetSellerFund(array $sellerIds)
+ * @method ResultInterface deferGetBuyerDistribution(int $storeId,array $buyerIds)
  */
  */
 interface WithdrawCashInterface{
 interface WithdrawCashInterface{
     /**
     /**
@@ -67,4 +68,13 @@ interface WithdrawCashInterface{
      * @return array
      * @return array
      */
      */
     public function getSellerFund(array $sellerIds);
     public function getSellerFund(array $sellerIds);
+
+    /**
+     * 批量查询指定店铺下分销商钱包
+     * 
+     * @param integer $storeId
+     * @param array $buyerIds
+     * @return array
+     */
+    public function getBuyerDistribution(int $storeId,array $buyerIds);
 }
 }
\ No newline at end of file