Merge remote-tracking branch 'origin/master'

src/Reservation/Lib/ReservationInterface.php

@@ -16,36 +16,39 @@ use Swoft\Core\ResultInterface;
 /**
  * The interface of Reservation service
  *
- * @method ResultInterface deferGetReservById(int $id)
- * @method ResultInterface deferGetReservListByOrderId(int $orderId, int $state, int $isConfirm)
- * @method ResultInterface deferModifyReservById(int $id, array $data)
+ * @method ResultInterface deferGetReservById(int $storeId, int $id)
+ * @method ResultInterface deferGetReservListByOrderId(int $storeId, int $orderId, int $state = 0, int $type = 1)
+ * @method ResultInterface deferModifyReservById(int $storeId, int $id, array $data)
  * @method ResultInterface deferAddReservation(int $storeId, int $orderId, int $buyerId, int $cmanId, int $reservTime, string $memo, int $type)
- * @method ResultInterface deferCancelReservById(int $id)
- * @method ResultInterface deferCancelReservByOrderId(int $orderId)
+ * @method ResultInterface deferCancelReservById(int $storeId, int $id)
+ * @method ResultInterface deferCancelReservByOrderId(int $storeId, int $orderId)
  */
 interface ReservationInterface
 {
     /**
      * 获取某个预约的信息
      *
+     * @param integer $storeId, 
      * @param integer $id
      * @return array
      */
-    public function getReservById(int $id);
+    public function getReservById(int $storeId, int $id);
 
     /**
      * 根据订单id，获取商家某个订单包含的所有预约
      *
+     * @param integer $storeId
      * @param integer $orderId
      * @param integer $state
-     * @param integer $isConfirm
+     * @param integer $type
      * @return array
      */
-    public function getReservListByOrderId(int $orderId, int $state, int $isConfirm);
+    public function getReservListByOrderId(int $storeId, int $orderId, int $state = 0, int $type = 1);
 
     /**
      * 修改某个预约信息
      *
+     * @param integer $storeId, 
      * @param integer $id
      * @param array $data
      * $data 字段说明：
@@ -55,7 +58,7 @@ interface ReservationInterface
      * ['memo'] => 预约备注
      * @return int 返回成功修改的条数
      */
-    public function modifyReservById(int $id, array $data);
+    public function modifyReservById(int $storeId, int $id, array $data);
 
     /**
      * 添加预约
@@ -74,17 +77,19 @@ interface ReservationInterface
     /**
      * 取消某个预约
      *
+     * @param integer $storeId
      * @param integer $id
      * @return boolean 返回取消结果
      */
-    public function cancelReservById(int $id);
+    public function cancelReservById(int $storeId, int $id);
 
     /**
      * 根据订单id取消该订单下的所有预约
      *
+     * @param integer $storeId
      * @param integer $orderId
      * @return boolean 返回取消结果
      */
-    public function cancelReservByOrderId(int $orderId);
+    public function cancelReservByOrderId(int $storeId, int $orderId);
 
 }
\ No newline at end of file