Merge branch 'agent' into test

src/Order/Lib/OrderInterface.php

@@ -15,7 +15,7 @@ use Swoft\Core\ResultInterface;
 /**
 /**
  * order servcie
  * order servcie
  *
  *
- * @method ResultInterface deferCreateOrder(int $buyerId,int $storeId,int $consigneeId,int $itemId,int $selectedNum,int $orderType,int $activityPrice,string $goodsName,string $goodsImage,string $activityName,int $goodsId,int $goodsPrice,string $message='',int $skuId=0,int $subStoreId=0,int $couponId=0);
+ * @method ResultInterface deferCreateOrder(int $buyerId,int $storeId,int $consigneeId,int $itemId,int $selectedNum,int $orderType,int $activityPrice,string $goodsName,string $goodsImage,string $activityName,int $goodsId,int $goodsPrice,string $message='',int $skuId=0,int $subStoreId=0,int $couponId=0,int $agentId=0);
  * @method ResultInterface deferGetOrderDetailBySubId(int $storeId,int $subOrderId,$ifSelf=true,bool $ifExtend=false)
  * @method ResultInterface deferGetOrderDetailBySubId(int $storeId,int $subOrderId,$ifSelf=true,bool $ifExtend=false)
  * @method ResultInterface deferGetOrderDetailByPid(int $storeId,int $pId, $ifSelf=false, $ifExtend=false)
  * @method ResultInterface deferGetOrderDetailByPid(int $storeId,int $pId, $ifSelf=false, $ifExtend=false)
  * @method ResultInterface deferGetOrderDetailByMainSn(int $storeId,string  $orderSn, $ifSelf=false, $ifExtend=false)
  * @method ResultInterface deferGetOrderDetailByMainSn(int $storeId,string  $orderSn, $ifSelf=false, $ifExtend=false)
@@ -54,6 +54,7 @@ interface OrderInterface
      * @param integer $skuId
      * @param integer $skuId
      * @param integer $subStoreId
      * @param integer $subStoreId
      * @param integer $couponId
      * @param integer $couponId
+     * @param integer $agentId 代理商Id
      * @return mixed
      * @return mixed
      */
      */
     public function createOrder(
     public function createOrder(
@@ -71,8 +72,9 @@ interface OrderInterface
         int     $goodsPrice,
         int     $goodsPrice,
         string  $message = '',
         string  $message = '',
         int     $skuId=0,
         int     $skuId=0,
-        int $subStoreId=0,
-        int $couponId=0
+        int     $subStoreId=0,
+        int     $couponId=0,
+        int     $agentId=0
     );
     );
     /**
     /**
     * 根据子订单ID查询订单详情
     * 根据子订单ID查询订单详情

src/Transfer/Enum/TransferEnum.php

@@ -17,7 +17,9 @@ class TransferEnum
 
 
     const ORIGIN_FRONTEND = 1; //前台打款
     const ORIGIN_FRONTEND = 1; //前台打款
 
 
-    const ORIGIN_BACKEND = 2; //前台打款
+    const ORIGIN_BACKEND = 2; //后端打款
 
 
     const ORIGIN_WRWD = 3; //万人万店打款
     const ORIGIN_WRWD = 3; //万人万店打款
+
+    const ORIGIN_ENTRUSTED = 4;//托管小程序打款
 }
 }
\ No newline at end of file

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