Merge branch 'ft-act-ongoing' into test

UPGRADE_2.x.md

+# 2.0.42
+- 活动方案+实物订单上线
+
 # 2.0.41
 - 会员卡修复bug
 

src/GroupBooking/Lib/GroupBookingInterface.php

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

src/Lottery/Lib/LotteryInterface.php

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