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

src/Goods/Lib/GoodsInterface.php

@@ -8,6 +8,7 @@
 
 namespace Hdll\Services\Goods\Lib;
 
+use App\Exception\ServiceException;
 use Swoft\Core\ResultInterface;
 
 /**
@@ -25,7 +26,8 @@ use Swoft\Core\ResultInterface;
  * @method ResultInterface deferAdminCountActivity($storeId)
  * @method ResultInterface deferGetTopThreeSales($storeId)
  * @method ResultInterface deferGetReturnVisitByGoodsIds($storeId, $goodsIds)
- * @method ResultInterface deferCountEvaluate($storeId,$time)
+ * @method ResultInterface deferCountEvaluate($storeId, $time)
+ * @method ResultInterface deferFind($storeId, $id)
  * Interface GoodsInterface
  * @package Hdll\Services\Goods\Lib
  */
@@ -35,6 +37,7 @@ interface GoodsInterface
 	/**
 	 * 获取商品
 	 * @param $storeId
+	 * @param $id
 	 * @return [
 	 *                'gcId'   商品类ID
 	 *                'asId'   服务ID
@@ -47,7 +50,6 @@ interface GoodsInterface
 	 *                'originalPrice'  原价
 	 *                'sales'  销量
 	 *                ]
-     * @param $id
 	 * @return mixed
 	 * @author Administrator
 	 */
@@ -177,4 +179,11 @@ interface GoodsInterface
 	 */
 	public function getReturnVisitByGoodsIds($storeId, $goodsIds);
 
+	/**
+	 * 获取商品（包括已删除）
+	 * @param $storeId
+	 * @param $id
+	 * @return array|mixed
+	 */
+	public function find($storeId, $id);
 }

src/Reservation/Lib/ReservationInterface.php

@@ -24,6 +24,7 @@ use Swoft\Core\ResultInterface;
  * @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 deferCancelReservByOrderId(int $storeId, int $orderId, string $memo)
+ * @method ResultInterface deferGetReservListByCmanId(int $storeId, int $cmanId, $state = null)
  */
 interface ReservationInterface
 {
@@ -117,4 +118,15 @@ interface ReservationInterface
      */
     public function cancelReservByOrderId(int $storeId, int $orderId, string $memo = '');
 
+    /**
+     * 根据店员id，获取对应的预约列表
+     *
+     * @param integer $storeId
+     * @param integer $cmanId
+     * @param integer $state 0:预约未标记完成，1:预约已确定完成
+     * @Number(name="state")
+     * @return array
+     */
+    public function getReservListByCmanId(int $storeId, int $cmanId, $state = null);
+
 }
\ No newline at end of file