Merge branch 'test' of http://git.dev.2b3.cn/tencent/services into test

src/MemberCard/Lib/MemberCardInterface.php

@@ -28,7 +28,7 @@ use Swoft\Core\ResultInterface;
  * @method ResultInterface deferUpMembercardBonus(int $storeId,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 deferUpMembercardBalance(int $storeId,int $escrow,int $userId,int $balance)
  * @method ResultInterface deferGetBonusConvertMoney(int $storeId,int $userId,int $bonusToUse)
  * @method ResultInterface deferGetBonusConvertMoney(int $storeId,int $userId,int $bonusToUse)
- * @method ResultInterface deferVerifyBonusConvertMoney(int $storeId,int $userId,int $bonusToUse,int $price)
+ * @method ResultInterface deferVerifyBonusConvertMoney(int $storeId,int $userId,int $bonusToUse,int $price,int couponId)
  * @method ResultInterface deferGetUserBonus(int $storeId,int $userId)
  * @method ResultInterface deferGetUserBonus(int $storeId,int $userId)
  * @method ResultInterface deferAddOemCardPics(int $oemId)
  * @method ResultInterface deferAddOemCardPics(int $oemId)
  */
  */
@@ -167,9 +167,10 @@ interface MemberCardInterface
    * @param integer $userId
    * @param integer $userId
    * @param integer $bonusToUse
    * @param integer $bonusToUse
    * @param integer $price //订单原价减去优惠券后的价格
    * @param integer $price //订单原价减去优惠券后的价格
+   * @param integer $couponId //订单使用的优惠券id
    * @return bool  //验证通过返回true，不通过返回false
    * @return bool  //验证通过返回true，不通过返回false
    */
    */
-  public function verifyBonusConvertMoney(int $storeId,int $userId,int $bonusToUse,int $price);
+  public function verifyBonusConvertMoney(int $storeId,int $userId,int $bonusToUse,int $price,int $couponId=0);
 
 
   /**
   /**
    * 查询用户的会员卡积分
    * 查询用户的会员卡积分