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

src/Notice/Enum/NoticeEnum.php

@@ -35,5 +35,9 @@ class NoticeEnum
 	];
 	];
 
 
 	const TEMPLATE_GROUP_BOOKING_SUCCESS = "GROUP_BOOKING_SUCCESS";//拼团结果通知
 	const TEMPLATE_GROUP_BOOKING_SUCCESS = "GROUP_BOOKING_SUCCESS";//拼团结果通知
+	const TEMPLATE_BARGAIN_OVERDUE = "BARGAIN_OVERDUE"; //砍价活动过期通知
+	const TEMPLATE_BARGAIN_COMPLETE = "BARGAIN_COMPLETE";//砍到底价通知
+	const TEMPLATE_TIMESCARD_PADDLE = "TIMESCARD_PADDLE";//次卡划卡通知
+	const TEMPLATE_RECHARGE_PADDLE = "RECHARGE_PADDLE";//储值卡划卡通知
 
 
 }
 }
\ No newline at end of file

src/Recharge/Lib/RechargeInterface.php

@@ -20,7 +20,7 @@ use Swoft\Core\ResultInterface;
  * @method  ResultInterface deferReturnCardMoney(int $storeId,int $buyerId,int $itemOrderId,string $itemTitle,int $payMoney, int $parentOrderId)
  * @method  ResultInterface deferReturnCardMoney(int $storeId,int $buyerId,int $itemOrderId,string $itemTitle,int $payMoney, int $parentOrderId)
  * @method  ResultInterface deferStatisNum(int $storeId)
  * @method  ResultInterface deferStatisNum(int $storeId)
  * @method  ResultInterface deferGetRecharge(int $storeId, int $buyerId)
  * @method  ResultInterface deferGetRecharge(int $storeId, int $buyerId)
- * @method  ResultInterface deferDeductMoney($storeId, $buyerId, $money, $message)
+ * @method  ResultInterface deferDeductMoney($storeId, $buyerId, $name, $phone, $money, $message)
  */
  */
 interface RechargeInterface
 interface RechargeInterface
 {
 {
@@ -94,11 +94,13 @@ interface RechargeInterface
      * 线下扣款（划卡）
      * 线下扣款（划卡）
      * @param int $storeId
      * @param int $storeId
      * @param int $buyerId
      * @param int $buyerId
+     * @param $name
+     * @param $phone
      * @param $money
      * @param $money
      * @param $message
      * @param $message
      * @return mixed
      * @return mixed
      */
      */
-    public function deductMoney($storeId, $buyerId, $money, $message);
+    public function deductMoney($storeId, $buyerId, $name, $phone, $money, $message);
 }
 }
 
 
 
 

src/TimesCard/Lib/TimesCardInterface.php

@@ -92,10 +92,12 @@ interface TimesCardInterface
      * 线下扣卡次数（划卡）
      * 线下扣卡次数（划卡）
      * @param $storeId
      * @param $storeId
      * @param $buyerId
      * @param $buyerId
+     * @param $name
+     * @param $phone
      * @param $items
      * @param $items
      * @return mixed
      * @return mixed
      */
      */
-    public function deductCard($storeId, $buyerId, $items);
+    public function deductCard($storeId, $buyerId, $name, $phone, $items);
 }
 }