Merge remote-tracking branch 'origin/master'

src/Reservation/Lib/ReservationInterface.php

@@ -18,7 +18,7 @@ use Swoft\Core\ResultInterface;
  *
  *
  * @method ResultInterface deferGetReservById(int $storeId, int $id)
  * @method ResultInterface deferGetReservById(int $storeId, int $id)
  * @method ResultInterface deferIsReserved(int $storeId, int $cmanId, int $reservTime)
  * @method ResultInterface deferIsReserved(int $storeId, int $cmanId, int $reservTime)
- * @method ResultInterface deferGetReservListByOrderId(int $storeId, int $orderId, int $state = 0, int $type = 1)
+ * @method ResultInterface deferGetReservListByOrderId(int $storeId, int $orderId, int $state = 0)
  * @method ResultInterface deferModifyReservById(int $storeId, int $id, array $data)
  * @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 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)
@@ -53,10 +53,9 @@ interface ReservationInterface
      * @param integer $storeId
      * @param integer $storeId
      * @param integer $orderId
      * @param integer $orderId
      * @param integer $state
      * @param integer $state
-     * @param integer $type
      * @return array
      * @return array
      */
      */
-    public function getReservListByOrderId(int $storeId, int $orderId, int $state = 0, int $type = 1);
+    public function getReservListByOrderId(int $storeId, int $orderId, int $state = 0);
 
 
     /**
     /**
      * 修改某个预约信息
      * 修改某个预约信息
@@ -66,7 +65,6 @@ interface ReservationInterface
      * @param array $data
      * @param array $data
      * $data 字段说明：
      * $data 字段说明：
      * ['state'] => 预约状态，默认0，如果正常结束则为1
      * ['state'] => 预约状态，默认0，如果正常结束则为1
-     * ['type'] => 预约类型，备用
      * ['reservTime'] => 预约时间，整形，时间戳格式
      * ['reservTime'] => 预约时间，整形，时间戳格式
      * ['memo'] => 预约备注
      * ['memo'] => 预约备注
      * @return int 返回成功修改的条数
      * @return int 返回成功修改的条数
@@ -82,10 +80,10 @@ interface ReservationInterface
      * @param integer $cmanId      手艺人id
      * @param integer $cmanId      手艺人id
      * @param integer $reservTime  预约的时间
      * @param integer $reservTime  预约的时间
      * @param string $memo         预约备注
      * @param string $memo         预约备注
-     * @param integer $type        预约类型，备用
+     * @param integer $type        预约类型，传值类型参加 ../Enum/ReservEnum.php
      * @return integer 添加成功则返回记录id
      * @return integer 添加成功则返回记录id
      */
      */
-    public function addReservation(int $storeId, int $orderId, int $buyerId, int $cmanId, int $reservTime, string $memo, int $type = 1);
+    public function addReservation(int $storeId, int $orderId, int $buyerId, int $cmanId, int $reservTime, string $memo, int $type);
 
 
     /**
     /**
      * 取消某个预约
      * 取消某个预约