add 拼单小程序活动列表新版接口

application/modules/Marketing/controllers/Marketing.php

@@ -177,8 +177,9 @@ class MarketingController extends Base
      */
     public function pindan_active_basic_listAction()
     {
+        $excludeMarketingId = $this->params['exclude_marketing_id'] ?? '';
         $limit = $this->params['limit'] ?? 1;
-        $list = MarketingService::pindanActiveBasicList($limit,true);
+        $list = MarketingService::pindanActiveBasicList($excludeMarketingId,$limit,true);
         $this->success(['result' => $list]);
     }
 

application/services/marketing/MarketingService.php

@@ -397,13 +397,15 @@ class MarketingService
 
     /**
      * 正在进行中的活动简单信息列表
+     * @param $excludeMarketingId
      * @param int $limit
      * @param bool $needSkuList
-     * @return \Api\PhpUtils\Mysql\MysqlBase
+     * @return \Api\PhpUtils\Mysql\MysqlBase|array
      * @throws InterfaceException
      */
-    public static function pindanActiveBasicList($limit=2,$needSkuList=true)
+    public static function pindanActiveBasicList($excludeMarketingId='',$limit=2,$needSkuList=true)
     {
+        $limit += 1;//查询结果需要排除掉传递的活动，所以需要多取一条
         $where["marketing_type"] = Marketing::MARKETING_TYPE_PINDAN;
         $where['online_status'] = Marketing::ONLINE_STATUS_QIDONG;
         $where += self::getStartEndTimeFilter(MarketingPindan::ACTIVITY_STATUS_IN_PROGRESS);
@@ -415,18 +417,24 @@ class MarketingService
         if(empty($list)) {
             return [];
         }
+
+        $list = array_column($list,null,'marketing_id');
+        //从列表中排除需要排除的活动
+        if($excludeMarketingId && isset($list[$excludeMarketingId])){
+            unset($list[$excludeMarketingId]);
+        }
         //获取活动sku列表
         if($needSkuList) {
-            $list = array_column($list,null,'marketing_id');
             $skuList = self::getGoodsSkuListByMarketingIds(array_keys($list));
 
             foreach ($list as $marketingId => &$value) {
                 $value['sku_list'] = $skuList[$marketingId] ?? [];
             }
             unset($value);
-            $list = array_slice($list,0);
         }
 
+        $list = array_slice($list,0);
+
         return $list;
     }