Merge branch 'pindan_activity_list_optimize' into develop

application/services/marketing/MarketingService.php

@@ -418,7 +418,7 @@ class MarketingService
      */
     public static function pindanActiveBasicList($excludeMarketingId='',$limit=2,$needSkuList=true)
     {
-        $limit += 1;//查询结果需要排除掉传递的活动，所以需要多取一条
+        !empty($excludeMarketingId) && $limit += 1;//查询结果需要排除掉传递的活动，所以需要多取一条
         $where["marketing_type"] = Marketing::MARKETING_TYPE_PINDAN;
         $where['online_status'] = Marketing::ONLINE_STATUS_QIDONG;
         $where += self::getStartEndTimeFilter(MarketingPindan::ACTIVITY_STATUS_IN_PROGRESS);