Merge remote-tracking branch 'origin/master'

src/Reservation/Lib/ReservationInterface.php

@@ -18,8 +18,9 @@ use Swoft\Core\ResultInterface;
  *
  * @method ResultInterface deferGetReservById(int $storeId, int $id)
  * @method ResultInterface deferIsReserved(int $storeId, int $cmanId, int $reservTime)
- * @method ResultInterface deferGetReservListByOrderId(int $storeId, int $orderId, int $state = 0)
+ * @method ResultInterface deferGetReservListByOrderId(int $storeId, int $orderId, $state = null)
  * @method ResultInterface deferModifyReservById(int $storeId, int $id, array $data)
+ * @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 deferCancelReservById(int $storeId, int $id)
  * @method ResultInterface deferCancelReservByOrderId(int $storeId, int $orderId)
@@ -55,7 +56,7 @@ interface ReservationInterface
      * @param integer $state
      * @return array
      */
-    public function getReservListByOrderId(int $storeId, int $orderId, int $state = 0);
+    public function getReservListByOrderId(int $storeId, int $orderId, $state = null);
 
     /**
      * 修改某个预约信息
@@ -72,6 +73,16 @@ interface ReservationInterface
     public function modifyReservById(int $storeId, int $id, array $data);
 
     /**
+     * 根据orderId标记订单下所有预约的状态为“已完成”
+     *
+     * @param integer $storeId
+     * @param integer $orderId
+     * @Number(name="orderId")
+     * @return bool 返回操作结果，true操作成功
+     */
+    public function markReservFinished(int $storeId, int $orderId);
+
+    /**
      * 添加预约
      *
      * @param integer $storeId

src/Seller/Lib/SellerInterface.php

@@ -14,6 +14,7 @@ use Swoft\Core\ResultInterface;
  * @method ResultInterface deferSave($referId, $unionId, $openId, $nickName, $headImgUrl)
  * @method ResultInterface deferGet($id,$fields=['*'])
  * @method ResultInterface deferGetByUnionId($unionId,$fields=['*'])
+ * @method ResultInterface deferGetByStoreId($storeId,$fields=['*'])
  * @method ResultInterface deferUpdate($id,$data)
  * Interface SellerInterface
  * @package App\Lib
@@ -65,4 +66,12 @@ interface SellerInterface
 	 */
 	public function update($condition,$data);
 
+	/**
+	 * @param       $storeId
+	 * @param array $fields
+	 * @return mixed
+	 * @author Administrator
+	 */
+	public function getByStoreId($storeId, $fields = ['*']);
+
 }
\ No newline at end of file