Merge branch 'pindan_activity_list_optimize' into develop

application/services/marketing/MarketingService.php

@@ -416,15 +416,16 @@ class MarketingService
      * @return \Api\PhpUtils\Mysql\MysqlBase|array
      * @throws InterfaceException
      */
-    public static function pindanActiveBasicList($excludeMarketingId='',$limit=2,$needSkuList=true)
+    public static function pindanActiveBasicList($excludeMarketingId='',$limit=1,$needSkuList=true)
     {
-        !empty($excludeMarketingId) && $limit += 1;//查询结果需要排除掉传递的活动，所以需要多取一条
+        $queryLimit = 1;
+        !empty($excludeMarketingId) && $queryLimit += 1;//查询结果需要排除掉传递的活动，所以需要多取一条
         $where["marketing_type"] = Marketing::MARKETING_TYPE_PINDAN;
         $where['online_status'] = Marketing::ONLINE_STATUS_QIDONG;
         $where += self::getStartEndTimeFilter(MarketingPindan::ACTIVITY_STATUS_IN_PROGRESS);
         $where['life_account_id'] = self::getPublicLifeAccountId();
         $where['ORDER'] = ['end_time' => 'ASC','marketing_id'=>'ASC'];
-        $where['LIMIT'] = [0, $limit];
+        $where['LIMIT'] = [0, $queryLimit];
         $list = Marketing::select(['marketing_id', 'marketing_name','start_time','end_time'], $where);
 
         if(empty($list)) {
@@ -449,7 +450,7 @@ class MarketingService
             unset($value);
         }
 
-        $list = array_slice($list,0);
+        $list = array_slice($list,0, $limit);
 
         return $list;
     }