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

# Conflicts:
#	UPGRADE.md

src/TimesCard/Lib/TimesCardInterface.php

@@ -17,8 +17,8 @@ use Swoft\Core\ResultInterface;
  * The interface of demo service
  *
  * @method  ResultInterface deferpayStatus(int $storeId,int $bargainbranchId,int $status,int $orderId)
- * @method  ResultInterface deferspendTimesCard( int $storeId,int $buyerId,int $itemOrderId, int $usercardId,int $goodsId,string $itemTitle,int  $time)
- * @method  ResultInterface deferReturnCardTimes( int $storeId,int $buyerId,int $itemOrderId,int $goodsId,string $itemTitle,int  $time)
+ * @method  ResultInterface deferspendTimesCard( int $storeId,int $buyerId,int $itemOrderId, int $usercardId,int $goodsId,string $itemTitle,  int $times)
+ * @method  ResultInterface deferReturnCardTimes( int $storeId,int $buyerId,int $itemOrderId,int $goodsId,string $itemTitle,int    $times)
  */
 interface TimesCardInterface
 {
@@ -39,9 +39,14 @@ interface TimesCardInterface
 
     /**
      * 花费卡次数
-     * @param int $storeId
-     * @param int $buyerId
-     * @param int $goodOrderId
+
+     * @param int $storeId          // 商铺id
+     * @param int $buyerId          // 买家ID
+     * @param int $itemOrderId      // 订单 id
+     * @param int $usercardId      // 用户卡id
+     * @param int $goodsId     // 商品id
+     * @param string $itemTitle   //商品名字
+     * @param int $times   // 花费次数  传 1
      * @return mixed
      */
     public function spendTimesCard(
@@ -51,7 +56,7 @@ interface TimesCardInterface
         int $usercardId,
         int $goodsId,
         string $itemTitle,
-        int $time
+        int $times
     );
 
     /**
@@ -69,7 +74,7 @@ interface TimesCardInterface
         int $itemOrderId,
         int $goodsId,
         string $itemTitle,
-        int $time
+        int $times
     );
 }