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

# Conflicts:
#	UPGRADE.md

src/Recharge/Lib/RechargeInterface.php

@@ -8,7 +8,7 @@
  * @license https://github.com/swoft-cloud/swoft/blob/master/LICENSE
  * @license https://github.com/swoft-cloud/swoft/blob/master/LICENSE
  */
  */
 
 
-namespace Hdll\Services\TimesCard\Lib;
+namespace Hdll\Services\Recharge\Lib;
 
 
 use Hdll\Services\Recharge\Enum\BuyCardPayStatus;
 use Hdll\Services\Recharge\Enum\BuyCardPayStatus;
 use Swoft\Core\ResultInterface;
 use Swoft\Core\ResultInterface;
@@ -17,10 +17,10 @@ use Swoft\Core\ResultInterface;
  * The interface of demo service
  * The interface of demo service
  *
  *
  * @method  ResultInterface deferpayStatus(int $storeId,int $bargainbranchId,int $status,int $orderId)
  * @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  $time)
- * @method  ResultInterface deferReturnCardTimes( int $storeId,int $buyerId,int $itemOrderId,int $goodsId,string $itemTitle,int  $time)
+ * @method  ResultInterface deferspendCardMoney( int $storeId,int $buyerId,int $itemOrderId,string $itemTitle,int $payMoney)
+ * @method  ResultInterface deferReturnCardMoney( int $storeId,int $buyerId,int $itemOrderId,string $itemTitle,int $payMoney)
  */
  */
-interface TimesCardInterface
+interface RechargeInterface
 {
 {
 
 
 
 
@@ -38,23 +38,22 @@ interface TimesCardInterface
         int $orderId);
         int $orderId);
 
 
     /**
     /**
-     * 花费卡次数
+     * 花费卡金额
      * @param int $storeId
      * @param int $storeId
      * @param int $buyerId
      * @param int $buyerId
      * @param int $goodOrderId
      * @param int $goodOrderId
      * @return mixed
      * @return mixed
      */
      */
-    public function spendTimesCard(
+    public function spendCardMoney(
         int $storeId,
         int $storeId,
         int $buyerId,
         int $buyerId,
         int $itemOrderId,
         int $itemOrderId,
-        int $goodsId,
         string $itemTitle,
         string $itemTitle,
-        int $time
+        int $payMoney
     );
     );
 
 
     /**
     /**
-     * 退回次卡数量
+     * 退回储值卡金额
      * @param int $storeId
      * @param int $storeId
      * @param int $buyerId
      * @param int $buyerId
      * @param int $itemOrderId
      * @param int $itemOrderId
@@ -62,13 +61,12 @@ interface TimesCardInterface
      * @param int $payMoney
      * @param int $payMoney
      * @return mixed
      * @return mixed
      */
      */
-    public function ReturnCardTimes(
+    public function ReturnCardMoney(
         int $storeId,
         int $storeId,
         int $buyerId,
         int $buyerId,
         int $itemOrderId,
         int $itemOrderId,
-        int $goodsId,
         string $itemTitle,
         string $itemTitle,
-        int $time
+        int $payMoney
     );
     );
 }
 }