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 $goodsId,string $itemTitle,int $payMoney)
- * @method  ResultInterface deferReturnCardTimes( int $storeId,int $buyerId,int $itemOrderId,int $goodsId,string $itemTitle,int $payMoney)
+ * @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)
  */
 interface TimesCardInterface
 {
@@ -48,13 +48,14 @@ interface TimesCardInterface
         int $storeId,
         int $buyerId,
         int $itemOrderId,
+        int $usercardId,
         int $goodsId,
         string $itemTitle,
-        int $payMoney
+        int $time
     );
 
     /**
-     * 退回储值卡金额
+     * 退回次卡数量
      * @param int $storeId
      * @param int $buyerId
      * @param int $itemOrderId
@@ -68,7 +69,7 @@ interface TimesCardInterface
         int $itemOrderId,
         int $goodsId,
         string $itemTitle,
-        int $payMoney
+        int $time
     );
 }