Merge branch 'master' of http://git.2b3.cn/tencent/services

src/Common/Pool/Config/OrderPoolConfig.php

@@ -68,7 +68,7 @@ class OrderPoolConfig extends PoolProperties
      *
      * @var int
      */
-    protected $timeout = 5;
+    protected $timeout = 15;
 
     /**
      * the addresses of connection

src/Common/Pool/Config/ReservationPoolConfig.php

@@ -68,7 +68,7 @@ class ReservationPoolConfig extends PoolProperties
      *
      * @var int
      */
-    protected $timeout = 5;
+    protected $timeout = 15;
 
     /**
      * the addresses of connection

src/Common/Pool/Config/SchedulePoolConfig.php

@@ -68,7 +68,7 @@ class SchedulePoolConfig extends PoolProperties
      *
      * @var int
      */
-    protected $timeout = 5;
+    protected $timeout = 15;
 
     /**
      * the addresses of connection

src/Common/Pool/Config/StorePoolConfig.php

@@ -68,7 +68,7 @@ class StorePoolConfig extends PoolProperties
      *
      * @var int
      */
-    protected $timeout = 5;
+    protected $timeout = 15;
 
     /**
      * the addresses of connection

src/Order/Lib/OrderInterface.php

@@ -15,7 +15,7 @@ use Swoft\Core\ResultInterface;
 /**
  * The interface of demo service
  *
- * @method ResultInterface deferCreateOrder(int $buyerId,int $storeId,int $consigneeId,int $itemId,int $selectedNum,int $orderType,int $total,int $activityPrice,string $goodsName,string $goodsImage,string $activityName,int $goodsId,int $goodsPrice,string $reservation_time = '');
+ * @method ResultInterface deferCreateOrder(int $buyerId,int $storeId,int $consigneeId,int $itemId,int $selectedNum,int $orderType,int $total,int $activityPrice,string $goodsName,string $goodsImage,string $activityName,int $goodsId,int $goodsPrice,string $reservation_time = '',string $message = '');
  * @method ResultInterface deferGetOrderInfoBySn(int $storeId, string $orderSn, array $consigneeFields = [], array $itemFields = [])
  * @method ResultInterface deferGetOrderInfo(int $storeId,int $orderId)
  * @method ResultInterface deferUpdateInfoById(int $storeId,int $orderId, array  $updateInfo)
@@ -43,6 +43,7 @@ interface OrderInterface
      * @param int $goodsId
      * @param int $goodsPrice
      * @param string $reservation_time
+     * @param string $message
      * @return mixed
      */
     public function createOrder(
@@ -59,7 +60,9 @@ interface OrderInterface
         string $activityName,
         int $goodsId,
         int $goodsPrice,
-        string $reservation_time = '');
+        string $reservation_time = '',
+        string $message = ''
+    );
 
     public function getOrderInfo(int $storeId,int $orderId);
 

src/Reservation/Lib/ReservationInterface.php

@@ -17,6 +17,7 @@ use Swoft\Core\ResultInterface;
  * The interface of Reservation service
  *
  * @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, 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)
@@ -35,6 +36,18 @@ interface ReservationInterface
     public function getReservById(int $storeId, int $id);
 
     /**
+     * 检查指定的时间是否已被预约过
+     * 
+     * @param integer $storeId    店铺id
+     * @param integer $cmanId     手艺人id，查询某个手艺人下的预约情况，$cmanId == 0表示不指定手艺人，
+     * @param integer $reservTime 要检查的时间点，时间戳格式
+     * @Number(name="cmanId")
+     * @Number(name="reservTime")
+     * @return boolen true:已预约，false:未预约
+     */
+    public function isReserved(int $storeId, int $cmanId, int $reservTime);
+
+    /**
      * 根据订单id，获取商家某个订单包含的所有预约
      *
      * @param integer $storeId