Merge remote-tracking branch 'origin/master'

src/Reservation/Enum/ReservEnum.php

@@ -10,6 +10,7 @@ namespace Hdll\Services\Reservation\Enum;
 class ReservEnum
 class ReservEnum
 {
 {
     const TYPE_ORDER  = 1; // 表示从订单创建产生的预约
     const TYPE_ORDER  = 1; // 表示从订单创建产生的预约
-    const TYPE_SELLER = 2; // 表示卖家自己后台添加的预约
+    const TYPE_SELLER = 2; // 表示卖家自己手动添加的预约
     const TYPE_AFTER  = 3; // 表示订购服务的后续服务的预约
     const TYPE_AFTER  = 3; // 表示订购服务的后续服务的预约
+    const TYPE_BUYER  = 4; // 表示买家自己手动添加的预约
 }
 }
\ No newline at end of file

src/Seller/Lib/SellerInterface.php

@@ -16,7 +16,7 @@ use Swoft\Core\ResultInterface;
  * @method ResultInterface deferGetByUnionId($unionId,$fields=['*'])
  * @method ResultInterface deferGetByUnionId($unionId,$fields=['*'])
  * @method ResultInterface deferGetByStoreId($storeId,$fields=['*'])
  * @method ResultInterface deferGetByStoreId($storeId,$fields=['*'])
  * @method ResultInterface deferUpdate($id,$data)
  * @method ResultInterface deferUpdate($id,$data)
- * @method ResultInterface deferCuntRelationNum($sellerId, $condition, $column = ['id'])
+ * @method ResultInterface deferCountDistributionNum($sellerId)
  * Interface SellerInterface
  * Interface SellerInterface
  * @package App\Lib
  * @package App\Lib
  */
  */
@@ -76,5 +76,5 @@ interface SellerInterface
 	public function getByStoreId($storeId, $fields = ['*']);
 	public function getByStoreId($storeId, $fields = ['*']);
 
 
 
 
-	public function countRelationNum($sellerId, $condition, $column = ['id']);
+	public function countDistributionNum($sellerId);
 }
 }
\ No newline at end of file