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

src/GroupBooking/Lib/GroupBookingInterface.php

@@ -8,6 +8,7 @@
 
 
 namespace Hdll\Services\GroupBooking\Lib;
 namespace Hdll\Services\GroupBooking\Lib;
 
 
+use App\Exception\ServiceException;
 use Swoft\Core\ResultInterface;
 use Swoft\Core\ResultInterface;
 
 
 /**
 /**
@@ -15,6 +16,7 @@ use Swoft\Core\ResultInterface;
  * @method ResultInterface deferHasActivity($storeId, $goodsId)
  * @method ResultInterface deferHasActivity($storeId, $goodsId)
  * @method ResultInterface deferAdminCountActivity($storeId)
  * @method ResultInterface deferAdminCountActivity($storeId)
  * @method ResultInterface deferGetNewOrderNum($storeId, $time)
  * @method ResultInterface deferGetNewOrderNum($storeId, $time)
+ * @method ResultInterface deferGetOnGoing($storeId, $fields = ['*'])
  * Interface GoodsInterface
  * Interface GoodsInterface
  * @package Hdll\Services\Goods\Lib
  * @package Hdll\Services\Goods\Lib
  */
  */
@@ -59,4 +61,13 @@ interface GroupBookingInterface
 	 * @return number
 	 * @return number
 	 */
 	 */
 	public function getNewOrderNum($storeId, $time);
 	public function getNewOrderNum($storeId, $time);
+
+
+	/**
+	 * 获取进行中的活动
+	 * @param       $storeId
+	 * @param array $fields
+	 * @return mixed
+	 */
+	public function getOnGoing($storeId, $fields = ['*']);
 }
 }
\ No newline at end of file

src/LimitTimeBuy/Lib/LimitTimeBuyInterface.php

@@ -21,6 +21,7 @@ use Swoft\Core\ResultInterface;
  * @method ResultInterface deferGetLimitInfo(int $storeId, int $goodsId)
  * @method ResultInterface deferGetLimitInfo(int $storeId, int $goodsId)
  * @method ResultInterface deferPayStatus(string $store_id,int $limit_id, int $status, int $orderId)
  * @method ResultInterface deferPayStatus(string $store_id,int $limit_id, int $status, int $orderId)
  * @method  ResultInterface deferGetLimitCounts(int $storeId)
  * @method  ResultInterface deferGetLimitCounts(int $storeId)
+ * @method  ResultInterface deferGetNotEndedActivityList($storeId)
  * @method ResultInterface deferGetNewOrderNum(int $storeId,int $lastTime)
  * @method ResultInterface deferGetNewOrderNum(int $storeId,int $lastTime)
  */
  */
 interface LimitTimeBuyInterface
 interface LimitTimeBuyInterface
@@ -86,6 +87,13 @@ interface LimitTimeBuyInterface
      */
      */
     public function getLimitCounts(int $storeId);
     public function getLimitCounts(int $storeId);
 
 
+      /**
+     * 获取店铺尚未结束的活动列表
+     *
+     * @return mixed
+     */
+    public function getNotEndedActivityList($storeId);
+
 
 
     /**
     /**
      *获取自上次时间以来产生的新订单数
      *获取自上次时间以来产生的新订单数

src/Lottery/Lib/LotteryInterface.php

@@ -7,6 +7,7 @@ use Swoft\Core\ResultInterface;
 /**
 /**
  * @method ResultInterface deferAdminCountActivity($storeId)
  * @method ResultInterface deferAdminCountActivity($storeId)
  * @method ResultInterface deferGetNewOrderNum($storeId, $time)
  * @method ResultInterface deferGetNewOrderNum($storeId, $time)
+ * @method ResultInterface deferGetOnGoing($storeId, $fields = ['*'])
  * Class LotteryInterface
  * Class LotteryInterface
  * @package Hdll\Services\Lottery\Lib
  * @package Hdll\Services\Lottery\Lib
  */
  */
@@ -35,4 +36,12 @@ interface LotteryInterface
 	 * @author work
 	 * @author work
 	 */
 	 */
 	public function getNewOrderNum($storeId, $time);
 	public function getNewOrderNum($storeId, $time);
+
+	/**
+	 * 获取正在进行的活动
+	 * @param       $storeId
+	 * @param array $fields
+	 * @return mixed
+	 */
+	public function getOnGoing($storeId, $fields = ['*']);
 }
 }
\ No newline at end of file