Merge branch 'coupon-membercard' into test

src/MemberCard/Lib/MemberCardInterface.php

@@ -21,8 +21,8 @@ use Swoft\Core\ResultInterface;
  * @method ResultInterface deferGetOrder(int $storeId,int $id)
  * @method ResultInterface deferGetOrder(int $storeId,int $id)
  * @method ResultInterface deferGetOrderBySn(int $storeId,string $sn)
  * @method ResultInterface deferGetOrderBySn(int $storeId,string $sn)
  * @method ResultInterface deferIfUserGetCard(int $storeId,int $userId,int $escrow)
  * @method ResultInterface deferIfUserGetCard(int $storeId,int $userId,int $escrow)
- * @method ResultInterface deferGetCouponDetail(int $storeId ,int $couponId)  
- * @method ResultInterface deferSetCouponStatus(int $storeId,int $couponId,int $status)
+ * @method ResultInterface deferGetUserCouponDetail(int $storeId ,int $couponId)  
+ * @method ResultInterface deferSetUserCouponStatus(int $storeId,int $couponId,int $status)
  * 
  * 
  */
  */
 /**
 /**
@@ -74,6 +74,7 @@ interface MemberCardInterface
    *
    *
    * @param integer $storeId
    * @param integer $storeId
    * @param integer $userId
    * @param integer $userId
+   * @param integer $escrow
    * @return bool
    * @return bool
    */
    */
    public function ifUserGetCard(int $storeId,int $userId,int $escrow);
    public function ifUserGetCard(int $storeId,int $userId,int $escrow);
@@ -85,7 +86,7 @@ interface MemberCardInterface
     * @param integer $couponId
     * @param integer $couponId
     * @return void
     * @return void
     */
     */
-   public function getCouponDetail(int $storeId ,int $couponId);
+   public function getUserCouponDetail(int $storeId ,int $couponId);
 
 
    /**
    /**
     * 根据订单状态更改 优惠券的使用的相关状态
     * 根据订单状态更改 优惠券的使用的相关状态
@@ -95,5 +96,5 @@ interface MemberCardInterface
     * @param integer $status
     * @param integer $status
     * @return bool
     * @return bool
     */
     */
-   public function setCouponStatus(int $storeId,int $couponId,int $status);
+   public function setUserCouponStatus(int $storeId,int $couponId,int $status);
 }
 }