Merge branch 'ft-bonus' into test

src/MemberCard/Lib/MemberCardInterface.php

@@ -27,8 +27,8 @@ use Swoft\Core\ResultInterface;
  * @method ResultInterface deferIfCouponSuitOrder(int $storeId,int $userId,int $couponId,array $goods)
  * @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 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 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)
+ * @method ResultInterface deferGetBonusConvertMoney((int $storeId,int $userId,int $bonusToUse)
+ * @method ResultInterface deferVerifyBonusConvertMoney((int $storeId,int $userId,int $bonusToUse,int $price)
  */
  */
 /**
 /**
  * The interface of demo service
  * The interface of demo service
@@ -153,22 +153,20 @@ interface MemberCardInterface
    * 下单时 查询 积分能抵扣的金额
    * 下单时 查询 积分能抵扣的金额
    *
    *
    * @param integer $storeId
    * @param integer $storeId
-   * @param integer $escrow
    * @param integer $userId
    * @param integer $userId
    * @param integer $bonusToUse  
    * @param integer $bonusToUse  
    * @return int  
    * @return int  
    */
    */
-  public function getBonusConvertMoney(int $storeId,int $escrow,int $userId,int $bonusToUse);
+  public function getBonusConvertMoney(int $storeId,int $userId,int $bonusToUse);
 
 
    /**
    /**
    * 下单时 验证 积分能抵扣的金额
    * 下单时 验证 积分能抵扣的金额
    *
    *
    * @param integer $storeId
    * @param integer $storeId
-   * @param integer $escrow
    * @param integer $userId
    * @param integer $userId
    * @param integer $bonusToUse
    * @param integer $bonusToUse
    * @param integer $price //订单原价减去优惠券后的价格
    * @param integer $price //订单原价减去优惠券后的价格
    * @return bool  //验证通过返回true，不通过返回false
    * @return bool  //验证通过返回true，不通过返回false
    */
    */
-  public function verifyBonusConvertMoney(int $storeId,int $escrow,int $userId,int $bonusToUse,int $price);
+  public function verifyBonusConvertMoney(int $storeId,int $userId,int $bonusToUse,int $price);
 }
 }