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

src/Order/Enum/OrderEnum.php

@@ -74,9 +74,12 @@ class OrderEnum
      const BALANCE_STATE_FALSE = 0; //未对账
      const BALANCE_STATE_FALSE = 0; //未对账
      const BALANCE_STATE_TRUE = 1;//已对账
      const BALANCE_STATE_TRUE = 1;//已对账
 
 
-
-    const REFUND_SUCCESS = 2; //退款成功
+    //退款状态
+    const REFUND_NONE = 0;//无退款
+    const REFUND_PART = 1;//部分退款
+    const REFUND_SUCCESS = 2; //退款成功(全部退款)
     const REFUND_REJECTED = 3; //拒绝退款
     const REFUND_REJECTED = 3; //拒绝退款
+    const REFUND_REVOKE = 4; //买家撤销退款
 
 
 
 
 
 

src/WithdrawCash/Lib/WithdrawCashInterface.php

@@ -15,10 +15,11 @@ use Swoft\Core\ResultInterface;
  *
  *
  * @method ResultInterface deferPaySuccess(int $type,int $storeId,int $id,string $wxOrderSn,int $fee)
  * @method ResultInterface deferPaySuccess(int $type,int $storeId,int $id,string $wxOrderSn,int $fee)
  * @method ResultInterface deferPayFailed(int $type,int $storeId,int $id,string $message)
  * @method ResultInterface deferPayFailed(int $type,int $storeId,int $id,string $message)
+ * @method ResultInterface deferGetBuyerAccountListByStoreId(int $storeId,array $buyerIds)
  */
  */
 interface WithdrawCashInterface{
 interface WithdrawCashInterface{
     /**
     /**
-     * 支付成功接口
+     * 支付成功接口(弃用)
      *
      *
      * @param integer $type         提现类型
      * @param integer $type         提现类型
      * @param integer $storeId      店铺ID
      * @param integer $storeId      店铺ID
@@ -30,7 +31,7 @@ interface WithdrawCashInterface{
     public function paySuccess(int $type,int $storeId,int $id,string $wxOrderSn,int $fee);
     public function paySuccess(int $type,int $storeId,int $id,string $wxOrderSn,int $fee);
 
 
     /**
     /**
-     * 支付失败接口
+     * 支付失败接口(弃用)
      *
      *
      * @param integer $type         提现类型
      * @param integer $type         提现类型
      * @param integer $storeId      店铺ID
      * @param integer $storeId      店铺ID
@@ -39,4 +40,13 @@ interface WithdrawCashInterface{
      * @return boolean
      * @return boolean
      */
      */
     public function payFailed(int $type,int $storeId,int $id,string $message);
     public function payFailed(int $type,int $storeId,int $id,string $message);
+    
+    /**
+     * 批量查询指定店铺下买家佣金钱包
+     *
+     * @param integer $storeId
+     * @param array $buyerIds
+     * @return array
+     */
+    public function getBuyerAccountListByStoreId(int $storeId,array $buyerIds);
 }
 }
\ No newline at end of file