Merge remote-tracking branch 'origin/master'

src/Reservation/Lib/ReservationInterface.php

@@ -23,7 +23,7 @@ use Swoft\Core\ResultInterface;
  * @method ResultInterface defermarkReservFinished(int $storeId, int $orderId)
  * @method ResultInterface defermarkReservFinished(int $storeId, int $orderId)
  * @method ResultInterface deferAddReservation(int $storeId, int $orderId, int $buyerId, int $cmanId, int $reservTime, string $memo, int $type)
  * @method ResultInterface deferAddReservation(int $storeId, int $orderId, int $buyerId, int $cmanId, int $reservTime, string $memo, int $type)
  * @method ResultInterface deferCancelReservById(int $storeId, int $id)
  * @method ResultInterface deferCancelReservById(int $storeId, int $id)
- * @method ResultInterface deferCancelReservByOrderId(int $storeId, int $orderId)
+ * @method ResultInterface deferCancelReservByOrderId(int $storeId, int $orderId, string $memo)
  */
  */
 interface ReservationInterface
 interface ReservationInterface
 {
 {
@@ -110,8 +110,9 @@ interface ReservationInterface
      *
      *
      * @param integer $storeId
      * @param integer $storeId
      * @param integer $orderId
      * @param integer $orderId
+     * @param string $memo
      * @return boolean 返回取消结果
      * @return boolean 返回取消结果
      */
      */
-    public function cancelReservByOrderId(int $storeId, int $orderId);
+    public function cancelReservByOrderId(int $storeId, int $orderId, string $memo = '');
 
 
 }
 }
\ No newline at end of file

src/Store/Lib/SettingsInterface.php

@@ -46,6 +46,12 @@ interface SettingsInterface
      *   int(0)
      *   int(0)
      *   ["delivered_notice"]=>       // 核销通知，1表示允许发送通知
      *   ["delivered_notice"]=>       // 核销通知，1表示允许发送通知
      *   int(1)
      *   int(1)
+     *   ["cancel_order_notice"]=>    // 订单取消的通知，1表示允许发送通知
+     *   int(1)
+     *   ["withdraw_notice"]=>        // 提现申请的通知，1表示允许发送通知
+     *   int(1)
+     *   ["grant_comm_notice"]=>      // 下级升级vip产生新的佣金的通知，1表示允许发送通知
+     *   int(1)
      * }
      * }
      */
      */
     public function getNoticeSwitch(int $storeId);
     public function getNoticeSwitch(int $storeId);