Merge remote-tracking branch 'origin/master'

src/Common/Lib/Smscode.php

@@ -21,11 +21,15 @@ use Hdll\Services\Common\Entity\User;
 class Smscode
 class Smscode
 {
 {
 
 
-    protected $sellerId;
+    protected $number;
 
 
-    public function __construct()
+    public function __construct($number = null)
     {
     {
-        $this->sellerId = App::getBean(User::class)->getId();
+        if($number !== null) {
+            $this->number = $number;
+        } else {
+            $this->number = App::getBean(User::class)->getId();
+        }
     }
     }
 
 
     /**
     /**
@@ -93,7 +97,7 @@ class Smscode
 
 
     private function getKey($mobile)
     private function getKey($mobile)
     {
     {
-        return 'smscode:' . md5($this->sellerId . '|' . $mobile);
+        return 'smscode:' . md5($this->number . '|' . $mobile);
     }
     }
 
 
 }
 }
\ No newline at end of file

src/Reservation/Lib/ReservationInterface.php

@@ -22,7 +22,6 @@ use Swoft\Core\ResultInterface;
  * @method ResultInterface deferModifyReservById(int $storeId, int $id, array $data)
  * @method ResultInterface deferModifyReservById(int $storeId, int $id, array $data)
  * @method ResultInterface defermarkReservFinished(int $storeId, int $orderId)
  * @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 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, string $memo)
  * @method ResultInterface deferCancelReservByOrderId(int $storeId, int $orderId, string $memo)
  */
  */
 interface ReservationInterface
 interface ReservationInterface
@@ -97,15 +96,6 @@ interface ReservationInterface
     public function addReservation(int $storeId, int $orderId, int $buyerId, int $cmanId, int $reservTime, string $memo, int $type);
     public function addReservation(int $storeId, int $orderId, int $buyerId, int $cmanId, int $reservTime, string $memo, int $type);
 
 
     /**
     /**
-     * 取消某个预约
-     *
-     * @param integer $storeId
-     * @param integer $id
-     * @return boolean 返回取消结果
-     */
-    public function cancelReservById(int $storeId, int $id);
-
-    /**
      * 根据订单id取消该订单下的所有预约
      * 根据订单id取消该订单下的所有预约
      *
      *
      * @param integer $storeId
      * @param integer $storeId