Merge remote-tracking branch 'origin/master'

# Conflicts:
#	src/Common/Pool/Config/OrderPoolConfig.php

src/Bargain/Lib/BargainInterface.php

@@ -16,19 +16,42 @@ use Swoft\Core\ResultInterface;
  * The interface of demo service
  *
  * @method  ResultInterface deferGetgoodsinfo( int $limit_id)
+ * @method  ResultInterface deferGetBargainInfo( int $limit_id)
 
  */
 interface BargainInterface
 {
 
-
     /**
      *  获取砍价商品的 商品信息
      * @param int $bargain_id
-     * @return mixed
+    * @return {
+            "name"              名称
+            "image"             图片
+            "price"             价格
+            "activityName"      活动名称
+     * }
      */
     public function getGoodsInfo(
        int $stordId,int $bargain_id
     );
 
-}
\ No newline at end of file
+
+
+    /**
+     * 通过商品id  获取是否 有砍价活动
+     * @param int $storeId
+     * @param int $goodsId
+     * @return bool
+     *
+     */
+    public function  getBargainInfo(
+        int $storeId,int $goodsId
+    );
+
+}
+
+
+
+
+ 
\ No newline at end of file

src/LimitTimeBuy/Lib/LimitTimeBuyInterface.php

@@ -16,7 +16,6 @@ use Swoft\Core\ResultInterface;
  * The interface of demo service
  *
  * @method  ResultInterface deferBackNum(string $token, int $consignee_id, int $limit_id, int $selected_num, int $order_type, int $goods_id, string $reservation_time = '')
-
  */
 interface LimitTimeBuyInterface
 {
@@ -39,13 +38,32 @@ interface LimitTimeBuyInterface
         int $selected_num,
         int $order_type,
         int $goods_id,
-        string $reservation_time );
+        string $reservation_time);
 
     /**
      *  获取限时购商品的 商品信息
      * @param int $limit_id
-     * @return mixed
+     * @return {
+            "name"              名称
+            "image"             图片
+            "price"             价格
+            "activityName"      活动名称
+     * }
      */
     public function getLimitGoods(
-        int $sellerId,int $limitId
-    );}
\ No newline at end of file
+        int $storeId, int $limitId
+    );
+
+    /**
+     * 通过商品id  获取是否 有限时购活动
+     * @param int $storeId
+     * @param int $goodsId
+     * @return bool
+     *
+     */
+    public function getLimitInfo(
+        int $storeId, int $goodsId
+    );
+
+
+}
\ No newline at end of file