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

src/MemberCard/Lib/MemberCardInterface.php

@@ -27,6 +27,8 @@ use Swoft\Core\ResultInterface;
  * @method ResultInterface deferIfCouponSuitOrder(int $storeId,int $userId,int $couponId,array $goods)
  * @method ResultInterface deferUpMembercardBonus(int $storeId,int $escrow,int $userId,int $orderId,int $type,int $money=0,int $bonus=0)
  * @method ResultInterface deferUpMembercardBalance(int $storeId,int $escrow,int $userId,int $balance)
+ * @method ResultInterface deferGetBonusConvertMoney((int $storeId,int $escrow,int $userId,int $bonusToUse)
+ * @method ResultInterface deferVerifyBonusConvertMoney((int $storeId,int $escrow,int $userId,int $bonusToUse,int $price)
  */
 /**
  * The interface of demo service
@@ -146,4 +148,27 @@ interface MemberCardInterface
    * @return bool
    */
   public function upMembercardBalance(int $storeId,int $escrow,int $userId,int $balance);
+
+    /**
+   * 下单时 查询 积分能抵扣的金额
+   *
+   * @param integer $storeId
+   * @param integer $escrow
+   * @param integer $userId
+   * @param integer $bonusToUse  
+   * @return int  
+   */
+  public function getBonusConvertMoney(int $storeId,int $escrow,int $userId,int $bonusToUse);
+
+   /**
+   * 下单时 验证 积分能抵扣的金额
+   *
+   * @param integer $storeId
+   * @param integer $escrow
+   * @param integer $userId
+   * @param integer $bonusToUse
+   * @param integer $price //订单原价减去优惠券后的价格
+   * @return bool  //验证通过返回true，不通过返回false
+   */
+  public function verifyBonusConvertMoney(int $storeId,int $escrow,int $userId,int $bonusToUse,int $price);
 }

src/WithdrawCash/Lib/WithdrawCashInterface.php

@@ -18,7 +18,6 @@ use Swoft\Core\ResultInterface;
  * @method ResultInterface deferGetBuyerAccountListByStoreId(int $storeId,array $buyerIds)
  * @method ResultInterface deferGetSellerCommission(array $sellerIds)
  * @method ResultInterface deferGetSellerFund(array $sellerIds)
- * @method ResultInterface deferGetBuyerDistribution(int $storeId,array $buyerIds)
  */
 interface WithdrawCashInterface{
     /**
@@ -68,13 +67,4 @@ interface WithdrawCashInterface{
      * @return array
      */
     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