Merge branch 'ft-bonus' into test

src/MemberCard/Lib/MemberCardInterface.php

@@ -25,7 +25,7 @@ use Swoft\Core\ResultInterface;
  * @method ResultInterface deferSetUserCouponStatus(int $storeId,int $couponId,int $status)
  * @method ResultInterface deferGetUserValidCouponNum(int $storeId,int $escrow,int $userId)
  * @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 $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 $userId,int $bonusToUse)
  * @method ResultInterface deferVerifyBonusConvertMoney((int $storeId,int $userId,int $bonusToUse,int $price)
@@ -128,7 +128,6 @@ interface MemberCardInterface
    * 改变用户积分
    *
    * @param integer $storeId
-   * @param integer $escrow
    * @param integer $userId
    * @param integer $orderId
    * @param integer $type   //类型 1 消费产生积分 2 积分抵扣 3订单关闭 （这里只要传1-3）【4 - 消费后订单关闭，原来增加积分的记录状态为4（1->4）】
@@ -136,7 +135,7 @@ interface MemberCardInterface
    * @param integer $bonus
    * @return bool
    */
-  public function upMembercardBonus(int $storeId,int $escrow,int $userId,int $orderId,int $type,int $money=0,int $bonus=0);
+  public function upMembercardBonus(int $storeId,int $userId,int $orderId,int $type,int $money=0,int $bonus=0);
 
   /**
    * 用户储值卡余额 通知会员卡（显示在卡包 余额）